From d47f69cc1b75d7a9a5126828ca52307e53d28884 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Oct 2025 21:10:21 +0000 Subject: [PATCH 001/280] Add slnf support to dotnet sln add/remove/list commands and dotnet new slnf template Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../dotnet/Commands/CliCommandStrings.resx | 3 + .../Solution/Add/SolutionAddCommand.cs | 64 ++++++++++- .../Solution/Remove/SolutionRemoveCommand.cs | 44 +++++++- .../Commands/xlf/CliCommandStrings.cs.xlf | 5 + .../Commands/xlf/CliCommandStrings.de.xlf | 5 + .../Commands/xlf/CliCommandStrings.es.xlf | 5 + .../Commands/xlf/CliCommandStrings.fr.xlf | 5 + .../Commands/xlf/CliCommandStrings.it.xlf | 5 + .../Commands/xlf/CliCommandStrings.ja.xlf | 5 + .../Commands/xlf/CliCommandStrings.ko.xlf | 5 + .../Commands/xlf/CliCommandStrings.pl.xlf | 5 + .../Commands/xlf/CliCommandStrings.pt-BR.xlf | 5 + .../Commands/xlf/CliCommandStrings.ru.xlf | 5 + .../Commands/xlf/CliCommandStrings.tr.xlf | 5 + .../xlf/CliCommandStrings.zh-Hans.xlf | 5 + .../xlf/CliCommandStrings.zh-Hant.xlf | 5 + src/Cli/dotnet/SlnfFileHelper.cs | 106 ++++++++++++++++++ .../content/Solution/Solution1.slnf | 6 + .../.template.config/template.json | 29 +++++ .../SolutionFilter/SolutionFilter1.slnf | 6 + 20 files changed, 318 insertions(+), 5 deletions(-) create mode 100644 src/Cli/dotnet/SlnfFileHelper.cs create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/template.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/SolutionFilter1.slnf diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx index 3a3fab487f89..bc7f8720707e 100644 --- a/src/Cli/dotnet/Commands/CliCommandStrings.resx +++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx @@ -2698,4 +2698,7 @@ Proceed? Received 'ExecutionId' of value '{0}' for message '{1}' while the 'ExecutionId' received of the handshake message was '{2}'. {Locked="ExecutionId"} + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + \ No newline at end of file diff --git a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs index 338271e6c8cf..f6f4e2ff3003 100644 --- a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs @@ -45,7 +45,7 @@ public SolutionAddCommand(ParseResult parseResult) : base(parseResult) _solutionFolderPath = parseResult.GetValue(SolutionAddCommandParser.SolutionFolderOption); _includeReferences = parseResult.GetValue(SolutionAddCommandParser.IncludeReferencesOption); SolutionArgumentValidator.ParseAndValidateArguments(_fileOrDirectory, _projects, SolutionArgumentValidator.CommandType.Add, _inRoot, _solutionFolderPath); - _solutionFileFullPath = SlnFileFactory.GetSolutionFileFullPath(_fileOrDirectory); + _solutionFileFullPath = SlnFileFactory.GetSolutionFileFullPath(_fileOrDirectory, includeSolutionFilterFiles: true); } public override int Execute() @@ -64,8 +64,16 @@ public override int Execute() return Directory.Exists(fullPath) ? MsbuildProject.GetProjectFileFromDirectory(fullPath).FullName : fullPath; }); - // Add projects to the solution - AddProjectsToSolutionAsync(fullProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + // Check if we're working with a solution filter file + if (_solutionFileFullPath.HasExtension(".slnf")) + { + AddProjectsToSolutionFilterAsync(fullProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + } + else + { + // Add projects to the solution + AddProjectsToSolutionAsync(fullProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + } return 0; } @@ -224,4 +232,54 @@ private void AddProject(SolutionModel solution, string fullProjectPath, ISolutio } } } + + private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectPaths, CancellationToken cancellationToken) + { + // Solution filter files don't support --in-root or --solution-folder options + if (_inRoot || !string.IsNullOrEmpty(_solutionFolderPath)) + { + throw new GracefulException(CliCommandStrings.SolutionFilterDoesNotSupportFolderOptions); + } + + // Load the filtered solution to get the parent solution path and existing projects + SolutionModel filteredSolution = SlnFileFactory.CreateFromFilteredSolutionFile(_solutionFileFullPath); + string parentSolutionPath = filteredSolution.Description!; // The parent solution path is stored in Description + + // Load the parent solution to validate projects exist in it + SolutionModel parentSolution = SlnFileFactory.CreateFromFileOrDirectory(parentSolutionPath); + + // Get existing projects in the filter + var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); + + // Get solution-relative paths for new projects + var newProjects = new List(); + foreach (var projectPath in projectPaths) + { + string parentSolutionRelativePath = Path.GetRelativePath(Path.GetDirectoryName(parentSolutionPath)!, projectPath); + + // Check if project exists in parent solution + var projectInParent = parentSolution.FindProject(parentSolutionRelativePath); + if (projectInParent is null) + { + Reporter.Error.WriteLine(CliStrings.ProjectNotFoundInTheSolution, parentSolutionRelativePath, parentSolutionPath); + continue; + } + + // Check if project is already in the filter + if (existingProjects.Contains(parentSolutionRelativePath)) + { + Reporter.Output.WriteLine(CliStrings.SolutionAlreadyContainsProject, _solutionFileFullPath, parentSolutionRelativePath); + continue; + } + + newProjects.Add(parentSolutionRelativePath); + Reporter.Output.WriteLine(CliStrings.ProjectAddedToTheSolution, parentSolutionRelativePath); + } + + // Add new projects to the existing list and save + var allProjects = existingProjects.Concat(newProjects).OrderBy(p => p); + SlnfFileHelper.SaveSolutionFilter(_solutionFileFullPath, parentSolutionPath, allProjects); + + await Task.CompletedTask; + } } diff --git a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs index 36030bd22621..2c8184dc29f1 100644 --- a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs @@ -27,7 +27,7 @@ public SolutionRemoveCommand(ParseResult parseResult) : base(parseResult) public override int Execute() { - string solutionFileFullPath = SlnFileFactory.GetSolutionFileFullPath(_fileOrDirectory); + string solutionFileFullPath = SlnFileFactory.GetSolutionFileFullPath(_fileOrDirectory, includeSolutionFilterFiles: true); if (_projects.Count == 0) { throw new GracefulException(CliStrings.SpecifyAtLeastOneProjectToRemove); @@ -43,7 +43,15 @@ public override int Execute() ? MsbuildProject.GetProjectFileFromDirectory(p).FullName : p)); - RemoveProjectsAsync(solutionFileFullPath, relativeProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + // Check if we're working with a solution filter file + if (solutionFileFullPath.HasExtension(".slnf")) + { + RemoveProjectsFromSolutionFilterAsync(solutionFileFullPath, relativeProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + } + else + { + RemoveProjectsAsync(solutionFileFullPath, relativeProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + } return 0; } catch (Exception ex) when (ex is not GracefulException) @@ -130,4 +138,36 @@ private static async Task RemoveProjectsAsync(string solutionFileFullPath, IEnum await serializer.SaveAsync(solutionFileFullPath, solution, cancellationToken); } + + private static async Task RemoveProjectsFromSolutionFilterAsync(string slnfFileFullPath, IEnumerable projectPaths, CancellationToken cancellationToken) + { + // Load the filtered solution to get the parent solution path and existing projects + SolutionModel filteredSolution = SlnFileFactory.CreateFromFilteredSolutionFile(slnfFileFullPath); + string parentSolutionPath = filteredSolution.Description!; // The parent solution path is stored in Description + + // Get existing projects in the filter + var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); + + // Remove specified projects + foreach (var projectPath in projectPaths) + { + // Normalize the path to be relative to parent solution + string normalizedPath = projectPath; + + // Try to find and remove the project + if (existingProjects.Remove(normalizedPath)) + { + Reporter.Output.WriteLine(CliStrings.ProjectRemovedFromTheSolution, normalizedPath); + } + else + { + Reporter.Output.WriteLine(CliStrings.ProjectNotFoundInTheSolution, normalizedPath); + } + } + + // Save updated filter + SlnfFileHelper.SaveSolutionFilter(slnfFileFullPath, parentSolutionPath, existingProjects.OrderBy(p => p)); + + await Task.CompletedTask; + } } diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index 9e6ea08c74b9..ad8f833f14c3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -2991,6 +2991,11 @@ Cílem projektu je více architektur. Pomocí parametru {0} určete, která arch SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. Parametry --solution-folder a --in-root nejdou použít společně; použijte jenom jeden z nich. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index 585628e6400b..89fa826c2902 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -2991,6 +2991,11 @@ Ihr Projekt verwendet mehrere Zielframeworks. Geben Sie über "{0}" an, welches SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. Die Optionen "--solution-folder" und "--in-root" können nicht zusammen verwendet werden; verwenden Sie nur eine der Optionen. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index 3860162de57e..058d6eaab312 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -2991,6 +2991,11 @@ Su proyecto tiene como destino varias plataformas. Especifique la que quiere usa SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. Las opciones --in-root y --solution-folder no se pueden usar juntas. Utilice solo una de ellas. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index 82c93100c2a2..3b79fe3123c2 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -2991,6 +2991,11 @@ Votre projet cible plusieurs frameworks. Spécifiez le framework à exécuter à SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. N'utilisez pas en même temps les options --solution-folder et --in-root. Utilisez uniquement l'une des deux options. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index d5e325548a52..30c67f636e69 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -2991,6 +2991,11 @@ Il progetto è destinato a più framework. Specificare il framework da eseguire SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. Non è possibile usare contemporaneamente le opzioni --solution-folder e --in-root. Usare una sola delle opzioni. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index d094f986fe57..9d803992cacc 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -2991,6 +2991,11 @@ Your project targets multiple frameworks. Specify which framework to run using ' SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. --solution-folder オプションと --in-root オプションを一緒に使用することはできません。いずれかのオプションだけを使用します。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index f818c10fae6d..59eba705be3d 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -2991,6 +2991,11 @@ Your project targets multiple frameworks. Specify which framework to run using ' SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. --solution-folder와 --in-root 옵션을 함께 사용할 수 없습니다. 옵션을 하나만 사용하세요. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 100304d2eee0..5d3a6a7eccbe 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -2991,6 +2991,11 @@ Projekt ma wiele platform docelowych. Określ platformę do uruchomienia przy u SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. Opcji --solution-folder i --in-root nie można używać razem; użyj tylko jednej z tych opcji. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index 2e8c726a75a1..dd72e552e624 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -2991,6 +2991,11 @@ Ele tem diversas estruturas como destino. Especifique que estrutura executar usa SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. As opções --solution-folder e --in-root não podem ser usadas juntas. Use somente uma das opções. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index 391f4d068e0c..50f8adb8ce0c 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -2991,6 +2991,11 @@ Your project targets multiple frameworks. Specify which framework to run using ' SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. Параметры --solution-folder и --in-root options не могут быть использованы одновременно; оставьте только один из параметров. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf index f6ffea6d2984..497de32433e6 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf @@ -2991,6 +2991,11 @@ Projeniz birden fazla Framework'ü hedefliyor. '{0}' kullanarak hangi Framework' SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. --solution-folder ve --in-root seçenekleri birlikte kullanılamaz; seçeneklerden yalnızca birini kullanın. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index 7878f6ad146e..543596274520 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -2991,6 +2991,11 @@ Your project targets multiple frameworks. Specify which framework to run using ' SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. --solution-folder 和 --in-root 选项不能一起使用；请仅使用其中一个选项。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index 5cc582623c6d..d5c34f5bab98 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -2991,6 +2991,11 @@ Your project targets multiple frameworks. Specify which framework to run using ' SLN_FILE + + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + Solution filter files (.slnf) do not support the --in-root or --solution-folder options. + + The --solution-folder and --in-root options cannot be used together; use only one of the options. 不可同時使用 --solution-folder 和 --in-root 選項; 請只使用其中一個選項。 diff --git a/src/Cli/dotnet/SlnfFileHelper.cs b/src/Cli/dotnet/SlnfFileHelper.cs new file mode 100644 index 000000000000..368b930b5f13 --- /dev/null +++ b/src/Cli/dotnet/SlnfFileHelper.cs @@ -0,0 +1,106 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#nullable disable + +using System; +using System.IO; +using System.Text.Json; +using System.Text.Json.Serialization; +using Microsoft.DotNet.Cli.Utils; + +namespace Microsoft.DotNet.Cli; + +/// +/// Utilities for working with solution filter (.slnf) files +/// +public static class SlnfFileHelper +{ + private class SlnfSolution + { + [JsonPropertyName("path")] + public string Path { get; set; } + + [JsonPropertyName("projects")] + public List Projects { get; set; } = new(); + } + + private class SlnfRoot + { + [JsonPropertyName("solution")] + public SlnfSolution Solution { get; set; } = new(); + } + + /// + /// Creates a new solution filter file + /// + /// Path to the solution filter file to create + /// Path to the parent solution file + /// List of project paths to include (relative to the parent solution) + public static void CreateSolutionFilter(string slnfPath, string parentSolutionPath, IEnumerable projects = null) + { + var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)); + var parentSolutionFullPath = Path.GetFullPath(parentSolutionPath, slnfDirectory); + var relativeSolutionPath = Path.GetRelativePath(slnfDirectory, parentSolutionFullPath); + + // Normalize path separators to backslashes (as per slnf format) + relativeSolutionPath = relativeSolutionPath.Replace(Path.DirectorySeparatorChar, '\\'); + + var root = new SlnfRoot + { + Solution = new SlnfSolution + { + Path = relativeSolutionPath, + Projects = projects?.Select(p => p.Replace(Path.DirectorySeparatorChar, '\\')).ToList() ?? new List() + } + }; + + var options = new JsonSerializerOptions + { + WriteIndented = true, + DefaultIgnoreCondition = JsonIgnoreCondition.Never + }; + + var json = JsonSerializer.Serialize(root, options); + File.WriteAllText(slnfPath, json); + } + + /// + /// Saves a solution filter file with the given projects + /// + /// Path to the solution filter file + /// Path to the parent solution (stored in the slnf file) + /// List of project paths (relative to the parent solution) + public static void SaveSolutionFilter(string slnfPath, string parentSolutionPath, IEnumerable projects) + { + var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)); + + // Normalize the parent solution path to be relative to the slnf file + var relativeSolutionPath = parentSolutionPath; + if (Path.IsPathRooted(parentSolutionPath)) + { + relativeSolutionPath = Path.GetRelativePath(slnfDirectory, parentSolutionPath); + } + + // Normalize path separators to backslashes (as per slnf format) + relativeSolutionPath = relativeSolutionPath.Replace(Path.DirectorySeparatorChar, '\\'); + + var root = new SlnfRoot + { + Solution = new SlnfSolution + { + Path = relativeSolutionPath, + Projects = projects.Select(p => p.Replace(Path.DirectorySeparatorChar, '\\')).ToList() + } + }; + + var options = new JsonSerializerOptions + { + WriteIndented = true, + DefaultIgnoreCondition = JsonIgnoreCondition.Never + }; + + var json = JsonSerializer.Serialize(root, options); + File.WriteAllText(slnfPath, json); + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf new file mode 100644 index 000000000000..0578829ee51e --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf @@ -0,0 +1,6 @@ +{ + "solution": { + "path": "Solution1.slnx", + "projects": [] + } +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/template.json new file mode 100644 index 000000000000..7f33956aab45 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/template.json @@ -0,0 +1,29 @@ +{ + "$schema": "http://json.schemastore.org/template", + "author": "Microsoft", + "classifications": [ + "Solution" + ], + "name": "Solution Filter File", + "generatorVersions": "[1.0.0.0-*)", + "description": "Create a solution filter file that references a parent solution", + "groupIdentity": "ItemSolutionFilter", + "precedence": "100", + "identity": "Microsoft.Standard.QuickStarts.SolutionFilter", + "shortName": [ + "slnf", + "solutionfilter" + ], + "sourceName": "SolutionFilter1", + "symbols": { + "ParentSolution": { + "type": "parameter", + "displayName": "Parent solution file", + "description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension).", + "datatype": "string", + "defaultValue": "SolutionFilter1.slnx", + "replaces": "SolutionFilter1.slnx" + } + }, + "defaultName": "SolutionFilter1" +} diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/SolutionFilter1.slnf b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/SolutionFilter1.slnf new file mode 100644 index 000000000000..d633922fb216 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/SolutionFilter1.slnf @@ -0,0 +1,6 @@ +{ + "solution": { + "path": "SolutionFilter1.slnx", + "projects": [] + } +} From 146ee68a636105adc2f5d826a21536951b9e3907 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Oct 2025 21:15:20 +0000 Subject: [PATCH 002/280] Add tests for slnf add/remove functionality Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../ProjectToolsCommandResolver.cs | 2 +- src/Cli/dotnet/Commands/Build/BuildCommand.cs | 2 +- src/Cli/dotnet/Commands/Clean/CleanCommand.cs | 4 +- .../dotnet/Commands/Format/FormatCommand.cs | 2 +- .../Hidden/Complete/CompleteCommand.cs | 2 +- .../InternalReportInstallSuccessCommand.cs | 2 +- .../dotnet/Commands/MSBuild/MSBuildCommand.cs | 4 +- src/Cli/dotnet/Commands/Pack/PackCommand.cs | 6 +- .../Package/List/PackageListCommand.cs | 4 +- .../Package/Search/PackageSearchCommand.cs | 2 +- .../dotnet/Commands/Publish/PublishCommand.cs | 2 +- .../dotnet/Commands/Restore/RestoreCommand.cs | 2 +- .../Commands/Restore/RestoringCommand.cs | 8 +-- .../LaunchSettings/LaunchSettingsManager.cs | 4 +- src/Cli/dotnet/Commands/Run/RunTelemetry.cs | 2 +- .../Migrate/SolutionMigrateCommand.cs | 4 +- .../Solution/Remove/SolutionRemoveCommand.cs | 4 +- src/Cli/dotnet/Commands/Store/StoreCommand.cs | 2 +- .../Test/MTP/Terminal/TerminalTestReporter.cs | 4 +- .../Test/MTP/TestApplicationActionQueue.cs | 2 +- .../Commands/Test/VSTest/TestCommand.cs | 9 +-- .../Test/VSTest/VSTestForwardingApp.cs | 2 +- .../ToolInstallGlobalOrToolPathCommand.cs | 20 +++--- .../Tool/Install/ToolInstallLocalCommand.cs | 2 +- .../Commands/Tool/List/ToolListJsonHelper.cs | 12 ++-- .../Tool/Restore/ToolPackageRestorer.cs | 2 +- .../ToolUninstallGlobalOrToolPathCommand.cs | 2 +- .../ToolUpdateGlobalOrToolPathCommand.cs | 6 +- .../History/WorkloadHistoryCommand.cs | 4 +- .../Restore/WorkloadRestoreCommand.cs | 2 +- .../Commands/Workload/WorkloadCommandBase.cs | 2 +- .../Workload/WorkloadCommandParser.cs | 2 +- src/Cli/dotnet/CommonOptions.cs | 2 +- src/Cli/dotnet/DotNetCommandFactory.cs | 2 +- .../Extensions/CommonOptionsExtensions.cs | 2 +- .../INuGetPackageDownloader.cs | 2 +- .../NuGetPackageDownloader.cs | 4 +- .../dotnet/ReleasePropertyProjectLocator.cs | 3 +- src/Cli/dotnet/SlnfFileHelper.cs | 4 +- src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs | 4 +- .../Telemetry/EnvironmentDetectionRule.cs | 8 +-- .../Telemetry/ILLMEnvironmentDetector.cs | 2 +- .../LLMEnvironmentDetectorForTelemetry.cs | 2 +- src/Cli/dotnet/Telemetry/Telemetry.cs | 4 +- .../dotnet/ToolPackage/ToolConfiguration.cs | 2 +- .../localize/templatestrings.cs.json | 7 ++ .../localize/templatestrings.de.json | 7 ++ .../localize/templatestrings.en.json | 7 ++ .../localize/templatestrings.es.json | 7 ++ .../localize/templatestrings.fr.json | 7 ++ .../localize/templatestrings.it.json | 7 ++ .../localize/templatestrings.ja.json | 7 ++ .../localize/templatestrings.ko.json | 7 ++ .../localize/templatestrings.pl.json | 7 ++ .../localize/templatestrings.pt-BR.json | 7 ++ .../localize/templatestrings.ru.json | 7 ++ .../localize/templatestrings.tr.json | 7 ++ .../localize/templatestrings.zh-Hans.json | 7 ++ .../localize/templatestrings.zh-Hant.json | 7 ++ .../TestAppWithSlnfFiles/App.slnf | 8 +++ .../TestAppWithSlnfFiles/App.slnx | 5 ++ .../TestAppWithSlnfFiles/src/App/App.csproj | 6 ++ .../TestAppWithSlnfFiles/src/Lib/Lib.csproj | 5 ++ .../test/AppTests/AppTests.csproj | 9 +++ .../Solution/Add/GivenDotnetSlnAdd.cs | 66 +++++++++++++++++++ 65 files changed, 284 insertions(+), 83 deletions(-) create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.cs.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.de.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.en.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.es.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.fr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.it.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ja.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ko.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pl.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pt-BR.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ru.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.tr.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hans.json create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hant.json create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnf create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnx create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/App/App.csproj create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/Lib/Lib.csproj create mode 100644 test/TestAssets/TestProjects/TestAppWithSlnfFiles/test/AppTests/AppTests.csproj diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs index 2f8bb7badd98..be3d9294b176 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs @@ -385,7 +385,7 @@ internal void GenerateDepsJsonFile( string? stdOut; string? stdErr; - var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([..args], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption); + var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments([.. args], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, BuildCommandParser.TargetOption, BuildCommandParser.VerbosityOption); var forwardingAppWithoutLogging = new MSBuildForwardingAppWithoutLogging(msbuildArgs, msBuildExePath); if (forwardingAppWithoutLogging.ExecuteMSBuildOutOfProc) { diff --git a/src/Cli/dotnet/Commands/Build/BuildCommand.cs b/src/Cli/dotnet/Commands/Build/BuildCommand.cs index 871ead794e84..4d8e425dace9 100644 --- a/src/Cli/dotnet/Commands/Build/BuildCommand.cs +++ b/src/Cli/dotnet/Commands/Build/BuildCommand.cs @@ -12,7 +12,7 @@ public static class BuildCommand { public static CommandBase FromArgs(string[] args, string? msbuildPath = null) { - var parseResult = Parser.Parse(["dotnet", "build", ..args]); + var parseResult = Parser.Parse(["dotnet", "build", .. args]); return FromParseResult(parseResult, msbuildPath); } diff --git a/src/Cli/dotnet/Commands/Clean/CleanCommand.cs b/src/Cli/dotnet/Commands/Clean/CleanCommand.cs index 1290b8b68cfd..7c5516b05dd3 100644 --- a/src/Cli/dotnet/Commands/Clean/CleanCommand.cs +++ b/src/Cli/dotnet/Commands/Clean/CleanCommand.cs @@ -13,7 +13,7 @@ public class CleanCommand(MSBuildArgs msbuildArgs, string? msbuildPath = null) : { public static CommandBase FromArgs(string[] args, string? msbuildPath = null) { - var result = Parser.Parse(["dotnet", "clean", ..args]); + var result = Parser.Parse(["dotnet", "clean", .. args]); return FromParseResult(result, msbuildPath); } @@ -33,7 +33,7 @@ public static CommandBase FromParseResult(ParseResult result, string? msbuildPat NoWriteBuildMarkers = true, }, static (msbuildArgs, msbuildPath) => new CleanCommand(msbuildArgs, msbuildPath), - [ CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CleanCommandParser.TargetOption, CleanCommandParser.VerbosityOption ], + [CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, CleanCommandParser.TargetOption, CleanCommandParser.VerbosityOption], result, msbuildPath ); diff --git a/src/Cli/dotnet/Commands/Format/FormatCommand.cs b/src/Cli/dotnet/Commands/Format/FormatCommand.cs index 9ee9296172fa..d6629af67720 100644 --- a/src/Cli/dotnet/Commands/Format/FormatCommand.cs +++ b/src/Cli/dotnet/Commands/Format/FormatCommand.cs @@ -13,7 +13,7 @@ public class FormatCommand(IEnumerable argsToForward) : FormatForwarding { public static FormatCommand FromArgs(string[] args) { - var result = Parser.Parse(["dotnet", "format", ..args]); + var result = Parser.Parse(["dotnet", "format", .. args]); return FromParseResult(result); } diff --git a/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommand.cs b/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommand.cs index 5cdf66cfca6e..33904941b817 100644 --- a/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommand.cs +++ b/src/Cli/dotnet/Commands/Hidden/Complete/CompleteCommand.cs @@ -19,7 +19,7 @@ public static int Run(ParseResult parseResult) public static int RunWithReporter(string[] args, IReporter reporter) { - var result = Parser.Parse(["dotnet", "complete", ..args]); + var result = Parser.Parse(["dotnet", "complete", .. args]); return RunWithReporter(result, reporter); } diff --git a/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs b/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs index 744289023948..bed479d01816 100644 --- a/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs +++ b/src/Cli/dotnet/Commands/Hidden/InternalReportInstallSuccess/InternalReportInstallSuccessCommand.cs @@ -25,7 +25,7 @@ public static int Run(ParseResult parseResult) public static void ProcessInputAndSendTelemetry(string[] args, ITelemetry telemetry) { - var result = Parser.Parse(["dotnet", "internal-reportinstallsuccess", ..args]); + var result = Parser.Parse(["dotnet", "internal-reportinstallsuccess", .. args]); ProcessInputAndSendTelemetry(result, telemetry); } diff --git a/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs b/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs index cf0b7e06c660..5deae21cb609 100644 --- a/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs +++ b/src/Cli/dotnet/Commands/MSBuild/MSBuildCommand.cs @@ -10,11 +10,11 @@ namespace Microsoft.DotNet.Cli.Commands.MSBuild; public class MSBuildCommand( IEnumerable msbuildArgs, string? msbuildPath = null -) : MSBuildForwardingApp(MSBuildArgs.AnalyzeMSBuildArguments([..msbuildArgs], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, MSBuildCommandParser.TargetOption, CommonOptions.VerbosityOption()), msbuildPath, includeLogo: true) +) : MSBuildForwardingApp(MSBuildArgs.AnalyzeMSBuildArguments([.. msbuildArgs], CommonOptions.PropertiesOption, CommonOptions.RestorePropertiesOption, MSBuildCommandParser.TargetOption, CommonOptions.VerbosityOption()), msbuildPath, includeLogo: true) { public static MSBuildCommand FromArgs(string[] args, string? msbuildPath = null) { - var result = Parser.Parse(["dotnet", "msbuild", ..args]); + var result = Parser.Parse(["dotnet", "msbuild", .. args]); return FromParseResult(result, msbuildPath); } diff --git a/src/Cli/dotnet/Commands/Pack/PackCommand.cs b/src/Cli/dotnet/Commands/Pack/PackCommand.cs index 1e88f22688f5..3d574c30bf18 100644 --- a/src/Cli/dotnet/Commands/Pack/PackCommand.cs +++ b/src/Cli/dotnet/Commands/Pack/PackCommand.cs @@ -24,7 +24,7 @@ public class PackCommand( { public static CommandBase FromArgs(string[] args, string? msbuildPath = null) { - var parseResult = Parser.Parse(["dotnet", "pack", ..args]); + var parseResult = Parser.Parse(["dotnet", "pack", .. args]); return FromParseResult(parseResult, msbuildPath); } @@ -92,14 +92,14 @@ public static int RunPackCommand(ParseResult parseResult) if (args.Count != 1) { - Console.Error.WriteLine(CliStrings.PackCmd_OneNuspecAllowed); + Console.Error.WriteLine(CliStrings.PackCmd_OneNuspecAllowed); return 1; } var nuspecPath = args[0]; var packArgs = new PackArgs() - { + { Logger = new NuGetConsoleLogger(), Exclude = new List(), OutputDirectory = parseResult.GetValue(PackCommandParser.OutputOption), diff --git a/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs b/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs index 27520377cad2..7e340ac81fa7 100644 --- a/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs +++ b/src/Cli/dotnet/Commands/Package/List/PackageListCommand.cs @@ -4,12 +4,12 @@ #nullable disable using System.CommandLine; +using System.Globalization; using Microsoft.DotNet.Cli.Commands.Hidden.List; +using Microsoft.DotNet.Cli.Commands.MSBuild; using Microsoft.DotNet.Cli.Commands.NuGet; using Microsoft.DotNet.Cli.Extensions; using Microsoft.DotNet.Cli.Utils; -using System.Globalization; -using Microsoft.DotNet.Cli.Commands.MSBuild; namespace Microsoft.DotNet.Cli.Commands.Package.List; diff --git a/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs b/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs index 4317f96329be..8bbfd5261cdc 100644 --- a/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs +++ b/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs @@ -3,9 +3,9 @@ #nullable disable +using System.CommandLine; using Microsoft.DotNet.Cli.Commands.NuGet; using Microsoft.DotNet.Cli.Extensions; -using System.CommandLine; namespace Microsoft.DotNet.Cli.Commands.Package.Search; diff --git a/src/Cli/dotnet/Commands/Publish/PublishCommand.cs b/src/Cli/dotnet/Commands/Publish/PublishCommand.cs index 45dc32c84300..dfafac3d4807 100644 --- a/src/Cli/dotnet/Commands/Publish/PublishCommand.cs +++ b/src/Cli/dotnet/Commands/Publish/PublishCommand.cs @@ -21,7 +21,7 @@ private PublishCommand( public static CommandBase FromArgs(string[] args, string? msbuildPath = null) { - var parseResult = Parser.Parse(["dotnet", "publish", ..args]); + var parseResult = Parser.Parse(["dotnet", "publish", .. args]); return FromParseResult(parseResult); } diff --git a/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs b/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs index 6eb650b0e261..bd685b2b6ec2 100644 --- a/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs +++ b/src/Cli/dotnet/Commands/Restore/RestoreCommand.cs @@ -13,7 +13,7 @@ public static class RestoreCommand { public static CommandBase FromArgs(string[] args, string? msbuildPath = null) { - var result = Parser.Parse(["dotnet", "restore", ..args]); + var result = Parser.Parse(["dotnet", "restore", .. args]); return FromParseResult(result, msbuildPath); } diff --git a/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs b/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs index dd2e961c1524..ea92c35ab063 100644 --- a/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs +++ b/src/Cli/dotnet/Commands/Restore/RestoringCommand.cs @@ -37,7 +37,7 @@ public RestoringCommand( string? msbuildPath = null, string? userProfileDir = null, bool? advertiseWorkloadUpdates = null) - : base(GetCommandArguments(msbuildArgs, noRestore), msbuildPath) + : base(GetCommandArguments(msbuildArgs, noRestore), msbuildPath) { userProfileDir = CliFolderPathCalculator.DotnetUserProfileFolderPath; Task.Run(() => WorkloadManifestUpdater.BackgroundUpdateAdvertisingManifestsAsync(userProfileDir)); @@ -122,13 +122,13 @@ private static MSBuildArgs GetCommandArguments( ReadOnlyDictionary restoreProperties = msbuildArgs.GlobalProperties? .Where(kvp => !IsPropertyExcludedFromRestore(kvp.Key))? - .ToDictionary(kvp => kvp.Key, kvp => kvp.Value, StringComparer.OrdinalIgnoreCase) is { } filteredList ? new(filteredList): ReadOnlyDictionary.Empty; + .ToDictionary(kvp => kvp.Key, kvp => kvp.Value, StringComparer.OrdinalIgnoreCase) is { } filteredList ? new(filteredList) : ReadOnlyDictionary.Empty; var restoreMSBuildArgs = MSBuildArgs.FromProperties(RestoreOptimizationProperties) .CloneWithAdditionalTargets("Restore") .CloneWithExplicitArgs([.. newArgumentsToAdd, .. existingArgumentsToForward]) .CloneWithAdditionalProperties(restoreProperties); - if (msbuildArgs.Verbosity is {} verbosity) + if (msbuildArgs.Verbosity is { } verbosity) { restoreMSBuildArgs = restoreMSBuildArgs.CloneWithVerbosity(verbosity); } @@ -175,7 +175,7 @@ private static bool HasPropertyToExcludeFromRestore(MSBuildArgs msbuildArgs) private static readonly List FlagsThatTriggerSilentSeparateRestore = [.. ComputeFlags(FlagsThatTriggerSilentRestore)]; - private static readonly List PropertiesToExcludeFromSeparateRestore = [ .. PropertiesToExcludeFromRestore ]; + private static readonly List PropertiesToExcludeFromSeparateRestore = [.. PropertiesToExcludeFromRestore]; /// /// We investigate the arguments we're about to send to a separate restore call and filter out diff --git a/src/Cli/dotnet/Commands/Run/LaunchSettings/LaunchSettingsManager.cs b/src/Cli/dotnet/Commands/Run/LaunchSettings/LaunchSettingsManager.cs index a1776027476d..3e4c7b2bd53e 100644 --- a/src/Cli/dotnet/Commands/Run/LaunchSettings/LaunchSettingsManager.cs +++ b/src/Cli/dotnet/Commands/Run/LaunchSettings/LaunchSettingsManager.cs @@ -84,7 +84,7 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett { if (prop.Value.TryGetProperty(CommandNameKey, out var commandNameElement) && commandNameElement.ValueKind == JsonValueKind.String) { - if (commandNameElement.GetString() is { } commandNameElementKey && _providers.ContainsKey(commandNameElementKey)) + if (commandNameElement.GetString() is { } commandNameElementKey && _providers.ContainsKey(commandNameElementKey)) { profileObject = prop.Value; break; @@ -120,7 +120,7 @@ public static LaunchSettingsApplyResult TryApplyLaunchSettings(string launchSett } } - private static bool TryLocateHandler(string? commandName, [NotNullWhen(true)]out ILaunchSettingsProvider? provider) + private static bool TryLocateHandler(string? commandName, [NotNullWhen(true)] out ILaunchSettingsProvider? provider) { if (commandName == null) { diff --git a/src/Cli/dotnet/Commands/Run/RunTelemetry.cs b/src/Cli/dotnet/Commands/Run/RunTelemetry.cs index 35e13b2d3fd2..47fae9a27f85 100644 --- a/src/Cli/dotnet/Commands/Run/RunTelemetry.cs +++ b/src/Cli/dotnet/Commands/Run/RunTelemetry.cs @@ -234,4 +234,4 @@ private static bool IsDefaultProfile(string? profileName) // The default profile name at this point is "(Default)" return profileName.Equals("(Default)", StringComparison.OrdinalIgnoreCase); } -} \ No newline at end of file +} diff --git a/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommand.cs b/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommand.cs index 074431c8981b..8c445a02d87f 100644 --- a/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Migrate/SolutionMigrateCommand.cs @@ -29,7 +29,9 @@ public override int Execute() { ConvertToSlnxAsync(slnFileFullPath, slnxFileFullPath, CancellationToken.None).Wait(); return 0; - } catch (Exception ex) { + } + catch (Exception ex) + { throw new GracefulException(ex.Message, ex); } } diff --git a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs index 2c8184dc29f1..f84db1da64ac 100644 --- a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs @@ -132,7 +132,7 @@ private static async Task RemoveProjectsAsync(string solutionFileFullPath, IEnum { solution.RemoveFolder(folder); // After removal, adjust index and continue to avoid skipping folders after removal - i--; + i--; } } @@ -153,7 +153,7 @@ private static async Task RemoveProjectsFromSolutionFilterAsync(string slnfFileF { // Normalize the path to be relative to parent solution string normalizedPath = projectPath; - + // Try to find and remove the project if (existingProjects.Remove(normalizedPath)) { diff --git a/src/Cli/dotnet/Commands/Store/StoreCommand.cs b/src/Cli/dotnet/Commands/Store/StoreCommand.cs index 0c7846c513e2..f02b52b641dc 100644 --- a/src/Cli/dotnet/Commands/Store/StoreCommand.cs +++ b/src/Cli/dotnet/Commands/Store/StoreCommand.cs @@ -19,7 +19,7 @@ private StoreCommand(IEnumerable msbuildArgs, string msbuildPath = null) public static StoreCommand FromArgs(string[] args, string msbuildPath = null) { - var result = Parser.Parse(["dotnet", "store", ..args]); + var result = Parser.Parse(["dotnet", "store", .. args]); return FromParseResult(result, msbuildPath); } diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs index 3e320fa8a06b..766acd1d33ec 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs @@ -1,12 +1,12 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Concurrent; -using Microsoft.TemplateEngine.Cli.Help; using System.Globalization; using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; -using Microsoft.Testing.Platform.OutputDevice.Terminal; using Microsoft.DotNet.Cli.Commands.Test.IPC.Models; +using Microsoft.TemplateEngine.Cli.Help; +using Microsoft.Testing.Platform.OutputDevice.Terminal; namespace Microsoft.DotNet.Cli.Commands.Test.Terminal; diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs index 41ee319317e7..4496703ace28 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationActionQueue.cs @@ -78,7 +78,7 @@ private async Task Read(BuildOptions buildOptions, TestOptions testOptions, Term { result = ExitCode.GenericFailure; } - + lock (_lock) { if (_aggregateExitCode is null) diff --git a/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs b/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs index 51df89df08e0..53d4824d1c12 100644 --- a/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs +++ b/src/Cli/dotnet/Commands/Test/VSTest/TestCommand.cs @@ -154,7 +154,7 @@ private static int ForwardToVSTestConsole(ParseResult parseResult, string[] args public static TestCommand FromArgs(string[] args, string? testSessionCorrelationId = null, string? msbuildPath = null) { - var parseResult = Parser.Parse(["dotnet", "test", ..args]); + var parseResult = Parser.Parse(["dotnet", "test", .. args]); // settings parameters are after -- (including --), these should not be considered by the parser string[] settings = [.. args.SkipWhile(a => a != "--")]; @@ -240,9 +240,10 @@ private static TestCommand FromParseResult(ParseResult result, string[] settings } } - + Dictionary variables = VSTestForwardingApp.GetVSTestRootVariables(); - foreach (var (rootVariableName, rootValue) in variables) { + foreach (var (rootVariableName, rootValue) in variables) + { testCommand.EnvironmentVariable(rootVariableName, rootValue); VSTestTrace.SafeWriteTrace(() => $"Root variable set {rootVariableName}:{rootValue}"); } @@ -304,7 +305,7 @@ private static bool ContainsBuiltTestSources(string[] args) if (arg.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) || arg.EndsWith(".exe", StringComparison.OrdinalIgnoreCase)) { var previousArg = i > 0 ? args[i - 1] : null; - if (previousArg != null && CommonOptions.PropertiesOption.Aliases.Contains(previousArg)) + if (previousArg != null && CommonOptions.PropertiesOption.Aliases.Contains(previousArg)) { return false; } diff --git a/src/Cli/dotnet/Commands/Test/VSTest/VSTestForwardingApp.cs b/src/Cli/dotnet/Commands/Test/VSTest/VSTestForwardingApp.cs index fb81e15466f9..26a021485c97 100644 --- a/src/Cli/dotnet/Commands/Test/VSTest/VSTestForwardingApp.cs +++ b/src/Cli/dotnet/Commands/Test/VSTest/VSTestForwardingApp.cs @@ -20,7 +20,7 @@ public VSTestForwardingApp(IEnumerable argsToForward) WithEnvironmentVariable(rootVariableName, rootValue); VSTestTrace.SafeWriteTrace(() => $"Root variable set {rootVariableName}:{rootValue}"); } - + VSTestTrace.SafeWriteTrace(() => $"Forwarding to '{GetVSTestExePath()}' with args \"{argsToForward?.Aggregate((a, b) => $"{a} | {b}")}\""); } diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs index c465e20372e5..431b92f2c654 100644 --- a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs @@ -5,20 +5,20 @@ using System.CommandLine; using System.Transactions; +using Microsoft.DotNet.Cli.Commands.Tool.Common; +using Microsoft.DotNet.Cli.Commands.Tool.List; +using Microsoft.DotNet.Cli.Commands.Tool.Uninstall; +using Microsoft.DotNet.Cli.Commands.Tool.Update; +using Microsoft.DotNet.Cli.Extensions; using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.ShellShim; using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; +using Microsoft.DotNet.Cli.Utils.Extensions; using Microsoft.Extensions.EnvironmentAbstractions; using NuGet.Common; using NuGet.Frameworks; using NuGet.Versioning; -using Microsoft.DotNet.Cli.Utils.Extensions; -using Microsoft.DotNet.Cli.Extensions; -using Microsoft.DotNet.Cli.ShellShim; -using Microsoft.DotNet.Cli.Commands.Tool.Update; -using Microsoft.DotNet.Cli.Commands.Tool.Common; -using Microsoft.DotNet.Cli.Commands.Tool.Uninstall; -using Microsoft.DotNet.Cli.Commands.Tool.List; namespace Microsoft.DotNet.Cli.Commands.Tool.Install; @@ -187,7 +187,7 @@ private int ExecuteInstallCommand(PackageId packageId) { _reporter.WriteLine(string.Format(CliCommandStrings.ToolAlreadyInstalled, oldPackageNullable.Id, oldPackageNullable.Version.ToNormalizedString()).Green()); return 0; - } + } } TransactionalAction.Run(() => @@ -318,7 +318,7 @@ private static void RunWithHandlingUninstallError(Action uninstallAction, Packag { try { - uninstallAction(); + uninstallAction(); } catch (Exception ex) when (ToolUninstallCommandLowLevelErrorConverter.ShouldConvertToUserFacingError(ex)) @@ -396,7 +396,7 @@ private void PrintSuccessMessage(IToolPackage oldPackage, IToolPackage newInstal { _reporter.WriteLine( string.Format( - + newInstalledPackage.Version.IsPrerelease ? CliCommandStrings.UpdateSucceededPreVersionNoChange : CliCommandStrings.UpdateSucceededStableVersionNoChange, newInstalledPackage.Id, newInstalledPackage.Version).Green()); diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallLocalCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallLocalCommand.cs index 87fb7860f992..e0bf8ccd3247 100644 --- a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallLocalCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallLocalCommand.cs @@ -83,7 +83,7 @@ public override int Execute() } else { - return ExecuteInstallCommand((PackageId) _packageId); + return ExecuteInstallCommand((PackageId)_packageId); } } diff --git a/src/Cli/dotnet/Commands/Tool/List/ToolListJsonHelper.cs b/src/Cli/dotnet/Commands/Tool/List/ToolListJsonHelper.cs index 2ff9552ceeca..914f19efe192 100644 --- a/src/Cli/dotnet/Commands/Tool/List/ToolListJsonHelper.cs +++ b/src/Cli/dotnet/Commands/Tool/List/ToolListJsonHelper.cs @@ -10,12 +10,12 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.List; internal sealed class VersionedDataContract { - /// - /// The version of the JSON format for dotnet tool list. - /// + /// + /// The version of the JSON format for dotnet tool list. + /// [JsonPropertyName("version")] public int Version { get; init; } = 1; - + [JsonPropertyName("data")] public required TContract Data { get; init; } } @@ -24,10 +24,10 @@ internal class ToolListJsonContract { [JsonPropertyName("packageId")] public required string PackageId { get; init; } - + [JsonPropertyName("version")] public required string Version { get; init; } - + [JsonPropertyName("commands")] public required string[] Commands { get; init; } } diff --git a/src/Cli/dotnet/Commands/Tool/Restore/ToolPackageRestorer.cs b/src/Cli/dotnet/Commands/Tool/Restore/ToolPackageRestorer.cs index b1c3b3f4ed52..1377a97cb006 100644 --- a/src/Cli/dotnet/Commands/Tool/Restore/ToolPackageRestorer.cs +++ b/src/Cli/dotnet/Commands/Tool/Restore/ToolPackageRestorer.cs @@ -109,7 +109,7 @@ private static bool ManifestCommandMatchesActualInPackage( IReadOnlyList toolPackageCommands) { ToolCommandName[] commandsFromPackage = [.. toolPackageCommands.Select(t => t.Name)]; -return !commandsFromManifest.Any(cmd => !commandsFromPackage.Contains(cmd)) && !commandsFromPackage.Any(cmd => !commandsFromManifest.Contains(cmd)); + return !commandsFromManifest.Any(cmd => !commandsFromPackage.Contains(cmd)) && !commandsFromPackage.Any(cmd => !commandsFromManifest.Contains(cmd)); } public bool PackageHasBeenRestored( diff --git a/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallGlobalOrToolPathCommand.cs index 58db9f55cc04..6db95e91941a 100644 --- a/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Uninstall/ToolUninstallGlobalOrToolPathCommand.cs @@ -73,7 +73,7 @@ public override int Execute() TransactionalAction.Run(() => { shellShimRepository.RemoveShim(package.Command); - + toolPackageUninstaller.Uninstall(package.PackageDirectory); }); diff --git a/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateGlobalOrToolPathCommand.cs index 4c73cebd76f0..2d4c881bbc83 100644 --- a/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Update/ToolUpdateGlobalOrToolPathCommand.cs @@ -4,12 +4,12 @@ #nullable disable using System.CommandLine; +using Microsoft.DotNet.Cli.Commands.Tool.Install; +using Microsoft.DotNet.Cli.ShellShim; +using Microsoft.DotNet.Cli.ToolPackage; using Microsoft.DotNet.Cli.Utils; using Microsoft.Extensions.EnvironmentAbstractions; -using Microsoft.DotNet.Cli.ToolPackage; using CreateShellShimRepository = Microsoft.DotNet.Cli.Commands.Tool.Install.CreateShellShimRepository; -using Microsoft.DotNet.Cli.ShellShim; -using Microsoft.DotNet.Cli.Commands.Tool.Install; namespace Microsoft.DotNet.Cli.Commands.Tool.Update; diff --git a/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommand.cs b/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommand.cs index ceebc46404a9..cbb727effd59 100644 --- a/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommand.cs +++ b/src/Cli/dotnet/Commands/Workload/History/WorkloadHistoryCommand.cs @@ -4,11 +4,11 @@ #nullable disable using System.CommandLine; +using Microsoft.Deployment.DotNet.Releases; +using Microsoft.DotNet.Cli.Commands.Workload.Install; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.Utils; using Microsoft.NET.Sdk.WorkloadManifestReader; -using Microsoft.Deployment.DotNet.Releases; -using Microsoft.DotNet.Cli.Commands.Workload.Install; namespace Microsoft.DotNet.Cli.Commands.Workload.History; diff --git a/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommand.cs b/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommand.cs index 1dbc16110933..e1f64e74fb98 100644 --- a/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommand.cs +++ b/src/Cli/dotnet/Commands/Workload/Restore/WorkloadRestoreCommand.cs @@ -60,7 +60,7 @@ public override int Execute() }); workloadInstaller.Shutdown(); - + return 0; } diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs b/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs index 44b441349be3..83c3622afd18 100644 --- a/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs +++ b/src/Cli/dotnet/Commands/Workload/WorkloadCommandBase.cs @@ -96,7 +96,7 @@ public WorkloadCommandBase( Verbosity = verbosityOptions == null ? parseResult.GetValue(CommonOptions.VerbosityOption(VerbosityOptions.normal)) - : parseResult.GetValue(verbosityOptions) ; + : parseResult.GetValue(verbosityOptions); ILogger nugetLogger = Verbosity.IsDetailedOrDiagnostic() ? new NuGetConsoleLogger() : new NullLogger(); diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs b/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs index 3c6e0bb43c6d..79775f7664ac 100644 --- a/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs +++ b/src/Cli/dotnet/Commands/Workload/WorkloadCommandParser.cs @@ -20,8 +20,8 @@ using Microsoft.DotNet.Cli.Utils; using Microsoft.NET.Sdk.WorkloadManifestReader; using Microsoft.TemplateEngine.Cli.Commands; -using IReporter = Microsoft.DotNet.Cli.Utils.IReporter; using Command = System.CommandLine.Command; +using IReporter = Microsoft.DotNet.Cli.Utils.IReporter; namespace Microsoft.DotNet.Cli.Commands.Workload; diff --git a/src/Cli/dotnet/CommonOptions.cs b/src/Cli/dotnet/CommonOptions.cs index aa1730a23525..2b0c376c906f 100644 --- a/src/Cli/dotnet/CommonOptions.cs +++ b/src/Cli/dotnet/CommonOptions.cs @@ -348,7 +348,7 @@ public static ForwardedOption InteractiveOption(bool acceptArgument = fals }; public static readonly Option> EnvOption = CreateEnvOption(CliStrings.CmdEnvironmentVariableDescription); - + public static readonly Option> TestEnvOption = CreateEnvOption(CliStrings.CmdTestEnvironmentVariableDescription); private static IReadOnlyDictionary ParseEnvironmentVariables(ArgumentResult argumentResult) diff --git a/src/Cli/dotnet/DotNetCommandFactory.cs b/src/Cli/dotnet/DotNetCommandFactory.cs index ea5eb912e8f6..dcb70b05e6c9 100644 --- a/src/Cli/dotnet/DotNetCommandFactory.cs +++ b/src/Cli/dotnet/DotNetCommandFactory.cs @@ -38,7 +38,7 @@ private static bool TryGetBuiltInCommand(string commandName, out Func Parser.Invoke([commandName, ..args]); + commandFunc = (args) => Parser.Invoke([commandName, .. args]); return true; } commandFunc = null; diff --git a/src/Cli/dotnet/Extensions/CommonOptionsExtensions.cs b/src/Cli/dotnet/Extensions/CommonOptionsExtensions.cs index 9254bbd73b77..a225056f02f8 100644 --- a/src/Cli/dotnet/Extensions/CommonOptionsExtensions.cs +++ b/src/Cli/dotnet/Extensions/CommonOptionsExtensions.cs @@ -4,8 +4,8 @@ #nullable disable using Microsoft.Build.Framework; -using Microsoft.Extensions.Logging; using Microsoft.DotNet.Cli.Utils; +using Microsoft.Extensions.Logging; namespace Microsoft.DotNet.Cli.Extensions; diff --git a/src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs index a5e54ba06bb9..0c606c61dbf7 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/INuGetPackageDownloader.cs @@ -43,4 +43,4 @@ Task GetBestPackageVersionAsync(PackageId packageId, Task<(NuGetVersion version, PackageSource source)> GetBestPackageVersionAndSourceAsync(PackageId packageId, VersionRange versionRange, PackageSourceLocation packageSourceLocation = null); -} +} diff --git a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs index a311e88c646d..a0ce16fe6d0b 100644 --- a/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs +++ b/src/Cli/dotnet/NugetPackageDownloader/NuGetPackageDownloader.cs @@ -75,7 +75,7 @@ public NuGetPackageDownloader( _retryTimer = timer; _sourceRepositories = new(); // If windows or env variable is set, verify signatures - _verifySignatures = verifySignatures && (OperatingSystem.IsWindows() ? true + _verifySignatures = verifySignatures && (OperatingSystem.IsWindows() ? true : bool.TryParse(Environment.GetEnvironmentVariable(NuGetSignatureVerificationEnabler.DotNetNuGetSignatureVerification), out var shouldVerifySignature) ? shouldVerifySignature : OperatingSystem.IsLinux()); _cacheSettings = new SourceCacheContext @@ -122,7 +122,7 @@ public async Task DownloadPackageAsync(PackageId packageId, throw new ArgumentException($"Package download folder must be specified either via {nameof(NuGetPackageDownloader)} constructor or via {nameof(downloadFolder)} method argument."); } var pathResolver = new VersionFolderPathResolver(resolvedDownloadFolder); - + string nupkgPath = pathResolver.GetPackageFilePath(packageId.ToString(), resolvedPackageVersion); Directory.CreateDirectory(Path.GetDirectoryName(nupkgPath)); diff --git a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs index e85fb9878d4c..7c03df034464 100644 --- a/src/Cli/dotnet/ReleasePropertyProjectLocator.cs +++ b/src/Cli/dotnet/ReleasePropertyProjectLocator.cs @@ -230,7 +230,8 @@ DependentCommandOptions commandOptions { return projectData; } - }; + } + ; return null; } diff --git a/src/Cli/dotnet/SlnfFileHelper.cs b/src/Cli/dotnet/SlnfFileHelper.cs index 368b930b5f13..ad19e1c5c7f1 100644 --- a/src/Cli/dotnet/SlnfFileHelper.cs +++ b/src/Cli/dotnet/SlnfFileHelper.cs @@ -74,14 +74,14 @@ public static void CreateSolutionFilter(string slnfPath, string parentSolutionPa public static void SaveSolutionFilter(string slnfPath, string parentSolutionPath, IEnumerable projects) { var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)); - + // Normalize the parent solution path to be relative to the slnf file var relativeSolutionPath = parentSolutionPath; if (Path.IsPathRooted(parentSolutionPath)) { relativeSolutionPath = Path.GetRelativePath(slnfDirectory, parentSolutionPath); } - + // Normalize path separators to backslashes (as per slnf format) relativeSolutionPath = relativeSolutionPath.Replace(Path.DirectorySeparatorChar, '\\'); diff --git a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs index 015af6723629..7960deb22cc7 100644 --- a/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs +++ b/src/Cli/dotnet/Telemetry/DevDeviceIDGetter.cs @@ -85,11 +85,11 @@ private static void CacheDeviceId(string deviceId) // Cache device Id in Windows registry matching the OS architecture using (RegistryKey baseKey = RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64)) { - using(var key = baseKey.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) + using (var key = baseKey.CreateSubKey(@"SOFTWARE\Microsoft\DeveloperTools")) { if (key != null) { - key.SetValue("deviceid", deviceId); + key.SetValue("deviceid", deviceId); } } } diff --git a/src/Cli/dotnet/Telemetry/EnvironmentDetectionRule.cs b/src/Cli/dotnet/Telemetry/EnvironmentDetectionRule.cs index 5cd73f53abb8..5f1aab066131 100644 --- a/src/Cli/dotnet/Telemetry/EnvironmentDetectionRule.cs +++ b/src/Cli/dotnet/Telemetry/EnvironmentDetectionRule.cs @@ -33,7 +33,7 @@ public BooleanEnvironmentRule(params string[] variables) public override bool IsMatch() { - return _variables.Any(variable => + return _variables.Any(variable => bool.TryParse(Environment.GetEnvironmentVariable(variable), out bool value) && value); } } @@ -96,8 +96,8 @@ public EnvironmentDetectionRuleWithResult(T result, params string[] variables) /// The result value if the rule matches; otherwise, null. public T? GetResult() { - return _variables.Any(variable => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(variable))) - ? _result + return _variables.Any(variable => !string.IsNullOrEmpty(Environment.GetEnvironmentVariable(variable))) + ? _result : null; } -} \ No newline at end of file +} diff --git a/src/Cli/dotnet/Telemetry/ILLMEnvironmentDetector.cs b/src/Cli/dotnet/Telemetry/ILLMEnvironmentDetector.cs index fe599569aa6c..1fb747d47ae5 100644 --- a/src/Cli/dotnet/Telemetry/ILLMEnvironmentDetector.cs +++ b/src/Cli/dotnet/Telemetry/ILLMEnvironmentDetector.cs @@ -6,4 +6,4 @@ namespace Microsoft.DotNet.Cli.Telemetry; internal interface ILLMEnvironmentDetector { string? GetLLMEnvironment(); -} \ No newline at end of file +} diff --git a/src/Cli/dotnet/Telemetry/LLMEnvironmentDetectorForTelemetry.cs b/src/Cli/dotnet/Telemetry/LLMEnvironmentDetectorForTelemetry.cs index 16d13a6879e7..532e91a2bd0a 100644 --- a/src/Cli/dotnet/Telemetry/LLMEnvironmentDetectorForTelemetry.cs +++ b/src/Cli/dotnet/Telemetry/LLMEnvironmentDetectorForTelemetry.cs @@ -20,4 +20,4 @@ internal class LLMEnvironmentDetectorForTelemetry : ILLMEnvironmentDetector var results = _detectionRules.Select(r => r.GetResult()).Where(r => r != null).ToArray(); return results.Length > 0 ? string.Join(", ", results) : null; } -} \ No newline at end of file +} diff --git a/src/Cli/dotnet/Telemetry/Telemetry.cs b/src/Cli/dotnet/Telemetry/Telemetry.cs index d9c3a59bd8a1..38f0d1c7ca19 100644 --- a/src/Cli/dotnet/Telemetry/Telemetry.cs +++ b/src/Cli/dotnet/Telemetry/Telemetry.cs @@ -258,6 +258,6 @@ static IDictionary Combine(IDictionary { eventMeasurements[measurement.Key] = measurement.Value; } - return eventMeasurements; - } + return eventMeasurements; + } } diff --git a/src/Cli/dotnet/ToolPackage/ToolConfiguration.cs b/src/Cli/dotnet/ToolPackage/ToolConfiguration.cs index 641c8c583a7c..9da8558f5384 100644 --- a/src/Cli/dotnet/ToolPackage/ToolConfiguration.cs +++ b/src/Cli/dotnet/ToolPackage/ToolConfiguration.cs @@ -62,7 +62,7 @@ private static void EnsureNoLeadingDot(string commandName) } } - + public string CommandName { get; } public string ToolAssemblyEntryPoint { get; } diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.cs.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.cs.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.cs.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.de.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.de.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.de.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.en.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.en.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.en.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.es.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.es.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.es.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.fr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.fr.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.fr.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.it.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.it.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.it.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ja.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ja.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ja.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ko.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ko.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ko.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pl.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pl.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pl.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pt-BR.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pt-BR.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.pt-BR.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ru.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ru.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.ru.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.tr.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.tr.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.tr.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hans.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hans.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hans.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hant.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hant.json new file mode 100644 index 000000000000..535e0d7b8229 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/localize/templatestrings.zh-Hant.json @@ -0,0 +1,7 @@ +{ + "author": "Microsoft", + "name": "Solution Filter File", + "description": "Create a solution filter file that references a parent solution", + "symbols/ParentSolution/displayName": "Parent solution file", + "symbols/ParentSolution/description": "The parent solution file (sln or slnx) that this filter references (default: same name with .slnx extension)." +} \ No newline at end of file diff --git a/test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnf b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnf new file mode 100644 index 000000000000..34cef9585f66 --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnf @@ -0,0 +1,8 @@ +{ + "solution": { + "path": "App.slnx", + "projects": [ + "src\\App\\App.csproj" + ] + } +} diff --git a/test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnx b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnx new file mode 100644 index 000000000000..54df61baa606 --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/App.slnx @@ -0,0 +1,5 @@ + + + + + diff --git a/test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/App/App.csproj b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/App/App.csproj new file mode 100644 index 000000000000..0361aa8cd36d --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/App/App.csproj @@ -0,0 +1,6 @@ + + + Exe + net9.0 + + diff --git a/test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/Lib/Lib.csproj b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/Lib/Lib.csproj new file mode 100644 index 000000000000..3043227ce00b --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/src/Lib/Lib.csproj @@ -0,0 +1,5 @@ + + + net9.0 + + diff --git a/test/TestAssets/TestProjects/TestAppWithSlnfFiles/test/AppTests/AppTests.csproj b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/test/AppTests/AppTests.csproj new file mode 100644 index 000000000000..eb91b2d48523 --- /dev/null +++ b/test/TestAssets/TestProjects/TestAppWithSlnfFiles/test/AppTests/AppTests.csproj @@ -0,0 +1,9 @@ + + + net9.0 + + + + + + diff --git a/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs b/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs index 3f78a0896e87..b2b30acdecc9 100644 --- a/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs +++ b/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs @@ -1313,5 +1313,71 @@ private string GetSolutionFileTemplateContents(string templateFileName) .Path; return File.ReadAllText(Path.Join(templateContentDirectory, templateFileName)); } + + // SLNF TESTS + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenAddingProjectToSlnfItAddsOnlyIfInParentSolution(string solutionCommand) + { + var projectDirectory = _testAssetsManager + .CopyTestAsset("TestAppWithSlnfFiles", identifier: $"GivenDotnetSlnAdd-Slnf-{solutionCommand}") + .WithSource() + .Path; + + var slnfFullPath = Path.Combine(projectDirectory, "App.slnf"); + + // Try to add Lib project which is in parent solution + var cmd = new DotnetCommand(Log) + .WithWorkingDirectory(projectDirectory) + .Execute(solutionCommand, "App.slnf", "add", Path.Combine("src", "Lib", "Lib.csproj")); + cmd.Should().Pass(); + cmd.StdOut.Should().Contain(string.Format(CliStrings.ProjectAddedToTheSolution, Path.Combine("src", "Lib", "Lib.csproj"))); + + // Verify the project was added to the slnf file + var slnfContent = File.ReadAllText(slnfFullPath); + slnfContent.Should().Contain("src\\\\Lib\\\\Lib.csproj"); + } + + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenRemovingProjectFromSlnfItRemovesSuccessfully(string solutionCommand) + { + var projectDirectory = _testAssetsManager + .CopyTestAsset("TestAppWithSlnfFiles", identifier: $"GivenDotnetSlnAdd-SlnfRemove-{solutionCommand}") + .WithSource() + .Path; + + var slnfFullPath = Path.Combine(projectDirectory, "App.slnf"); + + // Remove the App project from the filter + var cmd = new DotnetCommand(Log) + .WithWorkingDirectory(projectDirectory) + .Execute(solutionCommand, "App.slnf", "remove", Path.Combine("src", "App", "App.csproj")); + cmd.Should().Pass(); + cmd.StdOut.Should().Contain(string.Format(CliStrings.ProjectRemovedFromTheSolution, Path.Combine("src", "App", "App.csproj"))); + + // Verify the project was removed from the slnf file + var slnfContent = File.ReadAllText(slnfFullPath); + slnfContent.Should().NotContain("src\\\\App\\\\App.csproj"); + } + + [Theory] + [InlineData("sln")] + [InlineData("solution")] + public void WhenAddingProjectToSlnfWithInRootOptionItErrors(string solutionCommand) + { + var projectDirectory = _testAssetsManager + .CopyTestAsset("TestAppWithSlnfFiles", identifier: $"GivenDotnetSlnAdd-SlnfInRoot-{solutionCommand}") + .WithSource() + .Path; + + var cmd = new DotnetCommand(Log) + .WithWorkingDirectory(projectDirectory) + .Execute(solutionCommand, "App.slnf", "add", "--in-root", Path.Combine("src", "Lib", "Lib.csproj")); + cmd.Should().Fail(); + cmd.StdErr.Should().Contain(CliCommandStrings.SolutionFilterDoesNotSupportFolderOptions); + } } } From b8b880077e420ab649bb340cf56ff0bc2d41cf8d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 7 Oct 2025 21:22:34 +0000 Subject: [PATCH 003/280] Fix null reference issues in slnf handling and improve path handling Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs | 7 ++++--- src/Cli/dotnet/SlnfFileHelper.cs | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs index f6f4e2ff3003..d846c9bf1f3b 100644 --- a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs @@ -58,11 +58,11 @@ public override int Execute() // Get project paths from the command line arguments PathUtility.EnsureAllPathsExist(_projects, CliStrings.CouldNotFindProjectOrDirectory, true); - IEnumerable fullProjectPaths = _projects.Select(project => + List fullProjectPaths = _projects.Select(project => { var fullPath = Path.GetFullPath(project); return Directory.Exists(fullPath) ? MsbuildProject.GetProjectFileFromDirectory(fullPath).FullName : fullPath; - }); + }).ToList(); // Check if we're working with a solution filter file if (_solutionFileFullPath.HasExtension(".slnf")) @@ -253,9 +253,10 @@ private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectP // Get solution-relative paths for new projects var newProjects = new List(); + string parentSolutionDirectory = Path.GetDirectoryName(parentSolutionPath) ?? string.Empty; foreach (var projectPath in projectPaths) { - string parentSolutionRelativePath = Path.GetRelativePath(Path.GetDirectoryName(parentSolutionPath)!, projectPath); + string parentSolutionRelativePath = Path.GetRelativePath(parentSolutionDirectory, projectPath); // Check if project exists in parent solution var projectInParent = parentSolution.FindProject(parentSolutionRelativePath); diff --git a/src/Cli/dotnet/SlnfFileHelper.cs b/src/Cli/dotnet/SlnfFileHelper.cs index ad19e1c5c7f1..c4a788bc87dc 100644 --- a/src/Cli/dotnet/SlnfFileHelper.cs +++ b/src/Cli/dotnet/SlnfFileHelper.cs @@ -39,7 +39,7 @@ private class SlnfRoot /// List of project paths to include (relative to the parent solution) public static void CreateSolutionFilter(string slnfPath, string parentSolutionPath, IEnumerable projects = null) { - var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)); + var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)) ?? string.Empty; var parentSolutionFullPath = Path.GetFullPath(parentSolutionPath, slnfDirectory); var relativeSolutionPath = Path.GetRelativePath(slnfDirectory, parentSolutionFullPath); @@ -73,7 +73,7 @@ public static void CreateSolutionFilter(string slnfPath, string parentSolutionPa /// List of project paths (relative to the parent solution) public static void SaveSolutionFilter(string slnfPath, string parentSolutionPath, IEnumerable projects) { - var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)); + var slnfDirectory = Path.GetDirectoryName(Path.GetFullPath(slnfPath)) ?? string.Empty; // Normalize the parent solution path to be relative to the slnf file var relativeSolutionPath = parentSolutionPath; From 484dfcf8c8c2def71e64ff6c22227ce3aab97a4b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 15:48:46 +0000 Subject: [PATCH 004/280] Add dotnetcli.host.json for slnf template and normalize path separators Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../dotnet/Commands/Solution/Add/SolutionAddCommand.cs | 5 ++++- src/Cli/dotnet/SlnFileFactory.cs | 2 ++ .../SolutionFilter/.template.config/dotnetcli.host.json | 9 +++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/dotnetcli.host.json diff --git a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs index d846c9bf1f3b..04c781931598 100644 --- a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs @@ -248,7 +248,7 @@ private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectP // Load the parent solution to validate projects exist in it SolutionModel parentSolution = SlnFileFactory.CreateFromFileOrDirectory(parentSolutionPath); - // Get existing projects in the filter + // Get existing projects in the filter (already normalized to OS separator by CreateFromFilteredSolutionFile) var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); // Get solution-relative paths for new projects @@ -258,6 +258,9 @@ private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectP { string parentSolutionRelativePath = Path.GetRelativePath(parentSolutionDirectory, projectPath); + // Normalize to OS separator for consistent comparison + parentSolutionRelativePath = parentSolutionRelativePath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); + // Check if project exists in parent solution var projectInParent = parentSolution.FindProject(parentSolutionRelativePath); if (projectInParent is null) diff --git a/src/Cli/dotnet/SlnFileFactory.cs b/src/Cli/dotnet/SlnFileFactory.cs index 788752df3cff..6cbce88744b4 100644 --- a/src/Cli/dotnet/SlnFileFactory.cs +++ b/src/Cli/dotnet/SlnFileFactory.cs @@ -91,6 +91,8 @@ public static SolutionModel CreateFromFilteredSolutionFile(string filteredSoluti { JsonElement root = JsonDocument.Parse(File.ReadAllText(filteredSolutionPath)).RootElement; originalSolutionPath = Uri.UnescapeDataString(root.GetProperty("solution").GetProperty("path").GetString()); + // Normalize path separators to OS-specific for cross-platform compatibility + originalSolutionPath = originalSolutionPath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); filteredSolutionProjectPaths = [.. root.GetProperty("solution").GetProperty("projects").EnumerateArray().Select(p => p.GetString())]; originalSolutionPathAbsolute = Path.GetFullPath(originalSolutionPath, Path.GetDirectoryName(filteredSolutionPath)); } diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/dotnetcli.host.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/dotnetcli.host.json new file mode 100644 index 000000000000..6bc180f304f1 --- /dev/null +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/SolutionFilter/.template.config/dotnetcli.host.json @@ -0,0 +1,9 @@ +{ + "$schema": "http://json.schemastore.org/dotnetcli.host", + "symbolInfo": { + "ParentSolution": { + "longName": "parent-solution", + "shortName": "s" + } + } +} From f2ad541c8a4bcfefc6003319c0ac84d695f703e2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 16:10:04 +0000 Subject: [PATCH 005/280] Add tests for slnf template with --parent-solution and -s parameters Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../Solution-Filter-File/item.slnf | 6 ++++++ .../std-streams/stdout.txt | 1 + .../Solution-Filter-File/item.slnf | 6 ++++++ .../std-streams/stdout.txt | 1 + test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs | 3 +++ 5 files changed, 17 insertions(+) create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/Solution-Filter-File/item.slnf create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/std-streams/stdout.txt create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/Solution-Filter-File/item.slnf create mode 100644 test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/std-streams/stdout.txt diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/Solution-Filter-File/item.slnf b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/Solution-Filter-File/item.slnf new file mode 100644 index 000000000000..e66e7dc8b150 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/Solution-Filter-File/item.slnf @@ -0,0 +1,6 @@ +{ + "solution": { + "path": "Parent.slnx", + "projects": [] + } +} diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..70cab17a4b13 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#--parent-solution#Parent.slnx.verified/std-streams/stdout.txt @@ -0,0 +1 @@ +The template "%TEMPLATE_NAME%" was created successfully. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/Solution-Filter-File/item.slnf b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/Solution-Filter-File/item.slnf new file mode 100644 index 000000000000..e66e7dc8b150 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/Solution-Filter-File/item.slnf @@ -0,0 +1,6 @@ +{ + "solution": { + "path": "Parent.slnx", + "projects": [] + } +} diff --git a/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/std-streams/stdout.txt b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/std-streams/stdout.txt new file mode 100644 index 000000000000..70cab17a4b13 --- /dev/null +++ b/test/dotnet-new.IntegrationTests/Approvals/AllCommonItemsCreate.-o#Solution-Filter-File#-n#item#-s#Parent.slnx.verified/std-streams/stdout.txt @@ -0,0 +1 @@ +The template "%TEMPLATE_NAME%" was created successfully. \ No newline at end of file diff --git a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs index ad2d5e54b48c..af33ea66d105 100644 --- a/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs +++ b/test/dotnet-new.IntegrationTests/CommonTemplatesTests.cs @@ -46,6 +46,9 @@ public CommonTemplatesTests(SharedHomeDirectory fixture, ITestOutputHelper log) [InlineData("Solution File", "sln", new[] { "--format", "sln" })] [InlineData("Solution File", "sln", new[] { "--format", "slnx" })] [InlineData("Solution File", "solution", null)] + [InlineData("Solution Filter File", "slnf", new[] { "--parent-solution", "Parent.slnx" })] + [InlineData("Solution Filter File", "slnf", new[] { "-s", "Parent.slnx" })] + [InlineData("Solution Filter File", "solutionfilter", new[] { "--parent-solution", "Parent.slnx" })] [InlineData("Dotnet local tool manifest file", "tool-manifest", null)] [InlineData("Web Config", "webconfig", null)] [InlineData("EditorConfig file", "editorconfig", null)] From 3c154af5a77e8f1ebcc0ad531c2713f9afdce042 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 17:26:58 +0000 Subject: [PATCH 006/280] Remove Solution1.slnf from Solution template and exclude it in template.json Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../content/Solution/.template.config/template.json | 4 ++-- .../content/Solution/Solution1.slnf | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) delete mode 100644 template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json index 444f3b273938..3a865d9c0e5e 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json @@ -41,11 +41,11 @@ "modifiers": [ { "condition": "(Format == \"slnx\")", - "exclude": [ "Solution1.sln" ] + "exclude": [ "Solution1.sln", "Solution1.slnf" ] }, { "condition": "(Format == \"sln\")", - "exclude": [ "Solution1.slnx" ] + "exclude": [ "Solution1.slnx", "Solution1.slnf" ] } ] } diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf deleted file mode 100644 index 0578829ee51e..000000000000 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/Solution1.slnf +++ /dev/null @@ -1,6 +0,0 @@ -{ - "solution": { - "path": "Solution1.slnx", - "projects": [] - } -} From 4f0f20a5554d54a319b8647f5b276348c1493619 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 17:39:25 +0000 Subject: [PATCH 007/280] Update CanDoTabCompletion test baseline to include slnf template Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt | 1 + .../DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt | 1 + ...otnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt | 1 + 3 files changed, 3 insertions(+) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt index 58f8f94f7231..e8f07f91d9b2 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Linux.verified.txt @@ -25,6 +25,7 @@ proto razorclasslib razorcomponent sln +slnf tool-manifest view viewimports diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt index 58f8f94f7231..e8f07f91d9b2 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.OSX.verified.txt @@ -25,6 +25,7 @@ proto razorclasslib razorcomponent sln +slnf tool-manifest view viewimports diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt index 6f90bdf0dd15..fdb015c97bef 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewCompleteTests.CanDoTabCompletion.Windows.verified.txt @@ -25,6 +25,7 @@ proto razorclasslib razorcomponent sln +slnf tool-manifest view viewimports From b3bc4e1810da5997a09d5c2f54533fb823b2aa77 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 17:48:50 +0000 Subject: [PATCH 008/280] Revert unnecessary exclusion of Solution1.slnf from template.json Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../content/Solution/.template.config/template.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json index 3a865d9c0e5e..444f3b273938 100644 --- a/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json +++ b/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Solution/.template.config/template.json @@ -41,11 +41,11 @@ "modifiers": [ { "condition": "(Format == \"slnx\")", - "exclude": [ "Solution1.sln", "Solution1.slnf" ] + "exclude": [ "Solution1.sln" ] }, { "condition": "(Format == \"sln\")", - "exclude": [ "Solution1.slnx", "Solution1.slnf" ] + "exclude": [ "Solution1.slnx" ] } ] } From 94e1bf8f343be19ac0d5422b7e12d6fbca4bc573 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:52:27 +0000 Subject: [PATCH 009/280] Update tab completion test baselines for slnf template Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- ...abCompletionTests.Create_GetAllSuggestions.verified.txt | 7 +++++++ ...pletionTests.RootCommand_GetAllSuggestions.verified.txt | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt index 610ddc1db75b..c37686f6b955 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.Create_GetAllSuggestions.verified.txt @@ -118,6 +118,13 @@ InsertText: sln, Documentation: Create an empty solution containing no projects }, + { + Label: slnf, + Kind: Value, + SortText: slnf, + InsertText: slnf, + Documentation: Create a solution filter file that references a parent solution + }, { Label: tool-manifest, Kind: Value, diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt index b06accd6268a..313aef5edadb 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/Approvals/TabCompletionTests.RootCommand_GetAllSuggestions.verified.txt @@ -118,6 +118,13 @@ InsertText: sln, Documentation: Create an empty solution containing no projects }, + { + Label: slnf, + Kind: Value, + SortText: slnf, + InsertText: slnf, + Documentation: Create a solution filter file that references a parent solution + }, { Label: tool-manifest, Kind: Value, From 6fea37c3f3b43f801083a88f4be895c22e4b673c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Nov 2025 21:23:11 +0000 Subject: [PATCH 010/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20251124.6 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.11 -> To Version 9.0.12 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.11-servicing.25520.1 -> To Version 9.0.12-servicing.25574.6 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.11-rtm.25520.2 -> To Version 9.0.12-rtm.25566.6 (parent: Microsoft.WindowsDesktop.App.Ref) Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.11-servicing.25519.1 -> To Version 9.0.12-servicing.25563.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.11-rtm.25520.2 -> To Version 9.0.12-rtm.25566.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 9 ++------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffa2d7ac8763..1f945292bdcd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,13 +33,12 @@ - - + @@ -68,15 +65,13 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0aba762d5e3f..eaa6d4ff4af6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,26 +254,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 88a1aae37eae3f1a0fb51bc828a9b302df178b2a + 1c89956a00551023a415f24426f34718f017976e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3bcdfce6d4b5e6825ae33f1e464b73264e36017f + 5159cc84c7e21ec211e7438a6dd41be9d4632caf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 88a1aae37eae3f1a0fb51bc828a9b302df178b2a + 1c89956a00551023a415f24426f34718f017976e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 38445d86c14d..b2485578026f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.11-servicing.25519.1 + 9.0.12-servicing.25563.6 @@ -130,10 +130,10 @@ - 9.0.11-servicing.25520.1 - 9.0.11-servicing.25520.1 - 9.0.11 - 9.0.11 + 9.0.12-servicing.25574.6 + 9.0.12-servicing.25574.6 + 9.0.12 + 9.0.12 @@ -237,8 +237,8 @@ - 9.0.11-rtm.25520.2 - 9.0.11-rtm.25520.2 + 9.0.12-rtm.25566.6 + 9.0.12-rtm.25566.6 From 61b9038a15e6de567b8339a89b6ab9aeeb1a0266 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Nov 2025 21:38:02 +0000 Subject: [PATCH 011/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20251124.6 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.11 -> To Version 9.0.12 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.11-servicing.25520.1 -> To Version 9.0.12-servicing.25574.6 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.11-rtm.25520.2 -> To Version 9.0.12-rtm.25566.6 (parent: Microsoft.WindowsDesktop.App.Ref) Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.11-servicing.25519.1 -> To Version 9.0.12-servicing.25563.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.11-rtm.25520.2 -> To Version 9.0.12-rtm.25566.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 9 ++------- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 27915c91988c..df8762a3cf4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -36,13 +34,12 @@ - - + @@ -71,13 +68,11 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b1d5ae57d83..74be3026dff2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -250,26 +250,26 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 6c65543c1f1eb7afc55533a107775e6e5004f023 + ad07489569287173b09e645da384f7659d8f537d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 88a1aae37eae3f1a0fb51bc828a9b302df178b2a + 1c89956a00551023a415f24426f34718f017976e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -356,13 +356,13 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3bcdfce6d4b5e6825ae33f1e464b73264e36017f + 5159cc84c7e21ec211e7438a6dd41be9d4632caf - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 88a1aae37eae3f1a0fb51bc828a9b302df178b2a + 1c89956a00551023a415f24426f34718f017976e https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 50d299a00c55..a62b0f271530 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 9.0.11-servicing.25519.1 + 9.0.12-servicing.25563.6 @@ -132,10 +132,10 @@ - 9.0.11-servicing.25520.1 - 9.0.11-servicing.25520.1 - 9.0.11 - 9.0.11 + 9.0.12-servicing.25574.6 + 9.0.12-servicing.25574.6 + 9.0.12 + 9.0.12 @@ -239,8 +239,8 @@ - 9.0.11-rtm.25520.2 - 9.0.11-rtm.25520.2 + 9.0.12-rtm.25566.6 + 9.0.12-rtm.25566.6 From 6c1bbe8bfc41789a45f20fcfe437915a346f55b1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Nov 2025 21:38:26 +0000 Subject: [PATCH 012/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20251120.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 , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.11-servicing.25520.6 -> To Version 9.0.12-servicing.25570.3 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.11 -> To Version 9.0.12 --- NuGet.config | 2 ++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index df8762a3cf4e..91b84a3b9f45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,6 +26,7 @@ + @@ -68,6 +69,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74be3026dff2..9e13ce8ec6bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 27eff4aab1ec7f7c9e15efcc65b02937023f9b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a https://github.com/nuget/nuget.client @@ -271,54 +271,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 1c89956a00551023a415f24426f34718f017976e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a @@ -339,21 +339,21 @@ 6baee15bf85cf11fe39a6b05bd422a08b95b68e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a @@ -505,9 +505,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 46479bf4cf05f522f421cd54dba5c853d5647c0a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a62b0f271530..32a614661ee3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -217,19 +217,19 @@ - 9.0.11 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11 - 9.0.11 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 + 9.0.12 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12 + 9.0.12 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 + 9.0.12-servicing.25570.3 From 5165d2f18a2f34563ca6e997ef56ffeb11f6e33c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Nov 2025 21:39:10 +0000 Subject: [PATCH 013/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20251124.1 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 , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.11-servicing.25520.6 -> To Version 9.0.12-servicing.25574.1 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.11 -> To Version 9.0.12 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 91b84a3b9f45..688c71dcb9d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -69,7 +69,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e13ce8ec6bf..863c499ee6cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 27eff4aab1ec7f7c9e15efcc65b02937023f9b34 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 46479bf4cf05f522f421cd54dba5c853d5647c0a + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 32a614661ee3..67f65b625400 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.12 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 9.0.12 9.0.12 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 - 9.0.12-servicing.25570.3 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 From 57559bb60ca6806976c6a2cb2fa5d5fdabae6962 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 24 Nov 2025 21:41:26 +0000 Subject: [PATCH 014/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20251124.1 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 , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.11-servicing.25520.6 -> To Version 9.0.12-servicing.25574.1 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.11 -> To Version 9.0.12 --- NuGet.config | 2 ++ eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f945292bdcd..a2d2633d9e13 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,6 +26,7 @@ + @@ -65,6 +66,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eaa6d4ff4af6..ac32e762a7f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 80d1922899056e081c0711aa29c72b19390d360c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 1c89956a00551023a415f24426f34718f017976e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba @@ -343,21 +343,21 @@ 2120c57cad2f9bedc66a5dcea6eecddfafc954ba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://github.com/dotnet/test-templates @@ -539,9 +539,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b2485578026f..f6b3e83c00a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,19 +215,19 @@ - 9.0.11 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11 - 9.0.11 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 - 9.0.11-servicing.25520.6 + 9.0.12 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12 + 9.0.12 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 + 9.0.12-servicing.25574.1 From b774289d3b40f0b786ff2c6cc5b6601357a1c9f3 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 24 Nov 2025 13:52:54 -0800 Subject: [PATCH 015/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251105.20 --- NuGet.config | 2 + eng/Version.Details.xml | 140 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++---------- 3 files changed, 106 insertions(+), 104 deletions(-) diff --git a/NuGet.config b/NuGet.config index 688c71dcb9d6..cc1198137a63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,6 +35,7 @@ + @@ -72,6 +73,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 863c499ee6cc..4690e26c19eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ b73682307aa0128c5edbec94c2e6a070d13ae6bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 @@ -226,29 +226,29 @@ 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -469,89 +469,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 @@ -585,9 +585,9 @@ 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 67f65b625400..76a024cf2309 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,50 +85,50 @@ - 9.0.11 - 9.0.11-servicing.25517.16 - 9.0.11 - 9.0.11 - 9.0.11-servicing.25517.16 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12-servicing.25555.20 + 9.0.12 + 9.0.12 + 9.0.12-servicing.25555.20 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 8.0.0-rc.1.23414.4 - 9.0.11-servicing.25517.16 - 9.0.11-servicing.25517.16 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12-servicing.25555.20 + 9.0.12-servicing.25555.20 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 2.1.0 - 9.0.11 + 9.0.12 8.0.0 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 8.0.0 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 4.5.1 4.5.5 8.0.5 4.5.4 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12 From 6611009b41033c504a1621d96ca5cdb26a61ea9d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 24 Nov 2025 13:58:07 -0800 Subject: [PATCH 016/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251105.20 --- NuGet.config | 2 + eng/Version.Details.xml | 140 ++++++++++++++++++++-------------------- eng/Versions.props | 68 +++++++++---------- 3 files changed, 106 insertions(+), 104 deletions(-) diff --git a/NuGet.config b/NuGet.config index a2d2633d9e13..4352e9ffa978 100644 --- a/NuGet.config +++ b/NuGet.config @@ -34,6 +34,7 @@ + @@ -71,6 +72,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac32e762a7f1..bcf5b8ca9cb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ e784f3d6d4dc06ae806a254dd14b0979248aa83a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 @@ -230,29 +230,29 @@ bc9161306b23641b0364b8f93d546da4d48da1eb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -503,89 +503,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 @@ -619,9 +619,9 @@ 6e2d8e204cebac7d3989c1996f96e5a9ed63fa80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa7cdded37981a97cec9a3e233c4a6af58a91c57 + 988e0a8c11415978061eb7aa8bb2b0a97450a547 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f6b3e83c00a0..b5fd43b481d3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,47 +86,47 @@ - 9.0.11 - 9.0.11-servicing.25517.16 - 9.0.11 - 9.0.11 - 9.0.11-servicing.25517.16 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12-servicing.25555.20 + 9.0.12 + 9.0.12 + 9.0.12-servicing.25555.20 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 8.0.0-rc.1.23414.4 - 9.0.11-servicing.25517.16 - 9.0.11-servicing.25517.16 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12-servicing.25555.20 + 9.0.12-servicing.25555.20 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 2.1.0 - 9.0.11 + 9.0.12 8.0.0 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 8.0.0 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 + 9.0.12 8.0.5 - 9.0.11 - 9.0.11 + 9.0.12 + 9.0.12 From d58d242534d51981a8a7ae5b7f34007dfd959469 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Dec 2025 02:02:08 +0000 Subject: [PATCH 017/280] Update dependencies from https://github.com/dotnet/templating build 20251202.6 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.320-servicing.25566.6 -> To Version 8.0.320-servicing.25602.6 Microsoft.TemplateEngine.Abstractions From Version 8.0.320 -> To Version 8.0.320 --- NuGet.config | 3 +-- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8b3ddaadbbbc..58c979e8fa2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,14 +11,13 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce75fb0507cf..c95f0bbf3040 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 71d44aae51c38b1ab1df8ef1a853dfff01b5a22d + 8d26ad2ef85cfd2da6d4078ddabf63e72e70941c - + https://github.com/dotnet/templating - 71d44aae51c38b1ab1df8ef1a853dfff01b5a22d + 8d26ad2ef85cfd2da6d4078ddabf63e72e70941c - + https://github.com/dotnet/templating - 71d44aae51c38b1ab1df8ef1a853dfff01b5a22d + 8d26ad2ef85cfd2da6d4078ddabf63e72e70941c diff --git a/eng/Versions.props b/eng/Versions.props index 0c3990876716..870484aac1fd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,7 +146,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.320-servicing.25566.6 + 8.0.320-servicing.25602.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 31be5ae5f0cf6d3a6e5be4e648ce548dec148fdf Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Thu, 4 Dec 2025 11:15:32 +0800 Subject: [PATCH 018/280] Restore darc-pub-DotNet-msbuild-Trusted --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 58c979e8fa2c..f8897051064e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,6 +11,7 @@ + From ccd519e67f6cab4022025ebdcba81ad273805fee Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 4 Dec 2025 18:37:27 +0000 Subject: [PATCH 019/280] Merged PR 55756: Exclude net472 files from SB SDK diff Fixes https://github.com/dotnet/source-build/issues/5432 SDK file diffs have shown up between a source-built SDK and Microsoft-built SDK. This is caused by the inclusion of `net472` directory for `Microsoft.Build.Tasks.Git` and `Microsoft.SourceLink.*`. That TFM is not included with source built by definition. So files in those directories can be excluded. The exclude file already had patterns for `netframework` directory so I've just updated it to use a wildcard that covers both `netframework` and `net472`. ---- #### AI description (iteration 1) #### PR Classification This pull request performs a configuration update to adjust exclusion patterns for SDK diff tests. #### PR Summary The changes update the exclusion file used by SourceBuild Smoke Tests to ensure that net472 (and other net-targeted) files are correctly omitted from SDK diff comparisons. - In `src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt`, the exclusion paths for the Microsoft.SourceLink entries were changed from `netframework` to `net*`. - The exclusion pattern for `Microsoft.Build.Tasks.Git` was similarly modified from `netframework` to `net*`. --- .../assets/SdkContentTests/SdkFileDiffExclusions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt index d10fb0eca178..33a1265a0d38 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/SdkContentTests/SdkFileDiffExclusions.txt @@ -20,7 +20,7 @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WindowsDesktop/|msft # Intentional - explicitly excluded from source-build # netfx tooling and tasks, not building in source-build - https://github.com/dotnet/source-build/issues/3514 -./sdk/x.y.z/Sdks/Microsoft.Build.Tasks.Git/tools/netframework/|msft +./sdk/x.y.z/Sdks/Microsoft.Build.Tasks.Git/tools/net*/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.BlazorWebAssembly/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Publish/tools/net472/|msft @@ -30,11 +30,11 @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.WebAssembly/tools/net472/|msft ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Worker/tools/net472/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.AzureRepos.Git/tools/netframework/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.Bitbucket.Git/tools/netframework/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.Common/tools/netframework/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitHub/tools/netframework/|msft -./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/netframework/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.AzureRepos.Git/tools/net*/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.Bitbucket.Git/tools/net*/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.Common/tools/net*/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitHub/tools/net*/|msft +./sdk/x.y.z/Sdks/Microsoft.SourceLink.GitLab/tools/net*/|msft # vstest localization is disabled in Linux builds - https://github.com/dotnet/source-build/issues/3517 ./sdk/x.y.z/*/Microsoft.CodeCoverage.IO.resources.dll|msft From a28eedf9b104b1c37d1b13592f79e4e47aab4f13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 02:02:04 +0000 Subject: [PATCH 020/280] Update dependencies from https://github.com/dotnet/arcade build 20251204.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25604.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 16 +++++----------- global.json | 4 ++-- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acab3aaf6a08..40771cccad6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8c4069c5a5a2..96510f5aedf2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25577.1 + 8.0.0-beta.25604.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25577.1 + 8.0.0-beta.25604.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6764bdedbf05..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -545,25 +545,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -960,4 +954,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 0d6140e41e91..7e37345e6a87 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25577.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25604.1" } } From fa04df1c10a339f523cc5a84aea690ff05ca7daf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 02:03:01 +0000 Subject: [PATCH 021/280] Update dependencies from https://github.com/dotnet/arcade build 20251204.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25604.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 16 +++++----------- global.json | 4 ++-- 4 files changed, 17 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7873c1827704..2f26ae5c5112 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 457f392b7944..16b9d4932c05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25577.1 + 8.0.0-beta.25604.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25577.1 + 8.0.0-beta.25604.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6764bdedbf05..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -545,25 +545,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -960,4 +954,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 0d6140e41e91..7e37345e6a87 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25577.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25604.1" } } From 02b1fcb5998f3762023ea8b754e8875e8cbdb008 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 03:21:17 +0000 Subject: [PATCH 022/280] Update dependencies from https://github.com/dotnet/templating build 20251204.5 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.123-servicing.25602.3 -> To Version 8.0.123-servicing.25604.5 Microsoft.TemplateEngine.Abstractions From Version 8.0.123 -> To Version 8.0.123 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 220bbc493b99..3bf3bc0405e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index acab3aaf6a08..4429a39e0d1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - ca95ce39a1d1c189a275bb5e3b8c78434d2cca48 + 4b069640bf2c78b3bf1a818150e0739ec19312a2 - + https://github.com/dotnet/templating - ca95ce39a1d1c189a275bb5e3b8c78434d2cca48 + 4b069640bf2c78b3bf1a818150e0739ec19312a2 - + https://github.com/dotnet/templating - ca95ce39a1d1c189a275bb5e3b8c78434d2cca48 + 4b069640bf2c78b3bf1a818150e0739ec19312a2 diff --git a/eng/Versions.props b/eng/Versions.props index 8c4069c5a5a2..5b7e6f7d5d40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.123-servicing.25602.3 + 8.0.123-servicing.25604.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 2280098811a9ef53560282f71e5996916f58a60f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Dec 2025 02:01:43 +0000 Subject: [PATCH 023/280] Update dependencies from https://github.com/dotnet/arcade build 20251205.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25605.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 132b79736b19..bc924917ae28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index eff2de50899e..f1b2864c0b6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25604.1 + 8.0.0-beta.25605.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25604.1 + 8.0.0-beta.25605.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 0579e692fc81..8de0dfaf3494 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' diff --git a/global.json b/global.json index 7e37345e6a87..758ac1c57930 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25604.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25605.4" } } From 8410f2002ccf873c13d1ca467bd71d227419b5b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Dec 2025 02:02:09 +0000 Subject: [PATCH 024/280] Update dependencies from https://github.com/dotnet/arcade build 20251205.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25605.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f26ae5c5112..4d4c52399d01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 16b9d4932c05..08a1044e62c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25604.1 + 8.0.0-beta.25605.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25604.1 + 8.0.0-beta.25605.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 0579e692fc81..8de0dfaf3494 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' diff --git a/global.json b/global.json index 7e37345e6a87..758ac1c57930 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25604.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25605.4" } } From 4eff1c4da41fe26958d1e8c05b228fc94007d94f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Dec 2025 19:24:47 +0000 Subject: [PATCH 025/280] Update dependencies from https://github.com/dotnet/razor build 20251208.4 On relative base path root Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25526.9 -> To Version 9.0.0-preview.25608.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8e5b17496fc7..7c6a6b6a130f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2120c57cad2f9bedc66a5dcea6eecddfafc954ba + 3e221eeb8b7ae4908142db9bfa510fa241fec289 - + https://github.com/dotnet/razor - 2120c57cad2f9bedc66a5dcea6eecddfafc954ba + 3e221eeb8b7ae4908142db9bfa510fa241fec289 - + https://github.com/dotnet/razor - 2120c57cad2f9bedc66a5dcea6eecddfafc954ba + 3e221eeb8b7ae4908142db9bfa510fa241fec289 - + https://github.com/dotnet/razor - 2120c57cad2f9bedc66a5dcea6eecddfafc954ba + 3e221eeb8b7ae4908142db9bfa510fa241fec289 diff --git a/eng/Versions.props b/eng/Versions.props index f2ad6b488be5..2c8d9fdc030c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25526.9 - 9.0.0-preview.25526.9 - 9.0.0-preview.25526.9 + 9.0.0-preview.25608.4 + 9.0.0-preview.25608.4 + 9.0.0-preview.25608.4 From ec01b5f085ec12f52fce98c34c6b786cdb8a9cda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Dec 2025 20:53:56 +0000 Subject: [PATCH 026/280] Update dependencies from https://github.com/dotnet/razor build 20251208.8 On relative base path root Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25526.9 -> To Version 9.0.0-preview.25608.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c6a6b6a130f..ea16192eddd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 3e221eeb8b7ae4908142db9bfa510fa241fec289 + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor - 3e221eeb8b7ae4908142db9bfa510fa241fec289 + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor - 3e221eeb8b7ae4908142db9bfa510fa241fec289 + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor - 3e221eeb8b7ae4908142db9bfa510fa241fec289 + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 diff --git a/eng/Versions.props b/eng/Versions.props index 2c8d9fdc030c..7928139de311 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25608.4 - 9.0.0-preview.25608.4 - 9.0.0-preview.25608.4 + 9.0.0-preview.25608.8 + 9.0.0-preview.25608.8 + 9.0.0-preview.25608.8 From 52def51eb14b65448d1142ea54895fa45019e10e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 00:08:06 +0000 Subject: [PATCH 027/280] Update dependencies from https://github.com/dotnet/razor build 20251208.14 On relative base path root Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25424.3 -> To Version 7.0.0-preview.25608.14 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4429a39e0d1e..7e3999364140 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore ee417479933278bb5aadc5944706a96b5ef74a5d - + https://github.com/dotnet/razor - 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 + 38ec3749c5cdb552fe424e716fb13ed48427bb4d - + https://github.com/dotnet/razor - 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 + 38ec3749c5cdb552fe424e716fb13ed48427bb4d - + https://github.com/dotnet/razor - 4c8bb4ff79523da1aa8ffbf2834ede5118f73d60 + 38ec3749c5cdb552fe424e716fb13ed48427bb4d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 5b7e6f7d5d40..a08fd2991511 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,9 +180,9 @@ - 7.0.0-preview.25424.3 - 7.0.0-preview.25424.3 - 7.0.0-preview.25424.3 + 7.0.0-preview.25608.14 + 7.0.0-preview.25608.14 + 7.0.0-preview.25608.14 From 81a612e7c1704cb384ad5b7b24ebc921ee97ffb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 02:01:26 +0000 Subject: [PATCH 028/280] Update dependencies from https://github.com/dotnet/razor build 20251208.9 On relative base path root Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25526.6 -> To Version 9.0.0-preview.25608.9 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0006b72e01c4..981b0bc56ebb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 6baee15bf85cf11fe39a6b05bd422a08b95b68e9 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 6baee15bf85cf11fe39a6b05bd422a08b95b68e9 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 6baee15bf85cf11fe39a6b05bd422a08b95b68e9 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 6baee15bf85cf11fe39a6b05bd422a08b95b68e9 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 diff --git a/eng/Versions.props b/eng/Versions.props index d5fb4cdfc278..f3e16ad155a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -233,9 +233,9 @@ - 9.0.0-preview.25526.6 - 9.0.0-preview.25526.6 - 9.0.0-preview.25526.6 + 9.0.0-preview.25608.9 + 9.0.0-preview.25608.9 + 9.0.0-preview.25608.9 From 4402e3223523eb08997a37fd042d7e88d28dcc50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 02:02:44 +0000 Subject: [PATCH 029/280] Update dependencies from https://github.com/dotnet/arcade build 20251208.5 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25577.5 -> To Version 9.0.0-beta.25608.5 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../job/source-index-stage1.yml | 2 +- eng/common/tools.ps1 | 16 ++++------- global.json | 4 +-- 5 files changed, 26 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea16192eddd1..2c0c7792fb82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 diff --git a/eng/Versions.props b/eng/Versions.props index 7928139de311..e30c271601a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 + 9.0.0-beta.25608.5 + 9.0.0-beta.25608.5 + 9.0.0-beta.25608.5 + 9.0.0-beta.25608.5 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 662b9fcce154..ddf8c2e00d80 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6a1560e8442e..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -547,25 +547,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -968,4 +962,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 3ee42b57d57e..46380d959f85 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 474f7c06ccd5f8b0a61d7389ce8b4135c0208e3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 03:43:40 +0000 Subject: [PATCH 030/280] Update dependencies from https://github.com/dotnet/templating build 20251208.2 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.309 Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25605.2 -> To Version 9.0.309-servicing.25608.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index d3d11f3c18f2..f3557026744b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0006b72e01c4..a924c201f399 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 4a8a3108c0fdd8f32f7a2f23d3b044085ec9c23a + cad8ce8451940c4b7923e9abccb361c99398854f - + https://github.com/dotnet/templating - 4a8a3108c0fdd8f32f7a2f23d3b044085ec9c23a + cad8ce8451940c4b7923e9abccb361c99398854f diff --git a/eng/Versions.props b/eng/Versions.props index d5fb4cdfc278..37fb9e8e08d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.309-servicing.25605.2 + 9.0.309-servicing.25608.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 422d182e7c4ed94b3fc8e30cd0c101df3d427d49 Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Tue, 9 Dec 2025 14:58:02 +0800 Subject: [PATCH 031/280] restore the change for Version.Detail.xml Version.props and tools.ps1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 997644d2156c..981b0bc56ebb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 0890ca08513391dafe556fb326c73c6c5c6cb329 diff --git a/eng/Versions.props b/eng/Versions.props index ba5ae3c318d9..f3e16ad155a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 + 9.0.0-beta.25577.5 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index b8fa65f63742..6a1560e8442e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -968,4 +968,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} +} \ No newline at end of file From 070908ab616bed60077b8912a637fd3d4175663a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Dec 2025 08:01:30 +0000 Subject: [PATCH 032/280] Update dependencies from https://github.com/dotnet/templating build 20251208.4 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.309 Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25608.2 -> To Version 9.0.309-servicing.25608.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3557026744b..87316c86cb39 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf2ac6620879..62f50d6d6f52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - cad8ce8451940c4b7923e9abccb361c99398854f + 6d8610fb68d8c6e6fbe2d8f81cb298ef65dbcd5b - + https://github.com/dotnet/templating - cad8ce8451940c4b7923e9abccb361c99398854f + 6d8610fb68d8c6e6fbe2d8f81cb298ef65dbcd5b diff --git a/eng/Versions.props b/eng/Versions.props index 6cee16e30cdf..584075a0510a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.309-servicing.25608.2 + 9.0.309-servicing.25608.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 81b16c2481776286b770e9b9bb61ddf6507424a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 20:23:09 +0000 Subject: [PATCH 033/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20251209.1 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.12 -> To Version 9.0.12 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.12-servicing.25574.6 -> To Version 9.0.12-servicing.25609.1 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.11 -> To Version 9.0.11 (parent: Microsoft.NETCore.App.Runtime.win-x64) Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.11-servicing.25516.4 -> To Version 9.0.11-servicing.25529.3 (parent: Microsoft.NETCore.App.Runtime.win-x64) Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.12-rtm.25566.6 -> To Version 9.0.12-rtm.25609.3 (parent: Microsoft.WindowsDesktop.App.Ref) Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.12-servicing.25563.6 -> To Version 9.0.12-servicing.25608.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.12-rtm.25566.6 -> To Version 9.0.12-rtm.25609.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index e6dd84fc5dee..ad960e254d10 100644 --- a/NuGet.config +++ b/NuGet.config @@ -42,7 +42,7 @@ - + @@ -77,7 +77,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index efd2f3390e80..164ede567f91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -61,12 +61,12 @@ https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 + acfd1c1360e1dccc9ffdfe25944bb68ed1f2d6f7 - + https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 + acfd1c1360e1dccc9ffdfe25944bb68ed1f2d6f7 @@ -252,24 +252,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1c89956a00551023a415f24426f34718f017976e + 58060180f2776452976616ae4894118dfd21f8d5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -356,13 +356,13 @@ 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5159cc84c7e21ec211e7438a6dd41be9d4632caf + b05fe71693c6c70b537911f88865ea456a9015f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1c89956a00551023a415f24426f34718f017976e + 58060180f2776452976616ae4894118dfd21f8d5 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 06a9c833147e..aae1c97de1f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -81,7 +81,7 @@ - 9.0.12-servicing.25563.6 + 9.0.12-servicing.25608.3 @@ -132,8 +132,8 @@ - 9.0.12-servicing.25574.6 - 9.0.12-servicing.25574.6 + 9.0.12-servicing.25609.1 + 9.0.12-servicing.25609.1 9.0.12 9.0.12 @@ -239,8 +239,8 @@ - 9.0.12-rtm.25566.6 - 9.0.12-rtm.25566.6 + 9.0.12-rtm.25609.3 + 9.0.12-rtm.25609.3 From 237e9161abb0ffddf01c72ead5ae6b2154476212 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 20:23:09 +0000 Subject: [PATCH 034/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251206.9 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , 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 9.0.12 -> To Version 9.0.12 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.12-servicing.25555.20 -> To Version 9.0.12-servicing.25606.9 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport,Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.11-servicing.25516.4 -> To Version 9.0.12-servicing.25602.39 (parent: Microsoft.NETCore.App.Runtime.win-x64) Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.11 -> To Version 9.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 5 ++- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++--- 3 files changed, 55 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index b31203d1481d..613c38a68e84 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + @@ -34,7 +35,7 @@ - + @@ -72,7 +73,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 074058114f5c..610bad52704f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 @@ -59,18 +59,18 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 + f364bf26bf50d8cbdd8652d284d25a8ccb55039a - + https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 + f364bf26bf50d8cbdd8652d284d25a8ccb55039a - + https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 + f364bf26bf50d8cbdd8652d284d25a8ccb55039a @@ -232,27 +232,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -505,39 +505,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -545,47 +545,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 @@ -621,7 +621,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1a2cb9677354..2750ef133244 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,10 +87,10 @@ 9.0.12 - 9.0.12-servicing.25555.20 + 9.0.12-servicing.25606.9 9.0.12 9.0.12 - 9.0.12-servicing.25555.20 + 9.0.12-servicing.25606.9 9.0.12 9.0.12 9.0.12 @@ -98,8 +98,8 @@ 9.0.12 9.0.12 8.0.0-rc.1.23414.4 - 9.0.12-servicing.25555.20 - 9.0.12-servicing.25555.20 + 9.0.12-servicing.25606.9 + 9.0.12-servicing.25606.9 9.0.12 9.0.12 9.0.12 @@ -317,8 +317,8 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 - 9.0.11 + 9.0.12-servicing.25602.39 + 9.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From f212695d2137fddd543011d396109ccc8920f776 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 20:23:34 +0000 Subject: [PATCH 035/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20251206.9 On relative base path root Microsoft.Bcl.AsyncInterfaces , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.Win32.SystemEvents , System.CodeDom , System.Composition.AttributedModel , System.Composition.Convention , System.Composition.Hosting , System.Composition.Runtime , System.Composition.TypedParts , System.Configuration.ConfigurationManager , System.Formats.Asn1 , 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 9.0.12 -> To Version 9.0.12 Microsoft.NET.HostModel , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.12-servicing.25555.20 -> To Version 9.0.12-servicing.25606.9 Dependency coherency updates On relative base path root Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100 From Version 9.0.11 -> To Version 9.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64) Microsoft.SourceBuild.Intermediate.emsdk From Version 9.0.11-servicing.25516.4 -> To Version 9.0.12-servicing.25602.39 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- NuGet.config | 5 ++- eng/Version.Details.xml | 88 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++--- 3 files changed, 52 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad960e254d10..63197997f93b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,6 +24,7 @@ + @@ -36,7 +37,7 @@ - + @@ -74,7 +75,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 164ede567f91..bb265d80c222 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,40 +17,40 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 @@ -59,14 +59,14 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - acfd1c1360e1dccc9ffdfe25944bb68ed1f2d6f7 + f364bf26bf50d8cbdd8652d284d25a8ccb55039a - + https://github.com/dotnet/emsdk - acfd1c1360e1dccc9ffdfe25944bb68ed1f2d6f7 + f364bf26bf50d8cbdd8652d284d25a8ccb55039a @@ -228,27 +228,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop @@ -471,39 +471,39 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -511,47 +511,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 @@ -587,7 +587,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 988e0a8c11415978061eb7aa8bb2b0a97450a547 + 2f124007573374800632d39177cde00ca9fe1ef0 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index aae1c97de1f8..c6c18def14c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,10 +86,10 @@ 9.0.12 - 9.0.12-servicing.25555.20 + 9.0.12-servicing.25606.9 9.0.12 9.0.12 - 9.0.12-servicing.25555.20 + 9.0.12-servicing.25606.9 9.0.12 9.0.12 9.0.12 @@ -97,8 +97,8 @@ 9.0.12 9.0.12 8.0.0-rc.1.23414.4 - 9.0.12-servicing.25555.20 - 9.0.12-servicing.25555.20 + 9.0.12-servicing.25606.9 + 9.0.12-servicing.25606.9 9.0.12 9.0.12 9.0.12 @@ -319,7 +319,7 @@ 15.0.9617 18.0.9617 - 9.0.11 + 9.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 7222e94aaa271396c25592938dd8a40f4f949e25 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 20:23:55 +0000 Subject: [PATCH 036/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20251208.1 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 , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.12-servicing.25574.1 -> To Version 9.0.12-servicing.25608.1 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.12 -> To Version 9.0.12 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 63197997f93b..be34169bb599 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb265d80c222..a1fc087cb356 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 8cafac4760a78176ef0e167bea66b97b65437930 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + 5c134262283ca0c4abeebaf06dfe00ac9b355433 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c6c18def14c3..cf5c88f0da18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.12 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 9.0.12 9.0.12 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 + 9.0.12-servicing.25608.1 From 6e1c2e5d457340aedf3f322da9f101739d4e446c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 20:40:11 +0000 Subject: [PATCH 037/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20251209.1 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.12 -> To Version 9.0.12 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.12-servicing.25574.6 -> To Version 9.0.12-servicing.25609.1 Dependency coherency updates On relative base path root Microsoft.NET.Sdk.WindowsDesktop From Version 9.0.12-rtm.25566.6 -> To Version 9.0.12-rtm.25609.3 (parent: Microsoft.WindowsDesktop.App.Ref) Microsoft.Dotnet.WinForms.ProjectTemplates From Version 9.0.12-servicing.25563.6 -> To Version 9.0.12-servicing.25608.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.12-rtm.25566.6 -> To Version 9.0.12-rtm.25609.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 613c38a68e84..9f2de8423f37 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 610bad52704f..a44a0445055f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,24 +256,24 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ad07489569287173b09e645da384f7659d8f537d + c684516eb14e50ddd14fbdb6ccb456b00286e475 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1c89956a00551023a415f24426f34718f017976e + 58060180f2776452976616ae4894118dfd21f8d5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -390,13 +390,13 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5159cc84c7e21ec211e7438a6dd41be9d4632caf + b05fe71693c6c70b537911f88865ea456a9015f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1c89956a00551023a415f24426f34718f017976e + 58060180f2776452976616ae4894118dfd21f8d5 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 2750ef133244..8e3f798d2c32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,7 +77,7 @@ - 9.0.12-servicing.25563.6 + 9.0.12-servicing.25608.3 @@ -130,8 +130,8 @@ - 9.0.12-servicing.25574.6 - 9.0.12-servicing.25574.6 + 9.0.12-servicing.25609.1 + 9.0.12-servicing.25609.1 9.0.12 9.0.12 @@ -237,8 +237,8 @@ - 9.0.12-rtm.25566.6 - 9.0.12-rtm.25566.6 + 9.0.12-rtm.25609.3 + 9.0.12-rtm.25609.3 From a8612a5155a68816318e5b3b1af9927c2f9a843a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 20:54:53 +0000 Subject: [PATCH 038/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20251209.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 , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.12-servicing.25608.1 -> To Version 9.0.12-servicing.25609.3 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.12 -> To Version 9.0.12 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index be34169bb599..d26ca80fadef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1fc087cb356..ea577a2c2116 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -131,13 +131,13 @@ https://github.com/dotnet/roslyn 8cafac4760a78176ef0e167bea66b97b65437930 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://github.com/nuget/nuget.client @@ -273,52 +273,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd @@ -341,19 +341,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd @@ -507,7 +507,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5c134262283ca0c4abeebaf06dfe00ac9b355433 + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index cf5c88f0da18..fa1965e6eb85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -218,18 +218,18 @@ 9.0.12 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 9.0.12 9.0.12 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 - 9.0.12-servicing.25608.1 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 From b7bd8951dc4bfef23d20b2331eb4b30c0bbbc87b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 9 Dec 2025 21:07:45 +0000 Subject: [PATCH 039/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20251209.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 , VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 9.0.12-servicing.25574.1 -> To Version 9.0.12-servicing.25609.3 Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop From Version 9.0.12 -> To Version 9.0.12 --- NuGet.config | 4 +-- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9f2de8423f37..db373f6d14d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -68,7 +68,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a44a0445055f..e39797207e46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn c795154af418b5473d67f053aec5d290a3e5c410 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://github.com/nuget/nuget.client @@ -277,52 +277,52 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd @@ -345,19 +345,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://github.com/dotnet/test-templates @@ -541,7 +541,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 81957430473dfeb9ac9ea49b82a2bcf5fbf0bcba + f736effe82a61eb6f5eba46e4173eae3b7d3dffd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8e3f798d2c32..5b6b470bddac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -216,18 +216,18 @@ 9.0.12 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 9.0.12 9.0.12 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 - 9.0.12-servicing.25574.1 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 + 9.0.12-servicing.25609.3 From f87e6402d93994570f201fe6807e97fcb8e4f4ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:02:05 +0000 Subject: [PATCH 040/280] Update dependencies from https://github.com/dotnet/arcade build 20251209.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25609.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0a7bc9a4f8a..1e0473114073 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 54019eb45933..7d24009db6bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25605.4 + 8.0.0-beta.25609.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25605.4 + 8.0.0-beta.25609.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 758ac1c57930..e30e8935ec81 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25605.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25609.3" } } From 441a93a61abced0dc0a0669d19f55b5514c37b95 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:02:41 +0000 Subject: [PATCH 041/280] Update dependencies from https://github.com/dotnet/arcade build 20251209.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25609.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 785b5d10d7e9..c9e85c73bb2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - f922da012fe84ec4bd6e78ed483de7d6b9f2f564 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e6408f7a2737..b851947e3f7e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25605.4 + 8.0.0-beta.25609.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25605.4 + 8.0.0-beta.25609.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 758ac1c57930..e30e8935ec81 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25605.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25609.3" } } From 661b55a3a2a542e300f9dc9ed24f3f753dadea83 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:03:01 +0000 Subject: [PATCH 042/280] Update dependencies from https://github.com/dotnet/msbuild build 20251209.3 On relative base path root Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build.Localization From Version 17.12.53-preview-25570-13 -> To Version 17.12.54-preview-25609-03 Microsoft.Build From Version 17.12.53 -> To Version 17.12.54 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e31e3b13ad69..e91c2f84a19a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..76719d899567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 78635385dd25cbdb3483c5fe59d43160f1cc5039 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 78635385dd25cbdb3483c5fe59d43160f1cc5039 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 78635385dd25cbdb3483c5fe59d43160f1cc5039 diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..64e906fdb4cb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ 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.12.53 - 17.12.53-preview-25570-13 + 17.12.54 + 17.12.54-preview-25609-03 17.11.48 17.12 From 14961f6940455a9bc71881cf0d1200acaf5c15af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:04:12 +0000 Subject: [PATCH 043/280] Update dependencies from https://github.com/dotnet/msbuild build 20251209.11 On relative base path root Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build.Localization From Version 17.14.37-servicing-25604-02 -> To Version 17.14.40-servicing-25609-11 Microsoft.Build From Version 17.14.37 -> To Version 17.14.40 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87316c86cb39..e651da87b1bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f50d6d6f52..d8ec77050e84 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - 3393a8ad97da5d36d186589f1a9d7672a4ed3070 + 3e744208875e56e4bf0bc22c40a1c431fb150987 - + https://github.com/dotnet/msbuild - 3393a8ad97da5d36d186589f1a9d7672a4ed3070 + 3e744208875e56e4bf0bc22c40a1c431fb150987 - + https://github.com/dotnet/msbuild - 3393a8ad97da5d36d186589f1a9d7672a4ed3070 + 3e744208875e56e4bf0bc22c40a1c431fb150987 diff --git a/eng/Versions.props b/eng/Versions.props index 584075a0510a..afb5172a62f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,8 +182,8 @@ 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.37 - 17.14.37-servicing-25604-02 + 17.14.40 + 17.14.40-servicing-25609-11 17.11.48 17.12 From 115e533607945abe07a687e782b691d202e4700a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:05:21 +0000 Subject: [PATCH 044/280] Update dependencies from https://github.com/dotnet/roslyn build 20251209.6 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25570.7 -> To Version 4.14.0-3.25609.6 Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.12.0-beta1.25570.7 -> To Version 3.12.0-beta1.25609.6 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f50d6d6f52..3aa03b6379fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - 8cafac4760a78176ef0e167bea66b97b65437930 + 369b11e3228ac1d246dbd5f309f967992d5c59f1 diff --git a/eng/Versions.props b/eng/Versions.props index 584075a0510a..b52a7aaa20ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25570.7 + 3.12.0-beta1.25609.6 @@ -206,14 +206,14 @@ - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 - 4.14.0-3.25570.7 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 + 4.14.0-3.25609.6 From 97b485a901524245f04aec562229d8b7e70b087f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Dec 2025 03:09:05 +0000 Subject: [PATCH 045/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20251209.4 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.12 -> To Version 9.0.12 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.12-servicing.25609.1 -> To Version 9.0.12-servicing.25609.4 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d26ca80fadef..50413cb3314d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -43,7 +43,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea577a2c2116..7dbb41b59fd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -252,20 +252,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index fa1965e6eb85..9e6f35395540 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,8 +132,8 @@ - 9.0.12-servicing.25609.1 - 9.0.12-servicing.25609.1 + 9.0.12-servicing.25609.4 + 9.0.12-servicing.25609.4 9.0.12 9.0.12 From ff210c45557e3b24372cef41d9a0cc813a8ce9a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 10 Dec 2025 03:09:05 +0000 Subject: [PATCH 046/280] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20251209.4 On relative base path root Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 From Version 9.0.12 -> To Version 9.0.12 VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.12-servicing.25609.1 -> To Version 9.0.12-servicing.25609.4 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index db373f6d14d0..9e74d041bb7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e39797207e46..320aeb563a9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -256,20 +256,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c684516eb14e50ddd14fbdb6ccb456b00286e475 + 9b9a26408ddd07dc51c232082af1ca6863af7bc9 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 5b6b470bddac..abb0c763c408 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -130,8 +130,8 @@ - 9.0.12-servicing.25609.1 - 9.0.12-servicing.25609.1 + 9.0.12-servicing.25609.4 + 9.0.12-servicing.25609.4 9.0.12 9.0.12 From 97a9b1e01b570b3b31ea83627119f2a2eac7af80 Mon Sep 17 00:00:00 2001 From: "Nikola Milosavljevic (.NET)" Date: Wed, 10 Dec 2025 16:54:59 +0000 Subject: [PATCH 047/280] Merged PR 55995: Remove runtime patch This PR removes runtime patch as new runtime sha (2f124007573374800632d39177cde00ca9fe1ef0) has the changes. ---- #### AI description (iteration 1) #### PR Classification This pull request is a code cleanup aimed at removing an obsolete runtime patch. #### PR Summary The PR removes an outdated patch used in the build process, thereby simplifying maintenance. - `src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch` file deleted. --- ...ing-Add-flags-when-the-clang-s-major.patch | 145 ------------------ 1 file changed, 145 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch diff --git a/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch b/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch deleted file mode 100644 index 395dea35c1ae..000000000000 --- a/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aaron R Robinson -Date: Fri, 14 Nov 2025 11:01:28 -0800 -Subject: [PATCH] [release/9.0-staging] Add flags when the clang's major - version is > 20.0 (#121151) -Backport: https://github.com/dotnet/runtime/pull/121151 - -## Customer Impact - -- [x] Customer reported -- [ ] Found internally - -These issues were reported in -https://github.com/dotnet/runtime/issues/119706 as problems with -clang-21 on Fedora 43. The investigation uncovered that clang introduced -a potentially breaking change in clang-20 that we do not currently -consume. These build changes impact VMR related builds when linux -distrobutions performing source build adopt clang-21. - -clang-20 breaking change log - -https://releases.llvm.org/20.1.0/tools/clang/docs/ReleaseNotes.html#potentially-breaking-changes. - -This PR contains the minimal changes needed to fix issues from the -following PR https://github.com/dotnet/runtime/pull/120775. - -.NET 10: https://github.com/dotnet/runtime/pull/121124 -.NET 8: https://github.com/dotnet/runtime/pull/121150 - -## Regression - -- [ ] Yes -- [x] No - -Build with the new clang-21 compiler will cause the runtime to crash. - -## Testing - -This has been validated using various legs and examples to demonstrate -the usage of undefined behavior these flags convert into "defined" -behavior in C/C++. - -## Risk - -Low. This has zero impact on our production build since we specifically -target clang-18. This is only valid for those partners that are using -clang-20+. ---- - eng/native/configurecompiler.cmake | 18 +++++++++++++++--- - src/coreclr/debug/di/rspriv.h | 4 ++-- - src/coreclr/debug/di/rsthread.cpp | 12 ++++++------ - 3 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake -index 109b947e4eb..c114c03a9a1 100644 ---- a/eng/native/configurecompiler.cmake -+++ b/eng/native/configurecompiler.cmake -@@ -526,9 +526,21 @@ if (CLR_CMAKE_HOST_UNIX) - # Disable frame pointer optimizations so profilers can get better call stacks - add_compile_options(-fno-omit-frame-pointer) - -- # Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around -- # using twos-complement representation (this is normally undefined according to the C++ spec). -- add_compile_options(-fwrapv) -+ if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0) OR -+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0)) -+ # Make signed overflow well-defined. Implies the following flags in clang-20 and above. -+ # -fwrapv - Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around -+ # using twos-complement representation (this is normally undefined according to the C++ spec). -+ # -fwrapv-pointer - The same as -fwrapv but for pointers. -+ add_compile_options(-fno-strict-overflow) -+ -+ # Suppress C++ strict aliasing rules. This matches our use of MSVC. -+ add_compile_options(-fno-strict-aliasing) -+ else() -+ # Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around -+ # using twos-complement representation (this is normally undefined according to the C++ spec). -+ add_compile_options(-fwrapv) -+ endif() - - if(CLR_CMAKE_HOST_APPLE) - # Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from earlier Xcodes doesn't understand. -diff --git a/src/coreclr/debug/di/rspriv.h b/src/coreclr/debug/di/rspriv.h -index 7e2b49b3170..119ca6f7c08 100644 ---- a/src/coreclr/debug/di/rspriv.h -+++ b/src/coreclr/debug/di/rspriv.h -@@ -6404,8 +6404,8 @@ private: - // Lazily initialized. - EXCEPTION_RECORD * m_pExceptionRecord; - -- static const CorDebugUserState kInvalidUserState = CorDebugUserState(-1); -- CorDebugUserState m_userState; // This is the current state of the -+ static const int kInvalidUserState = -1; -+ int m_userState; // This is the current state of the - // thread, at the time that the - // left side synchronized - -diff --git a/src/coreclr/debug/di/rsthread.cpp b/src/coreclr/debug/di/rsthread.cpp -index cd7f79867a5..8c4f3317eff 100644 ---- a/src/coreclr/debug/di/rsthread.cpp -+++ b/src/coreclr/debug/di/rsthread.cpp -@@ -783,7 +783,7 @@ CorDebugUserState CordbThread::GetUserState() - m_userState = pDAC->GetUserState(m_vmThreadToken); - } - -- return m_userState; -+ return (CorDebugUserState)m_userState; - } - - -@@ -887,7 +887,7 @@ HRESULT CordbThread::CreateStepper(ICorDebugStepper ** ppStepper) - //Returns true if current user state of a thread is USER_WAIT_SLEEP_JOIN - bool CordbThread::IsThreadWaitingOrSleeping() - { -- CorDebugUserState userState = m_userState; -+ int userState = m_userState; - if (userState == kInvalidUserState) - { - //If m_userState is not ready, we'll read from DAC only part of it which -@@ -3721,14 +3721,14 @@ HRESULT CordbUnmanagedThread::SetupFirstChanceHijackForSync() - LOG((LF_CORDB, LL_INFO10000, "CUT::SFCHFS: hijackCtx started as:\n")); - LogContext(GetHijackCtx()); - -- // Save the thread's full context for all platforms except for x86 because we need the -+ // Save the thread's full context for all platforms except for x86 because we need the - // DT_CONTEXT_EXTENDED_REGISTERS to avoid getting incomplete information and corrupt the thread context - DT_CONTEXT context; --#ifdef TARGET_X86 -+#ifdef TARGET_X86 - context.ContextFlags = DT_CONTEXT_FULL | DT_CONTEXT_EXTENDED_REGISTERS; - #else - context.ContextFlags = DT_CONTEXT_FULL; --#endif -+#endif - - BOOL succ = DbiGetThreadContext(m_handle, &context); - _ASSERTE(succ); -@@ -3739,7 +3739,7 @@ HRESULT CordbUnmanagedThread::SetupFirstChanceHijackForSync() - LOG((LF_CORDB, LL_ERROR, "CUT::SFCHFS: DbiGetThreadContext error=0x%x\n", error)); - } - --#ifdef TARGET_X86 -+#ifdef TARGET_X86 - GetHijackCtx()->ContextFlags = DT_CONTEXT_FULL | DT_CONTEXT_EXTENDED_REGISTERS; - #else - GetHijackCtx()->ContextFlags = DT_CONTEXT_FULL; From 1cd4327e9cc873dfb4e4525c42375d98c41047e4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Dec 2025 02:02:57 +0000 Subject: [PATCH 048/280] Update dependencies from https://github.com/dotnet/roslyn build 20251209.16 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25570.7 -> To Version 4.14.0-3.25609.16 Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.12.0-beta1.25570.7 -> To Version 3.12.0-beta1.25609.16 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3aa03b6379fe..b48ddee2acf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 433fa3e4a54010fcac6e8843460e29d33ba07eb7 - + https://github.com/dotnet/roslyn - 369b11e3228ac1d246dbd5f309f967992d5c59f1 + 44b81fc54139e9fce040efc2a6558110c038896b diff --git a/eng/Versions.props b/eng/Versions.props index b52a7aaa20ac..683e6568e2c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.25329.4 - 3.12.0-beta1.25609.6 + 3.12.0-beta1.25609.16 @@ -206,14 +206,14 @@ - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 - 4.14.0-3.25609.6 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 + 4.14.0-3.25609.16 From d7619d44be82a4b85e496cd5cf4686d47d37b4d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Dec 2025 02:13:25 +0000 Subject: [PATCH 049/280] Update dependencies from https://github.com/dotnet/razor build 20251210.5 On relative base path root Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25608.14 -> To Version 7.0.0-preview.25610.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e3999364140..bce0bc7752f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore ee417479933278bb5aadc5944706a96b5ef74a5d - + https://github.com/dotnet/razor - 38ec3749c5cdb552fe424e716fb13ed48427bb4d + a36694712be3000f238f25e52f11e6225dda5f9b - + https://github.com/dotnet/razor - 38ec3749c5cdb552fe424e716fb13ed48427bb4d + a36694712be3000f238f25e52f11e6225dda5f9b - + https://github.com/dotnet/razor - 38ec3749c5cdb552fe424e716fb13ed48427bb4d + a36694712be3000f238f25e52f11e6225dda5f9b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a08fd2991511..72064154ea21 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,9 +180,9 @@ - 7.0.0-preview.25608.14 - 7.0.0-preview.25608.14 - 7.0.0-preview.25608.14 + 7.0.0-preview.25610.5 + 7.0.0-preview.25610.5 + 7.0.0-preview.25610.5 From f742f049726d5db69660b8df4a8eb1d06d850802 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Dec 2025 02:02:06 +0000 Subject: [PATCH 050/280] Update dependencies from https://github.com/dotnet/arcade build 20251211.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25611.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/post-build/post-build-utils.ps1 | 10 +++++----- .../post-build/setup-maestro-vars.yml | 2 +- eng/common/tools.ps1 | 6 +++--- global.json | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e0473114073..c09f878e69cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7d24009db6bc..aca98fc2aef0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25609.3 + 8.0.0-beta.25611.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25609.3 + 8.0.0-beta.25611.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index 8467dbf8e7c2..6cbbcafade26 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 index 534f6988d5b7..83f9efb0b364 100644 --- a/eng/common/post-build/post-build-utils.ps1 +++ b/eng/common/post-build/post-build-utils.ps1 @@ -26,7 +26,7 @@ function Get-MaestroChannel([int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -36,7 +36,7 @@ function Get-MaestroBuild([int]$BuildId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" - $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { return Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -47,7 +47,7 @@ function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -56,7 +56,7 @@ function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" - Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null + Invoke-WebRequest -UseBasicParsing -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null } function Trigger-Subscription([string]$SubscriptionId) { @@ -64,7 +64,7 @@ function Trigger-Subscription([string]$SubscriptionId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" - Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null + Invoke-WebRequest -UseBasicParsing -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null } function Validate-MaestroVars { diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 0c87f149a4ad..3a56abf8922e 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -37,7 +37,7 @@ steps: $apiHeaders.Add('Accept', 'application/json') $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $buildInfo = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } $BarId = $Env:BARBuildId $Channels = $Env:PromoteToMaestroChannels -split "," diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bb048ad125a8..b674a90618d7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -267,7 +267,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -501,7 +501,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) Unzip $packagePath $packageDir @@ -541,7 +541,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index e30e8935ec81..edcf91e50c58 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25609.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25611.2" } } From deabe807566f93280dff8c2694f52f16c56d61a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Dec 2025 02:02:47 +0000 Subject: [PATCH 051/280] Update dependencies from https://github.com/dotnet/arcade build 20251211.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25577.1 -> To Version 8.0.0-beta.25611.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/post-build/post-build-utils.ps1 | 10 +++++----- .../post-build/setup-maestro-vars.yml | 2 +- eng/common/tools.ps1 | 6 +++--- global.json | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9e85c73bb2e..d0d0e6d12db2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b851947e3f7e..18f8ed7251a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25609.3 + 8.0.0-beta.25611.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25609.3 + 8.0.0-beta.25611.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index 8467dbf8e7c2..6cbbcafade26 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 index 534f6988d5b7..83f9efb0b364 100644 --- a/eng/common/post-build/post-build-utils.ps1 +++ b/eng/common/post-build/post-build-utils.ps1 @@ -26,7 +26,7 @@ function Get-MaestroChannel([int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -36,7 +36,7 @@ function Get-MaestroBuild([int]$BuildId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" - $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { return Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -47,7 +47,7 @@ function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -56,7 +56,7 @@ function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" - Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null + Invoke-WebRequest -UseBasicParsing -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null } function Trigger-Subscription([string]$SubscriptionId) { @@ -64,7 +64,7 @@ function Trigger-Subscription([string]$SubscriptionId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" - Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null + Invoke-WebRequest -UseBasicParsing -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null } function Validate-MaestroVars { diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 0c87f149a4ad..3a56abf8922e 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -37,7 +37,7 @@ steps: $apiHeaders.Add('Accept', 'application/json') $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $buildInfo = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } $BarId = $Env:BARBuildId $Channels = $Env:PromoteToMaestroChannels -split "," diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bb048ad125a8..b674a90618d7 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -267,7 +267,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -501,7 +501,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) Unzip $packagePath $packageDir @@ -541,7 +541,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index e30e8935ec81..edcf91e50c58 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25609.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25611.2" } } From 74fd36db9115a86438a380d9f0c0c8184b8167cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Dec 2025 04:53:39 +0000 Subject: [PATCH 052/280] Update dependencies from https://github.com/dotnet/msbuild build 20251212.3 On relative base path root Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build.Localization From Version 17.8.45-servicing-25560-07 -> To Version 17.8.48-servicing-25612-03 Microsoft.Build From Version 17.8.45 -> To Version 17.8.48 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3bf3bc0405e9..7ac9ba8a75c1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e3999364140..5bc737e6a333 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 - + https://github.com/dotnet/msbuild - 2a7a854c1b8dd412669c2c114ff18c9fa412ace7 + 5dc8af2966da388a0c426f13afde5da0d430c3d3 - + https://github.com/dotnet/msbuild - 2a7a854c1b8dd412669c2c114ff18c9fa412ace7 + 5dc8af2966da388a0c426f13afde5da0d430c3d3 - + https://github.com/dotnet/msbuild - 2a7a854c1b8dd412669c2c114ff18c9fa412ace7 + 5dc8af2966da388a0c426f13afde5da0d430c3d3 diff --git a/eng/Versions.props b/eng/Versions.props index a08fd2991511..542ad0071292 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,7 +123,7 @@ - 17.8.45 + 17.8.48 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.8.45-servicing-25560-07 + 17.8.48-servicing-25612-03 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) From 537175220f65f0b65f41cdf4cfc888bd1c83dfb3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Mon, 15 Dec 2025 08:32:42 -0600 Subject: [PATCH 053/280] Update alpine and fedora versions used in SB CI (#52148) --- eng/pipelines/templates/variables/vmr-build.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/templates/variables/vmr-build.yml b/eng/pipelines/templates/variables/vmr-build.yml index 9cdf223ec69e..8ed31d01af55 100644 --- a/eng/pipelines/templates/variables/vmr-build.yml +++ b/eng/pipelines/templates/variables/vmr-build.yml @@ -15,11 +15,11 @@ variables: - name: almaLinuxContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:almalinux-8-source-build - name: alpineContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.21-amd64 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.23-amd64 - name: centOSStreamContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9 - name: fedoraContainer - value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-41 + value: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-43-amd64 - name: ubuntuContainer value: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-24.04 - name: ubuntuArmContainer @@ -48,11 +48,11 @@ variables: - name: almaLinuxName value: AlmaLinux8 - name: alpineName - value: Alpine321 + value: Alpine323 - name: centOSStreamName value: CentOSStream9 - name: fedoraName - value: Fedora41 + value: Fedora43 - name: ubuntuName value: Ubuntu2404 @@ -65,11 +65,11 @@ variables: - name: linuxMuslArm64Rid value: linux-musl-arm64 - name: alpineX64Rid - value: alpine.3.21-x64 + value: alpine.3.23-x64 - name: centOSStreamX64Rid value: centos.9-x64 - name: fedoraX64Rid - value: fedora.41-x64 + value: fedora.43-x64 - name: ubuntux64Rid value: ubuntu.24.04-x64 - name: ubuntuArm64Rid From 83a6e0ed211408ce5bbac1bb70b01337b8301ca9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 15 Dec 2025 18:38:13 +0000 Subject: [PATCH 054/280] Fix duplicate using directives in ToolInstallGlobalOrToolPathCommand Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .../Tool/Install/ToolInstallGlobalOrToolPathCommand.cs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs index 0224c1786f55..70d054d16da2 100644 --- a/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Install/ToolInstallGlobalOrToolPathCommand.cs @@ -20,12 +20,6 @@ using NuGet.Frameworks; using NuGet.Versioning; using Microsoft.DotNet.Cli.CommandLine; -using Microsoft.DotNet.Cli.Extensions; -using Microsoft.DotNet.Cli.ShellShim; -using Microsoft.DotNet.Cli.Commands.Tool.Update; -using Microsoft.DotNet.Cli.Commands.Tool.Common; -using Microsoft.DotNet.Cli.Commands.Tool.Uninstall; -using Microsoft.DotNet.Cli.Commands.Tool.List; namespace Microsoft.DotNet.Cli.Commands.Tool.Install; From e397f1d640fe374dacb8b39d0b8eb290c8ec980f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Dec 2025 20:48:07 +0000 Subject: [PATCH 055/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20251215.1 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25173.3 -> To Version 3.11.0-beta1.25615.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.25173.3 -> To Version 9.0.0-preview.25615.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..6e428933c21d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -408,18 +408,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 7576c1d00aeef14c682c31b193ff8e58273cdd16 - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 7576c1d00aeef14c682c31b193ff8e58273cdd16 - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 7576c1d00aeef14c682c31b193ff8e58273cdd16 diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..4eef6daea611 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,8 +158,8 @@ - 9.0.0-preview.25173.3 - 3.11.0-beta1.25173.3 + 9.0.0-preview.25615.1 + 3.11.0-beta1.25615.1 From 4ec2205c04679678e77e2148cf286d8d16fe4629 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Dec 2025 22:11:31 +0000 Subject: [PATCH 056/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20251215.2 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25173.3 -> To Version 3.11.0-beta1.25615.2 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.25173.3 -> To Version 9.0.0-preview.25615.2 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e428933c21d..6172cf3047fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -408,16 +408,16 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers 7576c1d00aeef14c682c31b193ff8e58273cdd16 - + https://github.com/dotnet/roslyn-analyzers 7576c1d00aeef14c682c31b193ff8e58273cdd16 - + https://github.com/dotnet/roslyn-analyzers 7576c1d00aeef14c682c31b193ff8e58273cdd16 diff --git a/eng/Versions.props b/eng/Versions.props index 4eef6daea611..555fad97674b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,8 +158,8 @@ - 9.0.0-preview.25615.1 - 3.11.0-beta1.25615.1 + 9.0.0-preview.25615.2 + 3.11.0-beta1.25615.2 From 4f955cff291859655bd1606f07d618b3a7284053 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Dec 2025 22:29:56 +0000 Subject: [PATCH 057/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20251215.3 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25173.3 -> To Version 3.11.0-beta1.25615.3 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.25173.3 -> To Version 9.0.0-preview.25615.3 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6172cf3047fe..09331c20cdc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -408,16 +408,16 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers 7576c1d00aeef14c682c31b193ff8e58273cdd16 - + https://github.com/dotnet/roslyn-analyzers 7576c1d00aeef14c682c31b193ff8e58273cdd16 - + https://github.com/dotnet/roslyn-analyzers 7576c1d00aeef14c682c31b193ff8e58273cdd16 diff --git a/eng/Versions.props b/eng/Versions.props index 555fad97674b..6fe9f1fe64ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,8 +158,8 @@ - 9.0.0-preview.25615.2 - 3.11.0-beta1.25615.2 + 9.0.0-preview.25615.3 + 3.11.0-beta1.25615.3 From dad1a89f99516837e89150f700b33745d2cc6af6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Dec 2025 02:01:34 +0000 Subject: [PATCH 058/280] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20251215.3 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25564.4 -> To Version 8.0.0-alpha.1.25615.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bc737e6a333..47da6e44cfb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - 1bffa52c9f78c19618fa929eea4916b0c6d27403 + 44b5b62182b48c34c4b6aef28943ec3f3e82f214 From 7b9179cfa5b1712dece2571562b919a54a1a1a60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Dec 2025 02:02:24 +0000 Subject: [PATCH 059/280] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20251215.3 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.25564.4 -> To Version 8.0.0-alpha.1.25615.3 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2f9f1cd1c7f..2855788bf607 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ 16bcad1c13be082bd52ce178896d1119a73081a9 - + https://github.com/dotnet/source-build-reference-packages - 1bffa52c9f78c19618fa929eea4916b0c6d27403 + 44b5b62182b48c34c4b6aef28943ec3f3e82f214 From 69f7ae470089f2f36918b82dcad45517a4093c62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Dec 2025 02:03:00 +0000 Subject: [PATCH 060/280] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20251215.4 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25564.5 -> To Version 9.0.0-alpha.1.25615.4 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..ac829efd2cc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -451,9 +451,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae + 0420f84db3732c228281513233f2d85587640611 From 37d2dbc4aaf77c589efc2b44ffaf13e9b1fc0673 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Dec 2025 11:12:15 +0000 Subject: [PATCH 061/280] Update dependencies from https://github.com/dotnet/msbuild build 20251216.8 On relative base path root Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build.Localization From Version 17.8.48-servicing-25612-03 -> To Version 17.8.49-servicing-25616-08 Microsoft.Build From Version 17.8.48 -> To Version 17.8.49 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ac9ba8a75c1..d9cb8661fea6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bc737e6a333..b916cbec386c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 - + https://github.com/dotnet/msbuild - 5dc8af2966da388a0c426f13afde5da0d430c3d3 + 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 - + https://github.com/dotnet/msbuild - 5dc8af2966da388a0c426f13afde5da0d430c3d3 + 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 - + https://github.com/dotnet/msbuild - 5dc8af2966da388a0c426f13afde5da0d430c3d3 + 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 diff --git a/eng/Versions.props b/eng/Versions.props index 542ad0071292..d70bf66ac198 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -123,7 +123,7 @@ - 17.8.48 + 17.8.49 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) - 17.8.48-servicing-25612-03 + 17.8.49-servicing-25616-08 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildTasksCorePackageVersion) From 7af9b872332fc7cc3c296791d878aab53ae1dd1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Dec 2025 02:02:17 +0000 Subject: [PATCH 062/280] Update dependencies from https://github.com/dotnet/msbuild build 20251216.6 On relative base path root Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build.Localization From Version 17.12.53-preview-25570-13 -> To Version 17.12.55-preview-25616-06 Microsoft.Build From Version 17.12.53 -> To Version 17.12.55 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e91c2f84a19a..cc821d0d5225 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76719d899567..ac48512621f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -73,18 +73,18 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - 78635385dd25cbdb3483c5fe59d43160f1cc5039 + f42d88d8b1ac5dbe867e66278c5f4d9573eec65b - + https://github.com/dotnet/msbuild - 78635385dd25cbdb3483c5fe59d43160f1cc5039 + f42d88d8b1ac5dbe867e66278c5f4d9573eec65b - + https://github.com/dotnet/msbuild - 78635385dd25cbdb3483c5fe59d43160f1cc5039 + f42d88d8b1ac5dbe867e66278c5f4d9573eec65b diff --git a/eng/Versions.props b/eng/Versions.props index 64e906fdb4cb..1221de2772cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,8 +180,8 @@ 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.12.54 - 17.12.54-preview-25609-03 + 17.12.55 + 17.12.55-preview-25616-06 17.11.48 17.12 From 32f6b31fbfa2c4df847820038f83dff4b16869cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Dec 2025 02:02:35 +0000 Subject: [PATCH 063/280] Update dependencies from https://github.com/dotnet/msbuild build 20251216.7 On relative base path root Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build.Localization From Version 17.14.37-servicing-25604-02 -> To Version 17.14.41-servicing-25616-07 Microsoft.Build From Version 17.14.37 -> To Version 17.14.41 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index e651da87b1bd..58cf8ebff779 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8ec77050e84..f07027eadd74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -69,18 +69,18 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - 3e744208875e56e4bf0bc22c40a1c431fb150987 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - 3e744208875e56e4bf0bc22c40a1c431fb150987 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - 3e744208875e56e4bf0bc22c40a1c431fb150987 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 diff --git a/eng/Versions.props b/eng/Versions.props index afb5172a62f1..23343614e999 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,8 +182,8 @@ 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.40 - 17.14.40-servicing-25609-11 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 From 70be5c299d243107425ac8f9bfa9f12a54b11793 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 17 Dec 2025 15:31:31 +0000 Subject: [PATCH 064/280] Address code review feedback: refactor slnf handling Co-authored-by: mthalman <15789599+mthalman@users.noreply.github.com> --- .../Solution/Add/SolutionAddCommand.cs | 32 ++++++++++++------ .../Solution/Remove/SolutionRemoveCommand.cs | 12 +++---- src/Cli/dotnet/SlnFileFactory.cs | 2 +- src/Cli/dotnet/SlnfFileHelper.cs | 33 ++++++++++++++++--- 4 files changed, 58 insertions(+), 21 deletions(-) diff --git a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs index ef8d1e4dc053..6bea762448ce 100644 --- a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs @@ -65,9 +65,9 @@ public override int Execute() }).ToList(); // Check if we're working with a solution filter file - if (_solutionFileFullPath.HasExtension(".slnf")) + if (_solutionFileFullPath.HasExtension(SlnfFileHelper.SlnfExtension)) { - AddProjectsToSolutionFilterAsync(fullProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + AddProjectsToSolutionFilter(fullProjectPaths); } else { @@ -233,7 +233,7 @@ private void AddProject(SolutionModel solution, string fullProjectPath, ISolutio } } - private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectPaths, CancellationToken cancellationToken) + private void AddProjectsToSolutionFilter(IEnumerable projectPaths) { // Solution filter files don't support --in-root or --solution-folder options if (_inRoot || !string.IsNullOrEmpty(_solutionFolderPath)) @@ -249,17 +249,33 @@ private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectP SolutionModel parentSolution = SlnFileFactory.CreateFromFileOrDirectory(parentSolutionPath); // Get existing projects in the filter (already normalized to OS separator by CreateFromFilteredSolutionFile) - var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); + // Use case-insensitive comparer on Windows for file path comparison + var comparer = OperatingSystem.IsWindows() ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; + var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(comparer); // Get solution-relative paths for new projects + var newProjects = ValidateAndGetNewProjects(projectPaths, parentSolution, parentSolutionPath, existingProjects); + + // Add new projects to the existing list and save + var allProjects = existingProjects.Concat(newProjects).OrderBy(p => p); + SlnfFileHelper.SaveSolutionFilter(_solutionFileFullPath, parentSolutionPath, allProjects); + } + + private List ValidateAndGetNewProjects( + IEnumerable projectPaths, + SolutionModel parentSolution, + string parentSolutionPath, + HashSet existingProjects) + { var newProjects = new List(); string parentSolutionDirectory = Path.GetDirectoryName(parentSolutionPath) ?? string.Empty; + foreach (var projectPath in projectPaths) { string parentSolutionRelativePath = Path.GetRelativePath(parentSolutionDirectory, projectPath); // Normalize to OS separator for consistent comparison - parentSolutionRelativePath = parentSolutionRelativePath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); + parentSolutionRelativePath = SlnfFileHelper.NormalizePathSeparatorsToOS(parentSolutionRelativePath); // Check if project exists in parent solution var projectInParent = parentSolution.FindProject(parentSolutionRelativePath); @@ -280,10 +296,6 @@ private async Task AddProjectsToSolutionFilterAsync(IEnumerable projectP Reporter.Output.WriteLine(CliStrings.ProjectAddedToTheSolution, parentSolutionRelativePath); } - // Add new projects to the existing list and save - var allProjects = existingProjects.Concat(newProjects).OrderBy(p => p); - SlnfFileHelper.SaveSolutionFilter(_solutionFileFullPath, parentSolutionPath, allProjects); - - await Task.CompletedTask; + return newProjects; } } diff --git a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs index dfe32f549a1c..26fdf297527f 100644 --- a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs @@ -44,9 +44,9 @@ public override int Execute() : p)); // Check if we're working with a solution filter file - if (solutionFileFullPath.HasExtension(".slnf")) + if (solutionFileFullPath.HasExtension(SlnfFileHelper.SlnfExtension)) { - RemoveProjectsFromSolutionFilterAsync(solutionFileFullPath, relativeProjectPaths, CancellationToken.None).GetAwaiter().GetResult(); + RemoveProjectsFromSolutionFilter(solutionFileFullPath, relativeProjectPaths); } else { @@ -139,14 +139,16 @@ private static async Task RemoveProjectsAsync(string solutionFileFullPath, IEnum await serializer.SaveAsync(solutionFileFullPath, solution, cancellationToken); } - private static async Task RemoveProjectsFromSolutionFilterAsync(string slnfFileFullPath, IEnumerable projectPaths, CancellationToken cancellationToken) + private static void RemoveProjectsFromSolutionFilter(string slnfFileFullPath, IEnumerable projectPaths) { // Load the filtered solution to get the parent solution path and existing projects SolutionModel filteredSolution = SlnFileFactory.CreateFromFilteredSolutionFile(slnfFileFullPath); string parentSolutionPath = filteredSolution.Description!; // The parent solution path is stored in Description // Get existing projects in the filter - var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); + // Use case-insensitive comparer on Windows for file path comparison + var comparer = OperatingSystem.IsWindows() ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; + var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(comparer); // Remove specified projects foreach (var projectPath in projectPaths) @@ -167,7 +169,5 @@ private static async Task RemoveProjectsFromSolutionFilterAsync(string slnfFileF // Save updated filter SlnfFileHelper.SaveSolutionFilter(slnfFileFullPath, parentSolutionPath, existingProjects.OrderBy(p => p)); - - await Task.CompletedTask; } } diff --git a/src/Cli/dotnet/SlnFileFactory.cs b/src/Cli/dotnet/SlnFileFactory.cs index 6cbce88744b4..723195a66e36 100644 --- a/src/Cli/dotnet/SlnFileFactory.cs +++ b/src/Cli/dotnet/SlnFileFactory.cs @@ -92,7 +92,7 @@ public static SolutionModel CreateFromFilteredSolutionFile(string filteredSoluti JsonElement root = JsonDocument.Parse(File.ReadAllText(filteredSolutionPath)).RootElement; originalSolutionPath = Uri.UnescapeDataString(root.GetProperty("solution").GetProperty("path").GetString()); // Normalize path separators to OS-specific for cross-platform compatibility - originalSolutionPath = originalSolutionPath.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); + originalSolutionPath = SlnfFileHelper.NormalizePathSeparatorsToOS(originalSolutionPath); filteredSolutionProjectPaths = [.. root.GetProperty("solution").GetProperty("projects").EnumerateArray().Select(p => p.GetString())]; originalSolutionPathAbsolute = Path.GetFullPath(originalSolutionPath, Path.GetDirectoryName(filteredSolutionPath)); } diff --git a/src/Cli/dotnet/SlnfFileHelper.cs b/src/Cli/dotnet/SlnfFileHelper.cs index c4a788bc87dc..87d93b75d3d5 100644 --- a/src/Cli/dotnet/SlnfFileHelper.cs +++ b/src/Cli/dotnet/SlnfFileHelper.cs @@ -16,6 +16,31 @@ namespace Microsoft.DotNet.Cli; /// public static class SlnfFileHelper { + /// + /// File extension for solution filter files + /// + public const string SlnfExtension = ".slnf"; + + /// + /// Normalizes path separators from backslashes to the OS-specific directory separator + /// + /// The path to normalize + /// Path with OS-specific separators + public static string NormalizePathSeparatorsToOS(string path) + { + return path.Replace('\\', Path.DirectorySeparatorChar).Replace('/', Path.DirectorySeparatorChar); + } + + /// + /// Normalizes path separators to backslashes (as used in .slnf files) + /// + /// The path to normalize + /// Path with backslash separators + public static string NormalizePathSeparatorsToBackslash(string path) + { + return path.Replace(Path.DirectorySeparatorChar, '\\'); + } + private class SlnfSolution { [JsonPropertyName("path")] @@ -44,14 +69,14 @@ public static void CreateSolutionFilter(string slnfPath, string parentSolutionPa var relativeSolutionPath = Path.GetRelativePath(slnfDirectory, parentSolutionFullPath); // Normalize path separators to backslashes (as per slnf format) - relativeSolutionPath = relativeSolutionPath.Replace(Path.DirectorySeparatorChar, '\\'); + relativeSolutionPath = NormalizePathSeparatorsToBackslash(relativeSolutionPath); var root = new SlnfRoot { Solution = new SlnfSolution { Path = relativeSolutionPath, - Projects = projects?.Select(p => p.Replace(Path.DirectorySeparatorChar, '\\')).ToList() ?? new List() + Projects = projects?.Select(NormalizePathSeparatorsToBackslash).ToList() ?? new List() } }; @@ -83,14 +108,14 @@ public static void SaveSolutionFilter(string slnfPath, string parentSolutionPath } // Normalize path separators to backslashes (as per slnf format) - relativeSolutionPath = relativeSolutionPath.Replace(Path.DirectorySeparatorChar, '\\'); + relativeSolutionPath = NormalizePathSeparatorsToBackslash(relativeSolutionPath); var root = new SlnfRoot { Solution = new SlnfSolution { Path = relativeSolutionPath, - Projects = projects.Select(p => p.Replace(Path.DirectorySeparatorChar, '\\')).ToList() + Projects = projects.Select(NormalizePathSeparatorsToBackslash).ToList() } }; From 75a51a8b9a190504fcef18c3b74166a7cca576cb Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 17 Dec 2025 15:56:56 +0000 Subject: [PATCH 065/280] Revert case-insensitive comparer, use default ToHashSet() Co-authored-by: mthalman <15789599+mthalman@users.noreply.github.com> --- src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs | 4 +--- .../dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs index 6bea762448ce..800924d5c9ae 100644 --- a/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Add/SolutionAddCommand.cs @@ -249,9 +249,7 @@ private void AddProjectsToSolutionFilter(IEnumerable projectPaths) SolutionModel parentSolution = SlnFileFactory.CreateFromFileOrDirectory(parentSolutionPath); // Get existing projects in the filter (already normalized to OS separator by CreateFromFilteredSolutionFile) - // Use case-insensitive comparer on Windows for file path comparison - var comparer = OperatingSystem.IsWindows() ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; - var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(comparer); + var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); // Get solution-relative paths for new projects var newProjects = ValidateAndGetNewProjects(projectPaths, parentSolution, parentSolutionPath, existingProjects); diff --git a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs index 26fdf297527f..f8a26281632f 100644 --- a/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs +++ b/src/Cli/dotnet/Commands/Solution/Remove/SolutionRemoveCommand.cs @@ -147,8 +147,7 @@ private static void RemoveProjectsFromSolutionFilter(string slnfFileFullPath, IE // Get existing projects in the filter // Use case-insensitive comparer on Windows for file path comparison - var comparer = OperatingSystem.IsWindows() ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; - var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(comparer); + var existingProjects = filteredSolution.SolutionProjects.Select(p => p.FilePath).ToHashSet(); // Remove specified projects foreach (var projectPath in projectPaths) From a628bdead83f481aac50d21b1d7c2a5e564749a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Dec 2025 09:16:01 +0000 Subject: [PATCH 066/280] Update dependencies from https://github.com/dotnet/razor build 20251228.11 On relative base path root Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.25608.14 -> To Version 7.0.0-preview.25628.11 --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bce0bc7752f1..00df4bbf9784 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -293,16 +293,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore ee417479933278bb5aadc5944706a96b5ef74a5d - + https://github.com/dotnet/razor a36694712be3000f238f25e52f11e6225dda5f9b - + https://github.com/dotnet/razor a36694712be3000f238f25e52f11e6225dda5f9b - + https://github.com/dotnet/razor a36694712be3000f238f25e52f11e6225dda5f9b diff --git a/eng/Versions.props b/eng/Versions.props index 72064154ea21..08c2cf410834 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,9 +180,9 @@ - 7.0.0-preview.25610.5 - 7.0.0-preview.25610.5 - 7.0.0-preview.25610.5 + 7.0.0-preview.25628.11 + 7.0.0-preview.25628.11 + 7.0.0-preview.25628.11 From 1a13d45e50b8cb2027fe96a91af57dc218cde295 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Dec 2025 09:23:35 +0000 Subject: [PATCH 067/280] Update dependencies from https://github.com/dotnet/razor build 20251228.1 On relative base path root Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25608.8 -> To Version 9.0.0-preview.25628.1 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..7e88af12ef6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,20 +325,20 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..9aa3d6c4c53a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25608.8 - 9.0.0-preview.25608.8 - 9.0.0-preview.25608.8 + 9.0.0-preview.25628.1 + 9.0.0-preview.25628.1 + 9.0.0-preview.25628.1 From 85f8ec0c6466252f0526177c0609a25acfdcde92 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 5 Jan 2026 10:34:41 -0800 Subject: [PATCH 068/280] Update branding to 8.0.124 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 542ad0071292..4f304e8beda2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.123 + 8.0.124 true release From 8b799120995aa789b769e28349d4d5f142b86457 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 5 Jan 2026 10:34:48 -0800 Subject: [PATCH 069/280] Update branding to 8.0.418 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 553400387be7..437cbd916f39 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.417 + 8.0.418 8.0.400 true From 98c739b6936965fa783b0935d4478dc0fb8bad0d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 5 Jan 2026 10:35:05 -0800 Subject: [PATCH 070/280] Update branding to 9.0.114 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..5deac64e28a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 1 - 13 + 14 From 7be6c2e5174279ed2dfa42b0c02feeacfffaed59 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 5 Jan 2026 10:35:14 -0800 Subject: [PATCH 071/280] Update branding to 9.0.310 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 584075a0510a..97a0697066db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 3 - 09 + 10 From fad656983ee42f0bdcbec603dbdd61940953ce25 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 01:45:44 +0000 Subject: [PATCH 072/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20260105.3 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.25424.3 -> To Version 9.0.0-preview.26055.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f50d6d6f52..e871d3b81e5f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -374,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 433fa3e4a54010fcac6e8843460e29d33ba07eb7 + 742cc53ecfc7e7245f950e5ba58268ed2829913c https://github.com/dotnet/roslyn 8cafac4760a78176ef0e167bea66b97b65437930 - + https://github.com/dotnet/roslyn-analyzers - 433fa3e4a54010fcac6e8843460e29d33ba07eb7 + 742cc53ecfc7e7245f950e5ba58268ed2829913c diff --git a/eng/Versions.props b/eng/Versions.props index 584075a0510a..9a467c1f867a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -160,7 +160,7 @@ - 9.0.0-preview.25329.4 + 9.0.0-preview.26055.3 3.12.0-beta1.25570.7 From 492d6f96b52535b1b70fdb3dac9a5c5102c32a59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 01:48:54 +0000 Subject: [PATCH 073/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20260105.1 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25074.1 -> To Version 3.11.0-beta1.26055.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.25074.1 -> To Version 8.0.0-preview.26055.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bc737e6a333..e2d25e145136 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -327,17 +327,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - de4aff542dacdc8027c1b4c4580a385dc097341f + ca32bf554d5e9a08860f92245439cbe379cfc0f3 - + https://github.com/dotnet/roslyn-analyzers - de4aff542dacdc8027c1b4c4580a385dc097341f + ca32bf554d5e9a08860f92245439cbe379cfc0f3 - + https://github.com/dotnet/roslyn-analyzers - de4aff542dacdc8027c1b4c4580a385dc097341f + ca32bf554d5e9a08860f92245439cbe379cfc0f3 diff --git a/eng/Versions.props b/eng/Versions.props index 542ad0071292..9ec96747f824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,8 +118,8 @@ - 8.0.0-preview.25074.1 - 3.11.0-beta1.25074.1 + 8.0.0-preview.26055.1 + 3.11.0-beta1.26055.1 From 7f79a3e189784b0494f0763817849deb1c9fee0f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 02:01:43 +0000 Subject: [PATCH 074/280] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20260105.1 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.25564.5 -> To Version 9.0.0-alpha.1.26055.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac829efd2cc1..7e78730c0afd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -451,9 +451,9 @@ - + https://github.com/dotnet/source-build-reference-packages - 0420f84db3732c228281513233f2d85587640611 + 36e2d072b287fb211f288498b2d4553efdee7990 From 7e6bcbdca34df638f379d8101cc37568d03eabfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 03:47:32 +0000 Subject: [PATCH 075/280] Update dependencies from https://github.com/dotnet/templating build 20260105.4 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.310 Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25608.4 -> To Version 9.0.310-servicing.26055.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 87316c86cb39..ec6093c4b4a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62f50d6d6f52..ee1f53434a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - 6d8610fb68d8c6e6fbe2d8f81cb298ef65dbcd5b + 676a1ea2b015c36a3abd7aaf530804baeb1bc909 - + https://github.com/dotnet/templating - 6d8610fb68d8c6e6fbe2d8f81cb298ef65dbcd5b + 676a1ea2b015c36a3abd7aaf530804baeb1bc909 diff --git a/eng/Versions.props b/eng/Versions.props index 97a0697066db..864b902fd7f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,13 +189,13 @@ - 9.0.309 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.309-servicing.25608.4 + 9.0.310-servicing.26055.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From bfa94559d60bc4431cce16adfdc656f5a8c4dd60 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 04:11:41 +0000 Subject: [PATCH 076/280] Update dependencies from https://github.com/dotnet/templating build 20260105.2 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.123-servicing.25604.5 -> To Version 8.0.124-servicing.26055.2 Microsoft.TemplateEngine.Abstractions From Version 8.0.123 -> To Version 8.0.124 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ac9ba8a75c1..e2b31a9899a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bc737e6a333..d96682be25cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 4b069640bf2c78b3bf1a818150e0739ec19312a2 + 17acd40f8d69e68fde28d26bc0c773472b8d1d43 - + https://github.com/dotnet/templating - 4b069640bf2c78b3bf1a818150e0739ec19312a2 + 17acd40f8d69e68fde28d26bc0c773472b8d1d43 - + https://github.com/dotnet/templating - 4b069640bf2c78b3bf1a818150e0739ec19312a2 + 17acd40f8d69e68fde28d26bc0c773472b8d1d43 diff --git a/eng/Versions.props b/eng/Versions.props index 542ad0071292..d1f07463a630 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,13 +142,13 @@ - 8.0.123 + 8.0.124 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.123-servicing.25604.5 + 8.0.124-servicing.26055.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c85187dfa6d5159e022c03a5ec462ab76e772fcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 04:43:00 +0000 Subject: [PATCH 077/280] Update dependencies from https://github.com/dotnet/templating build 20260105.6 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.309 -> To Version 9.0.310 Microsoft.TemplateEngine.Mocks From Version 9.0.309-servicing.25608.4 -> To Version 9.0.310-servicing.26055.6 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec6093c4b4a9..77bd87ea671c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee1f53434a58..5df2054dd526 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 676a1ea2b015c36a3abd7aaf530804baeb1bc909 + 4794f78576d0fb3910d28da073094cd56d02696a - + https://github.com/dotnet/templating - 676a1ea2b015c36a3abd7aaf530804baeb1bc909 + 4794f78576d0fb3910d28da073094cd56d02696a diff --git a/eng/Versions.props b/eng/Versions.props index 864b902fd7f9..c33365db0921 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.310-servicing.26055.4 + 9.0.310-servicing.26055.6 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 948e11e8145af13ad9b89dcae996b8630672d3b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 05:19:26 +0000 Subject: [PATCH 078/280] Update dependencies from https://github.com/dotnet/templating build 20260105.7 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.123-servicing.25604.5 -> To Version 8.0.124-servicing.26055.7 Microsoft.TemplateEngine.Abstractions From Version 8.0.123 -> To Version 8.0.124 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index e2b31a9899a0..a85d6dad61c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d96682be25cf..c15d587d2154 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 17acd40f8d69e68fde28d26bc0c773472b8d1d43 + 14038fd0b26940642fccf5cc14fe86f0933cf0aa - + https://github.com/dotnet/templating - 17acd40f8d69e68fde28d26bc0c773472b8d1d43 + 14038fd0b26940642fccf5cc14fe86f0933cf0aa - + https://github.com/dotnet/templating - 17acd40f8d69e68fde28d26bc0c773472b8d1d43 + 14038fd0b26940642fccf5cc14fe86f0933cf0aa diff --git a/eng/Versions.props b/eng/Versions.props index d1f07463a630..05f5f8f653c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.124-servicing.26055.2 + 8.0.124-servicing.26055.7 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From ee861b58a4589054da280c68bd5803cf4db83bd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Jan 2026 08:08:15 +0000 Subject: [PATCH 079/280] Update dependencies from https://github.com/dotnet/templating build 20260105.11 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.123-servicing.25604.5 -> To Version 8.0.124-servicing.26055.11 Microsoft.TemplateEngine.Abstractions From Version 8.0.123 -> To Version 8.0.124 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index a85d6dad61c4..1ce47faaa236 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c15d587d2154..57c34b4bbfc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 14038fd0b26940642fccf5cc14fe86f0933cf0aa + faa404a06e63486679117056b1206cf3f05c5526 - + https://github.com/dotnet/templating - 14038fd0b26940642fccf5cc14fe86f0933cf0aa + faa404a06e63486679117056b1206cf3f05c5526 - + https://github.com/dotnet/templating - 14038fd0b26940642fccf5cc14fe86f0933cf0aa + faa404a06e63486679117056b1206cf3f05c5526 diff --git a/eng/Versions.props b/eng/Versions.props index 05f5f8f653c5..50acf8d6db7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.124-servicing.26055.7 + 8.0.124-servicing.26055.11 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 748e9da71cdc91705ddf4501dc4914e9f75f94d9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jan 2026 12:59:09 -0800 Subject: [PATCH 080/280] Update helixTargetQueue for macOS version to OSX 15 --- .vsts-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 783d97e908ab..da64d5526e5b 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -157,9 +157,9 @@ stages: pool: vmImage: 'macOS-latest' ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.15.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.15.Amd64 strategy: matrix: Build_Release: From 88eb04cf905c8bae442ec8b6cf6e5aac54dd7bf3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jan 2026 12:59:37 -0800 Subject: [PATCH 081/280] Update helixTargetQueue for macOS version to OSX 15 --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index df58ec2eb3aa..a97bb95ae13c 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -202,9 +202,9 @@ extends: image: macOS-latest os: macOS ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.15.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.15.Amd64 variables: - name: _BuildConfig value: Release From f02a5eb14f324cd297441febd9099130268056fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:18:44 -0600 Subject: [PATCH 082/280] [release/9.0.3xx] Update dependencies from dotnet/templating (#52323) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd34e9332447..33d0c75f8bf0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f594d80c9722..0c5ccd72ff5e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 4794f78576d0fb3910d28da073094cd56d02696a + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 4794f78576d0fb3910d28da073094cd56d02696a + e9437e509698986ef26dcc6b268f8c6e19a6e7eb diff --git a/eng/Versions.props b/eng/Versions.props index 48d5e0ea87f5..4aa3b0110967 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.310-servicing.26055.6 + 9.0.310-servicing.26056.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 81f778f9bae4c2ed9d15ab68e1a117d09aeff18b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 6 Jan 2026 15:21:07 -0600 Subject: [PATCH 083/280] [release/9.0.3xx] Update dependencies from dotnet/razor (#52291) Co-authored-by: dotnet-maestro[bot] Co-authored-by: DonnaChen888 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c5ccd72ff5e..bf383fd331fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,20 +321,20 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor fd1e96f4650a3d0bffa73556f46ab1328a70da92 diff --git a/eng/Versions.props b/eng/Versions.props index 4aa3b0110967..ce1ee598dda5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -233,9 +233,9 @@ - 9.0.0-preview.25608.9 - 9.0.0-preview.25608.9 - 9.0.0-preview.25608.9 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 From 72e782541cab0694c5cc018e4bc784245e22e6a1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 6 Jan 2026 15:29:14 -0600 Subject: [PATCH 084/280] Enable error logging in source-build tests (#52251) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs index 129d96c24777..d6da48981621 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/ExecuteHelper.cs @@ -100,7 +100,7 @@ public static (Process Process, string StdOut, string StdErr) ExecuteProcess( outputHelper.WriteLine(output); } - if (string.IsNullOrWhiteSpace(error)) + if (!string.IsNullOrWhiteSpace(error)) { outputHelper.WriteLine(error); } From 3cb89571075f372f9a339857ee5f87fd183bc41c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Jan 2026 02:01:54 +0000 Subject: [PATCH 085/280] Update dependencies from https://github.com/dotnet/templating build 20260105.10 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.417-servicing.25604.8 -> To Version 8.0.418-servicing.26055.10 Microsoft.TemplateEngine.Abstractions From Version 8.0.417 -> To Version 8.0.418 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 776663bf519e..174708bd4a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2f9f1cd1c7f..117f4a751521 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 2b8df8be75e04c0a40e01cb311d6e7de293960d3 + 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 - + https://github.com/dotnet/templating - 2b8df8be75e04c0a40e01cb311d6e7de293960d3 + 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 - + https://github.com/dotnet/templating - 2b8df8be75e04c0a40e01cb311d6e7de293960d3 + 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 diff --git a/eng/Versions.props b/eng/Versions.props index 553400387be7..2cb851a3c5a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,13 +143,13 @@ - 8.0.417 + 8.0.418 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.417-servicing.25604.8 + 8.0.418-servicing.26055.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 92c26eb5aa26da2f8aaeb0bc6ea5902ad0ffd659 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Jan 2026 02:01:59 +0000 Subject: [PATCH 086/280] Update dependencies from https://github.com/dotnet/source-build-externals build 20260106.1 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.25202.2 -> To Version 8.0.0-alpha.1.26056.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2f9f1cd1c7f..2a95a237432d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 16bcad1c13be082bd52ce178896d1119a73081a9 + 5f4a123a49dd5480065c8d6182536cf86b4f4410 From fa8d906b8a7f0e9ef903db1a24fecb66e0202644 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Jan 2026 04:12:49 +0000 Subject: [PATCH 087/280] Update dependencies from https://github.com/dotnet/templating build 20260106.5 On relative base path root Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Mocks From Version 8.0.123-servicing.25604.5 -> To Version 8.0.124-servicing.26056.5 Microsoft.TemplateEngine.Abstractions From Version 8.0.123 -> To Version 8.0.124 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ce47faaa236..7f5c236e0331 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c34b4bbfc5..ab9f98cddefb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - faa404a06e63486679117056b1206cf3f05c5526 + c60b810b74b2e1dad8159cd33363483c07195f41 - + https://github.com/dotnet/templating - faa404a06e63486679117056b1206cf3f05c5526 + c60b810b74b2e1dad8159cd33363483c07195f41 - + https://github.com/dotnet/templating - faa404a06e63486679117056b1206cf3f05c5526 + c60b810b74b2e1dad8159cd33363483c07195f41 diff --git a/eng/Versions.props b/eng/Versions.props index 50acf8d6db7a..81e22fcc185f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.124-servicing.26055.11 + 8.0.124-servicing.26056.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 0d6a92c6cc5a4d347dbe5ac09522ff7664e65b58 Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Wed, 7 Jan 2026 16:52:19 +0800 Subject: [PATCH 088/280] Update windows image to 2022 --- .vsts-pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index da64d5526e5b..cde01569a074 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -52,10 +52,10 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: 'windows-2019' + vmImage: 'windows-2022' ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration @@ -119,10 +119,10 @@ stages: agentOs: Windows_NT_TestAsTools pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: 'windows-2019' + vmImage: 'windows-2022' ${{ if ne(variables['System.TeamProject'], 'public') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 strategy: matrix: Build_Debug: From 05c1ce5b6b9cd828f9e9d16a88cdcfe16bb4847c Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Wed, 7 Jan 2026 16:58:47 +0800 Subject: [PATCH 089/280] Ignore warning: -ld_classic is deprecated and will be removed in a future release --- .../GivenThatWeWantToPublishAnAotApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 352421de7803..5c3682cf801c 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -48,7 +48,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") .And.NotHaveStdErrContaining("warning") - .And.NotHaveStdOutContaining("warning"); + .And.NotHaveStdOutContaining("warning", new[] { "ld: warning: -ld_classic is deprecated and will be removed in a future release" }); var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework); var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"]; From 081c7768ffd398629da051f43244224f9387560f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 7 Jan 2026 10:01:41 -0600 Subject: [PATCH 090/280] [release/9.0.3xx] Update dependencies from dotnet/arcade (#52007) Co-authored-by: dotnet-maestro[bot] Co-authored-by: DonnaChen888 Co-authored-by: Michael Yanni --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../job/source-index-stage1.yml | 2 +- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 11 ++++---- global.json | 4 +-- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf383fd331fa..ff4831f9add9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 diff --git a/eng/Versions.props b/eng/Versions.props index ce1ee598dda5..4f5fa51471a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 662b9fcce154..ddf8c2e00d80 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6a1560e8442e..a06513a59407 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -543,7 +543,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } @@ -554,6 +554,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ $vsRequirements = $null } } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { @@ -968,4 +969,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 3ee42b57d57e..1f746c2d5d20 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From cca721886dba22bce2b58df9d8d77ab46b3b6ad3 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jan 2026 12:59:09 -0800 Subject: [PATCH 091/280] Update helixTargetQueue for macOS version to OSX 15 --- .vsts-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index de119f29b2d5..879d8022546b 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -151,9 +151,9 @@ stages: pool: vmImage: 'macOS-latest' ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.15.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.15.Amd64 strategy: matrix: Build_Release: From 1c7b738dc55c43c3a2887fa5a1fd9d18a3d84cd5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 6 Jan 2026 12:59:37 -0800 Subject: [PATCH 092/280] Update helixTargetQueue for macOS version to OSX 15 --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 321b5d933c20..479914ddf4d6 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -196,9 +196,9 @@ extends: image: macOS-latest os: macOS ${{ if eq(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64.Open + helixTargetQueue: OSX.15.Amd64.Open ${{ if ne(variables['System.TeamProject'], 'public') }}: - helixTargetQueue: OSX.13.Amd64 + helixTargetQueue: OSX.15.Amd64 variables: - name: _BuildConfig value: Release From df8c52354957109a64f193330352b6a4d24ed88f Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Wed, 7 Jan 2026 16:52:19 +0800 Subject: [PATCH 093/280] Update windows image to 2022 --- .vsts-pr.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 879d8022546b..1bffe245953b 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -52,10 +52,10 @@ stages: - job: Publish_Build_Configuration pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: 'windows-2019' + vmImage: 'windows-2022' ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - publish: $(Build.SourcesDirectory)\eng\BuildConfiguration artifact: BuildConfiguration @@ -113,10 +113,10 @@ stages: agentOs: Windows_NT_TestAsTools pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: - vmImage: 'windows-2019' + vmImage: 'windows-2022' ${{ if ne(variables['System.TeamProject'], 'public') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 strategy: matrix: Build_Debug: From b9ac8d0fd725cd56f1a04ebd91d8bc6c201a6b7d Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Wed, 7 Jan 2026 16:58:47 +0800 Subject: [PATCH 094/280] Ignore warning: -ld_classic is deprecated and will be removed in a future release --- .../GivenThatWeWantToPublishAnAotApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 352421de7803..5c3682cf801c 100644 --- a/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -48,7 +48,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") .And.NotHaveStdErrContaining("warning") - .And.NotHaveStdOutContaining("warning"); + .And.NotHaveStdOutContaining("warning", new[] { "ld: warning: -ld_classic is deprecated and will be removed in a future release" }); var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework); var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"]; From 44c336bba8fb176791903abab5bf8ba57c467187 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 7 Jan 2026 13:56:21 -0800 Subject: [PATCH 095/280] Update helixTargetQueue to osx.15.amd64 --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index a33f0adc1e59..c7560d072e46 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -273,7 +273,7 @@ extends: name: Azure Pipelines image: macOS-latest os: macOS - helixTargetQueue: osx.13.amd64 + helixTargetQueue: osx.15.amd64 oneESCompat: templateFolderName: templates-official publishTaskPrefix: 1ES. From f30833f3250439626d1aafd7227a060cbfdfa5d4 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 7 Jan 2026 13:56:44 -0800 Subject: [PATCH 096/280] Update helixTargetQueue to osx.15.amd64.open --- .vsts-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index f325d966f28a..290fb18f8860 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -57,7 +57,7 @@ stages: name: Azure Pipelines vmImage: macOS-latest os: macOS - helixTargetQueue: osx.13.amd64.open + helixTargetQueue: osx.15.amd64.open ############### SOURCE BUILD ############### - template: /eng/common/templates/job/source-build.yml From a36d2ea92007c07fd7c5df1c3260ef9b30536019 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jan 2026 01:17:53 +0000 Subject: [PATCH 097/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20260107.1 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.25173.3 -> To Version 3.11.0-beta1.26057.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 9.0.0-preview.25173.3 -> To Version 9.0.0-preview.26057.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09331c20cdc8..7af9a7392070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -408,18 +408,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 7576c1d00aeef14c682c31b193ff8e58273cdd16 + 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 - + https://github.com/dotnet/roslyn-analyzers - 7576c1d00aeef14c682c31b193ff8e58273cdd16 + 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 - + https://github.com/dotnet/roslyn-analyzers - 7576c1d00aeef14c682c31b193ff8e58273cdd16 + 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 diff --git a/eng/Versions.props b/eng/Versions.props index 6fe9f1fe64ca..6566a20d4aa0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -158,8 +158,8 @@ - 9.0.0-preview.25615.3 - 3.11.0-beta1.25615.3 + 9.0.0-preview.26057.1 + 3.11.0-beta1.26057.1 From 34df195ac8ae10c7690e768a58324502a44360d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jan 2026 02:02:14 +0000 Subject: [PATCH 098/280] Update dependencies from https://github.com/dotnet/roslyn build 20260107.9 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25609.16 -> To Version 4.14.0-3.26057.9 Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.12.0-beta1.25609.16 -> To Version 3.12.0-beta1.26057.9 --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff4831f9add9..ff9aeea4001a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 742cc53ecfc7e7245f950e5ba58268ed2829913c - + https://github.com/dotnet/roslyn - 44b81fc54139e9fce040efc2a6558110c038896b + a983c60c5595960e9c542c10575c86168ef7597b diff --git a/eng/Versions.props b/eng/Versions.props index 4f5fa51471a9..ec008f15e271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.26055.3 - 3.12.0-beta1.25570.7 + 3.12.0-beta1.26057.9 @@ -206,14 +206,14 @@ - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 - 4.14.0-3.25609.16 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 From 739daca070fb729f3a1907eaa645cb5c91cc55b0 Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Thu, 8 Jan 2026 10:07:00 +0800 Subject: [PATCH 099/280] Ignore warning: -ld_classic is deprecated and will be removed in a future release --- .../GivenThatWeWantToPublishAnAotApp.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs index 713a2bab116f..e6e916381d5a 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishAnAotApp.cs @@ -49,7 +49,7 @@ public void NativeAot_hw_runs_with_no_warnings_when_PublishAot_is_enabled(string .And.NotHaveStdOutContaining("IL2026") .And.NotHaveStdErrContaining("NETSDK1179") .And.NotHaveStdErrContaining("warning") - .And.NotHaveStdOutContaining("warning"); + .And.NotHaveStdOutContaining("warning", new[] { "ld: warning: -ld_classic is deprecated and will be removed in a future release" }); var buildProperties = testProject.GetPropertyValues(testAsset.TestRoot, targetFramework); var rid = buildProperties["NETCoreSdkPortableRuntimeIdentifier"]; From e055a32e029c8f56b74b87cc01f0348431e4e1a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 05:55:35 +0000 Subject: [PATCH 100/280] [release/8.0.1xx] Update dependencies from dotnet/source-build-externals (#52328) [release/8.0.1xx] Update dependencies from dotnet/source-build-externals - Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-1e0be5a1-91f6-4913-8ebf-7dd8b027e697 - Merge branch 'release/8.0.1xx' into darc-release/8.0.1xx-1e0be5a1-91f6-4913-8ebf-7dd8b027e697 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 355073640634..5feee8435817 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 16bcad1c13be082bd52ce178896d1119a73081a9 + 5f4a123a49dd5480065c8d6182536cf86b4f4410 From dd33a9ab7e765e0176937d7a59a0afcde178f9f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Jan 2026 14:29:26 +0000 Subject: [PATCH 101/280] Update dependencies from https://github.com/dotnet/source-build-externals build 20260105.1 On relative base path root Microsoft.SourceBuild.Intermediate.source-build-externals From Version 9.0.0-alpha.1.25157.1 -> To Version 9.0.0-alpha.1.26055.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..051401ba0fa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 + 16c380d1ce5fa0b24e232251c31cb013bbf3365f From 4c2926f0573c567090abcd833c88c6992be9ad90 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 09:27:50 -0600 Subject: [PATCH 102/280] [release/9.0.1xx] Update dependencies from dotnet/source-build-externals (#52345) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c0c7792fb82..051401ba0fa7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -445,9 +445,9 @@ - + https://github.com/dotnet/source-build-externals - 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 + 16c380d1ce5fa0b24e232251c31cb013bbf3365f From b3ca0271dbd80b98d5ffbcc98baa01c05d4a12e6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Jan 2026 15:28:52 +0000 Subject: [PATCH 103/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 248 ++++++++----------- eng/Versions.props | 103 ++++---- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 19 +- global.json | 4 +- 7 files changed, 182 insertions(+), 206 deletions(-) diff --git a/NuGet.config b/NuGet.config index e31e3b13ad69..33d0c75f8bf0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 051401ba0fa7..ff9aeea4001a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 16865ea61910500f1022ad2b96c499e5df02c228 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,9 +411,9 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 @@ -589,34 +555,34 @@ - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 diff --git a/eng/Versions.props b/eng/Versions.props index e30c271601a6..ec008f15e271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 13 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.25173.3 - 3.11.0-beta1.25173.3 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ 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.12.53 - 17.12.53-preview-25570-13 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26056.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25608.8 - 9.0.0-preview.25608.8 - 9.0.0-preview.25608.8 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -270,10 +272,10 @@ - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9b3ad8840fdb..a06513a59407 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 46380d959f85..1f746c2d5d20 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 6285b45267dabe20170eb12a527a61ad6eccec02 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 02:03:44 +0000 Subject: [PATCH 104/280] Update dependencies from https://github.com/dotnet/arcade build 20251209.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25608.5 -> To Version 9.0.0-beta.25609.4 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 051401ba0fa7..4153477671fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 - + https://github.com/dotnet/arcade - 92e45d251889042fd956e18b28d489020298d864 + 5dba308d00fabb7f13bb730bff7112b7ab5068c3 diff --git a/eng/Versions.props b/eng/Versions.props index 5deac64e28a9..2bd702f769ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 - 9.0.0-beta.25608.5 + 9.0.0-beta.25609.4 + 9.0.0-beta.25609.4 + 9.0.0-beta.25609.4 + 9.0.0-beta.25609.4 diff --git a/global.json b/global.json index 46380d959f85..888ef4a31c6f 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25609.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25609.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 2422bddf2fa5390b736eecf046bdaf2bd34eb9cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Dec 2025 02:03:40 +0000 Subject: [PATCH 105/280] Update dependencies from https://github.com/dotnet/arcade build 20251211.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25608.5 -> To Version 9.0.0-beta.25611.4 --- eng/Version.Details.xml | 28 ++++++++++---------- eng/Versions.props | 8 +++--- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 19 ++++++++----- global.json | 4 +-- 6 files changed, 35 insertions(+), 28 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4153477671fe..1539f1994352 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 - + https://github.com/dotnet/arcade - 5dba308d00fabb7f13bb730bff7112b7ab5068c3 + e9983e548f5b9638784f3b2696eb6cb3e7366548 diff --git a/eng/Versions.props b/eng/Versions.props index 2bd702f769ca..c844fdc2a7ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25609.4 - 9.0.0-beta.25609.4 - 9.0.0-beta.25609.4 - 9.0.0-beta.25609.4 + 9.0.0-beta.25611.4 + 9.0.0-beta.25611.4 + 9.0.0-beta.25611.4 + 9.0.0-beta.25611.4 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9b3ad8840fdb..a06513a59407 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 888ef4a31c6f..368ff009c2d6 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25609.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25609.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25611.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25611.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 5c0edf36c9fbba3d7fe49270697325a1db7bc8aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Dec 2025 02:02:37 +0000 Subject: [PATCH 106/280] Update dependencies from https://github.com/dotnet/arcade build 20251226.6 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25608.5 -> To Version 9.0.0-beta.25626.6 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1539f1994352..69f3f9ce97f8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - e9983e548f5b9638784f3b2696eb6cb3e7366548 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 diff --git a/eng/Versions.props b/eng/Versions.props index c844fdc2a7ef..9f2d95d4f192 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25611.4 - 9.0.0-beta.25611.4 - 9.0.0-beta.25611.4 - 9.0.0-beta.25611.4 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 diff --git a/global.json b/global.json index 368ff009c2d6..1f746c2d5d20 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25611.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25611.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 0d00d330840ae3dfa2d4ff45a46f48815429edde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Jan 2026 21:01:31 +0000 Subject: [PATCH 107/280] Update dependencies from https://github.com/dotnet/roslyn-analyzers build 20260108.1 On relative base path root Microsoft.SourceBuild.Intermediate.roslyn-analyzers , Microsoft.CodeAnalysis.PublicApiAnalyzers From Version 3.11.0-beta1.26055.1 -> To Version 3.11.0-beta1.26058.1 Microsoft.CodeAnalysis.NetAnalyzers From Version 8.0.0-preview.26055.1 -> To Version 8.0.0-preview.26058.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5feee8435817..94e58efffbea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -327,17 +327,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - ca32bf554d5e9a08860f92245439cbe379cfc0f3 + 8fe06101545209b36f67bd86cbb40cfc71e55d4e - + https://github.com/dotnet/roslyn-analyzers - ca32bf554d5e9a08860f92245439cbe379cfc0f3 + 8fe06101545209b36f67bd86cbb40cfc71e55d4e - + https://github.com/dotnet/roslyn-analyzers - ca32bf554d5e9a08860f92245439cbe379cfc0f3 + 8fe06101545209b36f67bd86cbb40cfc71e55d4e diff --git a/eng/Versions.props b/eng/Versions.props index 0045a71c5ed3..1b62ad7f049c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -118,8 +118,8 @@ - 8.0.0-preview.26055.1 - 3.11.0-beta1.26055.1 + 8.0.0-preview.26058.1 + 3.11.0-beta1.26058.1 From 0e6f777f8d1cac7071997d4346942c3ec91d0acc Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 8 Jan 2026 17:02:16 -0800 Subject: [PATCH 108/280] Fix bad merge --- src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs b/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs index 82a98f402492..04f59da98594 100644 --- a/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs +++ b/src/Cli/dotnet/Commands/Package/Search/PackageSearchCommand.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.CommandLine; using Microsoft.DotNet.Cli.Commands.NuGet; using Microsoft.DotNet.Cli.CommandLine; using Microsoft.DotNet.Cli.Extensions; From a885bf37e84495fceecd4b337d22582cffa4e9d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 02:33:10 +0000 Subject: [PATCH 109/280] Reset files to release/8.0.4xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 13 ++- eng/Version.Details.xml | 212 ++++++++++++++++++++-------------------- eng/Versions.props | 95 +++++++++--------- 3 files changed, 162 insertions(+), 158 deletions(-) diff --git a/NuGet.config b/NuGet.config index 59e28da89c25..174708bd4a6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -1,3 +1,4 @@ + @@ -5,22 +6,23 @@ - + - - + + + @@ -45,14 +47,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94e58efffbea..f603201b3db4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - c60b810b74b2e1dad8159cd33363483c07195f41 + 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 - + https://github.com/dotnet/templating - c60b810b74b2e1dad8159cd33363483c07195f41 + 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 - + https://github.com/dotnet/templating - c60b810b74b2e1dad8159cd33363483c07195f41 + 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 @@ -55,61 +55,61 @@ https://github.com/dotnet/emsdk 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 - - https://github.com/dotnet/msbuild - 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - - https://github.com/dotnet/msbuild - 7806cbf7b0fd91ea6ab55c2e42d8ed973114e197 + + https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted + 02bf66295b64ab368d12933041f7281aad186a2d - + https://github.com/dotnet/fsharp - fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/fsharp - fc5e9eda234e2b69aa479f4f83faddc31fdd4da7 + e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 - + https://github.com/dotnet/format - a8be5ff9c558f921f565c461dd7688905f84742a + b7d483d5a0ce4e96a3468514f3f4a98f3c371434 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 - + https://github.com/dotnet/roslyn - 38896ab4e7cee896fcde8a4e26914a777c794e3b + 3fb752d448006a3144a60ccf181d745e555422f9 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -119,86 +119,86 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore ee417479933278bb5aadc5944706a96b5ef74a5d - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 550277e0616e549446f03fda35d3e23dff75dc01 + + https://github.com/nuget/nuget.client + 5469bd0d9de8108f15f21644759773b85471366c - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + 7855c9b221686104532ebf3380f2d45b3613b369 - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + 7855c9b221686104532ebf3380f2d45b3613b369 - + https://github.com/microsoft/vstest - aa59400b11e1aeee2e8af48928dbd48748a8bef9 + 7855c9b221686104532ebf3380f2d45b3613b369 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -293,18 +293,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore ee417479933278bb5aadc5944706a96b5ef74a5d - + https://github.com/dotnet/razor - a36694712be3000f238f25e52f11e6225dda5f9b + c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://github.com/dotnet/razor - a36694712be3000f238f25e52f11e6225dda5f9b + c937db618f8c8739c6fa66ab4ca541344a468fdc - + https://github.com/dotnet/razor - a36694712be3000f238f25e52f11e6225dda5f9b + c937db618f8c8739c6fa66ab4ca541344a468fdc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -327,17 +327,17 @@ 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b - + https://github.com/dotnet/roslyn-analyzers - 8fe06101545209b36f67bd86cbb40cfc71e55d4e + abef8ced132657943b7150f01a308e2199a17d5d - + https://github.com/dotnet/roslyn-analyzers - 8fe06101545209b36f67bd86cbb40cfc71e55d4e + abef8ced132657943b7150f01a308e2199a17d5d - + https://github.com/dotnet/roslyn-analyzers - 8fe06101545209b36f67bd86cbb40cfc71e55d4e + abef8ced132657943b7150f01a308e2199a17d5d @@ -469,9 +469,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1b62ad7f049c..989ef0c9f0d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,12 +11,13 @@ - 8.0.124 + 8.0.418 + 8.0.400 true release - rtm + preview rtm servicing @@ -30,10 +31,11 @@ 2.0.1-servicing-26011-01 2.0.3 13.0.3 + 4.8.6 1.2.0-beta.435 - 7.0.0 + 8.0.0 4.0.0 - 7.0.0 + 8.0.1 8.0.0-beta.25611.2 7.0.0-preview.22423.2 8.0.0 @@ -57,6 +59,7 @@ 8.0.22 8.0.22-servicing.25527.7 8.0.0 + $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.1 8.0.3 8.0.1 @@ -72,7 +75,7 @@ 8.0.0 8.0.2 8.0.1 - 8.0.0 + 8.0.7 8.0.1 8.0.2 8.0.0 @@ -85,26 +88,26 @@ - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 - 6.8.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 + 6.11.1-rc.2 $(NuGetPackagingPackageVersion) $(NuGetProjectModelPackageVersion) - 17.8.0-release-23615-02 - 17.8.0-release-23615-02 - 17.8.0-release-23615-02 + 17.11.1-release-24455-02 + 17.11.1-release-24455-02 + 17.11.1-release-24455-02 @@ -114,58 +117,56 @@ - 8.1.657407 + 8.3.657409 - 8.0.0-preview.26058.1 - 3.11.0-beta1.26058.1 + 8.0.0-preview.23614.1 + 3.11.0-beta1.23614.1 - 17.8.49 + 17.11.48 $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) - 17.8.49-servicing-25616-08 - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildPackageVersion) + This avoids the need to juggle references to packages that have been updated in newer MSBuild. --> + 17.8.43 + $(MicrosoftBuildMinimumVersion) + $(MicrosoftBuildMinimumVersion) + 17.11.48-servicing-25466-05 + $(MicrosoftBuildMinimumVersion) + $(MicrosoftBuildMinimumVersion) $(MicrosoftBuildTasksCorePackageVersion) + $(MicrosoftBuildMinimumVersion) - 8.0.124 + 8.0.418 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.124-servicing.26056.5 + 8.0.418-servicing.26055.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.8.102-beta.24081.2 + 12.8.403-beta.24526.2 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 - 4.8.0-7.25569.25 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 + 4.11.0-3.25569.22 $(MicrosoftNetCompilersToolsetPackageVersion) @@ -180,9 +181,9 @@ - 7.0.0-preview.25628.11 - 7.0.0-preview.25628.11 - 7.0.0-preview.25628.11 + 9.0.0-preview.24577.3 + 9.0.0-preview.24577.3 + 9.0.0-preview.24577.3 From 5f1046d7bf059a123b4858aea21a035f46624811 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 05:54:12 +0000 Subject: [PATCH 110/280] Reset files to release/9.0.1xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 38 +- eng/Version.Details.xml | 669 +++++++++++------- eng/Versions.props | 375 ++++++---- eng/common/SetupNugetSources.ps1 | 54 +- eng/common/SetupNugetSources.sh | 62 +- eng/common/build.cmd | 3 + eng/common/build.ps1 | 3 + eng/common/build.sh | 15 +- eng/common/core-templates/job/job.yml | 253 +++++++ eng/common/core-templates/job/onelocbuild.yml | 121 ++++ .../job/publish-build-assets.yml | 172 +++++ .../core-templates/job/source-build.yml | 99 +++ .../job/source-index-stage1.yml | 81 +++ .../core-templates/jobs/codeql-build.yml | 33 + eng/common/core-templates/jobs/jobs.yml | 123 ++++ .../core-templates/jobs/source-build.yml | 63 ++ .../post-build/common-variables.yml | 22 + .../core-templates/post-build/post-build.yml | 327 +++++++++ .../post-build/setup-maestro-vars.yml | 74 ++ .../steps/component-governance.yml | 16 + .../steps/enable-internal-runtimes.yml | 32 + .../steps/enable-internal-sources.yml | 47 ++ .../core-templates/steps/generate-sbom.yml | 54 ++ .../steps/get-delegation-sas.yml | 55 ++ .../steps/get-federated-access-token.yml | 42 ++ .../steps/publish-build-artifacts.yml | 20 + .../core-templates/steps/publish-logs.yml | 58 ++ .../steps/publish-pipeline-artifacts.yml | 20 + .../core-templates/steps/retain-build.yml | 28 + .../core-templates/steps/send-to-helix.yml | 93 +++ .../core-templates/steps/source-build.yml | 137 ++++ .../variables/pool-providers.yml | 8 + eng/common/cross/build-android-rootfs.sh | 8 +- eng/common/cross/build-rootfs.sh | 262 +++++-- eng/common/cross/riscv64/tizen/tizen.patch | 9 + eng/common/cross/tizen-build-rootfs.sh | 21 + eng/common/cross/tizen-fetch.sh | 19 +- eng/common/cross/toolchain.cmake | 25 +- eng/common/darc-init.ps1 | 2 +- eng/common/darc-init.sh | 2 +- eng/common/dotnet-install.sh | 5 +- eng/common/generate-sbom-prep.sh | 2 +- eng/common/helixpublish.proj | 1 + eng/common/internal/Directory.Build.props | 7 + eng/common/internal/NuGet.config | 3 + eng/common/internal/Tools.csproj | 14 +- eng/common/native/CommonLibrary.psm1 | 3 +- eng/common/native/init-compiler.sh | 117 +-- eng/common/native/init-distro-rid.sh | 76 +- eng/common/native/init-os-and-arch.sh | 7 +- .../post-build/check-channel-consistency.ps1 | 12 +- eng/common/post-build/nuget-validation.ps1 | 9 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/post-build/publish-using-darc.ps1 | 15 +- eng/common/post-build/redact-logs.ps1 | 89 +++ .../post-build/sourcelink-validation.ps1 | 10 +- eng/common/post-build/symbols-validation.ps1 | 2 - eng/common/sdl/NuGet.config | 4 +- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +- eng/common/sdl/init-sdl.ps1 | 8 + eng/common/sdl/packages.config | 2 +- eng/common/sdl/sdl.ps1 | 4 +- eng/common/sdl/trim-assets-version.ps1 | 2 +- eng/common/template-guidance.md | 133 ++++ eng/common/templates-official/job/job.yml | 340 ++------- .../templates-official/job/onelocbuild.yml | 115 +-- .../job/publish-build-assets.yml | 180 +---- .../templates-official/job/source-build.yml | 82 +-- .../job/source-index-stage1.yml | 86 +-- .../templates-official/jobs/codeql-build.yml | 32 +- eng/common/templates-official/jobs/jobs.yml | 104 +-- .../templates-official/jobs/source-build.yml | 62 +- .../post-build/common-variables.yml | 26 +- .../post-build/post-build.yml | 295 +------- .../post-build/setup-maestro-vars.yml | 74 +- .../steps/component-governance.yml | 18 +- .../steps/enable-internal-runtimes.yml | 31 +- .../steps/enable-internal-sources.yml | 7 + .../steps/generate-sbom.yml | 51 +- .../steps/get-delegation-sas.yml | 55 +- .../steps/get-federated-access-token.yml | 45 +- .../steps/publish-build-artifacts.yml | 41 ++ .../templates-official/steps/publish-logs.yml | 26 +- .../steps/publish-pipeline-artifacts.yml | 28 + .../templates-official/steps/retain-build.yml | 33 +- .../steps/send-to-helix.yml | 97 +-- .../templates-official/steps/source-build.yml | 138 +--- eng/common/templates/job/job.yml | 319 ++------- eng/common/templates/job/onelocbuild.yml | 112 +-- .../templates/job/publish-build-assets.yml | 176 +---- eng/common/templates/job/source-build.yml | 81 +-- .../templates/job/source-index-stage1.yml | 85 +-- eng/common/templates/jobs/codeql-build.yml | 32 +- eng/common/templates/jobs/jobs.yml | 104 +-- eng/common/templates/jobs/source-build.yml | 62 +- .../templates/post-build/common-variables.yml | 26 +- .../templates/post-build/post-build.yml | 291 +------- .../post-build/setup-maestro-vars.yml | 74 +- .../templates/steps/component-governance.yml | 18 +- .../steps/enable-internal-runtimes.yml | 30 +- .../steps/enable-internal-sources.yml | 7 + eng/common/templates/steps/generate-sbom.yml | 51 +- .../templates/steps/get-delegation-sas.yml | 55 +- .../steps/get-federated-access-token.yml | 45 +- .../steps/publish-build-artifacts.yml | 40 ++ eng/common/templates/steps/publish-logs.yml | 26 +- .../steps/publish-pipeline-artifacts.yml | 34 + eng/common/templates/steps/retain-build.yml | 33 +- eng/common/templates/steps/send-to-helix.yml | 97 +-- eng/common/templates/steps/source-build.yml | 138 +--- .../templates/variables/pool-providers.yml | 54 +- eng/common/tools.ps1 | 73 +- eng/common/tools.sh | 39 +- global.json | 13 +- 114 files changed, 3999 insertions(+), 4158 deletions(-) create mode 100644 eng/common/build.cmd create mode 100644 eng/common/core-templates/job/job.yml create mode 100644 eng/common/core-templates/job/onelocbuild.yml create mode 100644 eng/common/core-templates/job/publish-build-assets.yml create mode 100644 eng/common/core-templates/job/source-build.yml create mode 100644 eng/common/core-templates/job/source-index-stage1.yml create mode 100644 eng/common/core-templates/jobs/codeql-build.yml create mode 100644 eng/common/core-templates/jobs/jobs.yml create mode 100644 eng/common/core-templates/jobs/source-build.yml create mode 100644 eng/common/core-templates/post-build/common-variables.yml create mode 100644 eng/common/core-templates/post-build/post-build.yml create mode 100644 eng/common/core-templates/post-build/setup-maestro-vars.yml create mode 100644 eng/common/core-templates/steps/component-governance.yml create mode 100644 eng/common/core-templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/core-templates/steps/enable-internal-sources.yml create mode 100644 eng/common/core-templates/steps/generate-sbom.yml create mode 100644 eng/common/core-templates/steps/get-delegation-sas.yml create mode 100644 eng/common/core-templates/steps/get-federated-access-token.yml create mode 100644 eng/common/core-templates/steps/publish-build-artifacts.yml create mode 100644 eng/common/core-templates/steps/publish-logs.yml create mode 100644 eng/common/core-templates/steps/publish-pipeline-artifacts.yml create mode 100644 eng/common/core-templates/steps/retain-build.yml create mode 100644 eng/common/core-templates/steps/send-to-helix.yml create mode 100644 eng/common/core-templates/steps/source-build.yml create mode 100644 eng/common/core-templates/variables/pool-providers.yml create mode 100644 eng/common/cross/riscv64/tizen/tizen.patch create mode 100644 eng/common/post-build/redact-logs.ps1 create mode 100644 eng/common/template-guidance.md create mode 100644 eng/common/templates-official/steps/enable-internal-sources.yml create mode 100644 eng/common/templates-official/steps/publish-build-artifacts.yml create mode 100644 eng/common/templates-official/steps/publish-pipeline-artifacts.yml create mode 100644 eng/common/templates/steps/enable-internal-sources.yml create mode 100644 eng/common/templates/steps/publish-build-artifacts.yml create mode 100644 eng/common/templates/steps/publish-pipeline-artifacts.yml diff --git a/NuGet.config b/NuGet.config index 174708bd4a6e..e31e3b13ad69 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,26 +3,42 @@ + + + + + + + + + + + + + + + + + + + + - - - + - + - - @@ -30,6 +46,9 @@ + + + @@ -39,23 +58,18 @@ - - - - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f603201b3db4..b8f66894306d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,521 +1,664 @@ - + https://github.com/dotnet/templating - 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 + 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 - + https://github.com/dotnet/templating - 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 + 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 - + + https://github.com/dotnet/templating - 13c6760d66f74bfb5c8ce8343cf4c5d8f7471584 + 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be - + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + fa7cdded37981a97cec9a3e233c4a6af58a91c57 + + + + + + https://github.com/dotnet/core-setup + 7d57652f33493fa022125b7f63aad0d70c52d810 + + + https://github.com/dotnet/emsdk + b65413ac057eb0a54c51b76b1855bc377c2132c3 + + + https://github.com/dotnet/emsdk + b65413ac057eb0a54c51b76b1855bc377c2132c3 - + + https://github.com/dotnet/emsdk - 9e37ff5ebf5f464d80bdae6ad9d24e7a01ee11f8 + b65413ac057eb0a54c51b76b1855bc377c2132c3 + - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 02bf66295b64ab368d12933041f7281aad186a2d + + https://github.com/dotnet/msbuild + a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 02bf66295b64ab368d12933041f7281aad186a2d + + https://github.com/dotnet/msbuild + a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 02bf66295b64ab368d12933041f7281aad186a2d + + + https://github.com/dotnet/msbuild + a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 - + https://github.com/dotnet/fsharp - e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 + 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + + https://github.com/dotnet/fsharp - e11d7079bebc6f101c5313fe0d1de9e3d38a7c02 + 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - - https://github.com/dotnet/format - b7d483d5a0ce4e96a3468514f3f4a98f3c371434 - + + https://github.com/dotnet/roslyn + c795154af418b5473d67f053aec5d290a3e5c410 - + + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + + https://github.com/dotnet/roslyn + c795154af418b5473d67f053aec5d290a3e5c410 + + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + https://github.com/dotnet/roslyn - 3fb752d448006a3144a60ccf181d745e555422f9 + c795154af418b5473d67f053aec5d290a3e5c410 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/nuget/nuget.client - 5469bd0d9de8108f15f21644759773b85471366c + 42bfb4554167e1d2fc2b950728d9bd8164f806c1 - + https://github.com/microsoft/vstest - 7855c9b221686104532ebf3380f2d45b3613b369 - + bc9161306b23641b0364b8f93d546da4d48da1eb - + https://github.com/microsoft/vstest - 7855c9b221686104532ebf3380f2d45b3613b369 + bc9161306b23641b0364b8f93d546da4d48da1eb - + https://github.com/microsoft/vstest - 7855c9b221686104532ebf3380f2d45b3613b369 + bc9161306b23641b0364b8f93d546da4d48da1eb - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a2266c728f63a494ccb6786d794da2df135030be + + + https://github.com/microsoft/vstest + bc9161306b23641b0364b8f93d546da4d48da1eb + - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 + 6c65543c1f1eb7afc55533a107775e6e5004f023 + - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4519b9f0e25cae3c6d06cbd80cae9d6bd5fb90f7 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 925e025a1ad14f0b6f094e5b2d5cc9f62ada294c + 88a1aae37eae3f1a0fb51bc828a9b302df178b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d - + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + - + https://github.com/dotnet/razor - c937db618f8c8739c6fa66ab4ca541344a468fdc - + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor - c937db618f8c8739c6fa66ab4ca541344a468fdc + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + https://github.com/dotnet/razor - c937db618f8c8739c6fa66ab4ca541344a468fdc + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 - + + + https://github.com/dotnet/razor + 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc + + + https://github.com/dotnet/test-templates + 0385265f4d0b6413d64aea0223172366a9b9858c + + + https://github.com/dotnet/test-templates + 307b8f538d83a955d8f6dd909eee41a5555f2f4d + + + https://github.com/dotnet/test-templates + becc4bd157cd6608b51a5ffe414a5d2de6330272 + + + https://github.com/dotnet/test-templates + becc4bd157cd6608b51a5ffe414a5d2de6330272 + + + https://github.com/dotnet/test-templates + 49c9ad01f057b3c6352bbec12b117acc2224493c - + + https://github.com/dotnet/test-templates + 47c90e140b027225b799ca8413af10ee3d5f1126 + + + + https://github.com/dotnet/test-templates + 47c90e140b027225b799ca8413af10ee3d5f1126 + + + + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + 3bcdfce6d4b5e6825ae33f1e464b73264e36017f + + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 88a1aae37eae3f1a0fb51bc828a9b302df178b2a + + https://github.com/dotnet/xdt - 9a1c3e1b7f0c8763d4c96e593961a61a72679a7b + 63ae81154c50a1cf9287cc47d8351d55b4289e6d + + + + https://github.com/dotnet/xdt + 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - abef8ced132657943b7150f01a308e2199a17d5d + 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 - + https://github.com/dotnet/roslyn-analyzers - abef8ced132657943b7150f01a308e2199a17d5d + 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 - + + https://github.com/dotnet/roslyn-analyzers - abef8ced132657943b7150f01a308e2199a17d5d + 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 - + + https://github.com/dotnet/command-line-api + 803d8598f98fb4efd94604b32627ee9407f246db + + https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + 803d8598f98fb4efd94604b32627ee9407f246db - + + + + https://github.com/dotnet/symreader + 0710a7892d89999956e8808c28e9dd0512bd53f3 + + + https://github.com/dotnet/command-line-api - 02fe27cd6a9b001c8feb7938e6ef4b3799745759 + 803d8598f98fb4efd94604b32627ee9407f246db - + + https://github.com/dotnet/source-build-externals - 5f4a123a49dd5480065c8d6182536cf86b4f4410 + 16c380d1ce5fa0b24e232251c31cb013bbf3365f - + + https://github.com/dotnet/source-build-reference-packages - 44b5b62182b48c34c4b6aef28943ec3f3e82f214 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae - + https://github.com/dotnet/deployment-tools - 5255d40e228ea1d4b624781b5b97ec16484a3b4b + b2d5c0c5841de4bc036ef4c84b5db3532504e5f3 - + https://github.com/dotnet/sourcelink - 94eaac3385cafff41094454966e1af1d1cf60f00 - + 657ade4711e607cc4759e89e0943aa1ca8aadc63 - + https://github.com/dotnet/sourcelink - 94eaac3385cafff41094454966e1af1d1cf60f00 + 657ade4711e607cc4759e89e0943aa1ca8aadc63 - + https://github.com/dotnet/sourcelink - 94eaac3385cafff41094454966e1af1d1cf60f00 + 657ade4711e607cc4759e89e0943aa1ca8aadc63 - + https://github.com/dotnet/sourcelink - 94eaac3385cafff41094454966e1af1d1cf60f00 + 657ade4711e607cc4759e89e0943aa1ca8aadc63 - + https://github.com/dotnet/sourcelink - 94eaac3385cafff41094454966e1af1d1cf60f00 + 657ade4711e607cc4759e89e0943aa1ca8aadc63 - + https://github.com/dotnet/sourcelink - 94eaac3385cafff41094454966e1af1d1cf60f00 + 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - + + + https://github.com/dotnet/sourcelink + 657ade4711e607cc4759e89e0943aa1ca8aadc63 + + + + https://github.com/dotnet/deployment-tools - 5255d40e228ea1d4b624781b5b97ec16484a3b4b + b2d5c0c5841de4bc036ef4c84b5db3532504e5f3 - + + https://github.com/dotnet/symreader - 27e584661980ee6d82c419a2a471ae505b7d122e + 0710a7892d89999956e8808c28e9dd0512bd53f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 50c4cb9fc31c47f03eac865d7bc518af173b74b7 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ef853a71052646a42abf17e888ec6d9a69614ad9 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - ee417479933278bb5aadc5944706a96b5ef74a5d + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 - - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 - + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + + https://github.com/dotnet/arcade + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + + + https://github.com/dotnet/arcade + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + + + + https://github.com/dotnet/arcade + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + - - https://github.com/dotnet/xliff-tasks - 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + fa7cdded37981a97cec9a3e233c4a6af58a91c57 + + + https://github.com/dotnet/arcade-services + e156e649f28395d9d0ee1e848225a689b59e0fd3 + + + https://github.com/dotnet/arcade-services + e156e649f28395d9d0ee1e848225a689b59e0fd3 + + + https://github.com/dotnet/scenario-tests + 0898abbb5899ef400b8372913c2320295798a687 + + + + https://github.com/dotnet/scenario-tests + 0898abbb5899ef400b8372913c2320295798a687 + + + + + https://github.com/dotnet/aspire + 5fa9337a84a52e9bd185d04d156eccbdcf592f74 + + + + https://github.com/dotnet/aspire + 5fa9337a84a52e9bd185d04d156eccbdcf592f74 + https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 989ef0c9f0d1..2736a2089b0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,193 +1,267 @@ - - - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - true - true - - - - 8.0.418 - 8.0.400 + + 9 + 0 + 1 + 14 + + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)00 + $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) + $(VersionMajor).$(VersionMinor) + $(MajorMinorVersion).$(VersionSDKMinor) true release - preview + rtm rtm servicing + + true 6.0.1 - - + + 30 + 32 + 17 + 36 + 20 + $([MSBuild]::Add($(VersionFeature), 10)) + + <_NET70ILLinkPackVersion>7.0.100-1.23211.1 + + + + https://ci.dot.net/public/ + https://dotnetclimsrc.blob.core.windows.net/dotnet/ + + + 10.0.0-preview.24609.2 1.0.0-20230414.1 - 2.21.0 + 2.22.0 2.0.1-servicing-26011-01 2.0.3 13.0.3 4.8.6 1.2.0-beta.435 - 8.0.0 - 4.0.0 - 8.0.1 - 8.0.0-beta.25611.2 - 7.0.0-preview.22423.2 - 8.0.0 - 4.3.0 - 4.3.0 4.0.5 - 8.0.1 - 4.6.0 - 2.0.0-beta4.23307.1 - 2.0.0-rtm.1.25064.1 + 2.0.0-beta4.24324.3 + 0.4.0-alpha.24324.3 + 2.0.0-rtm.1.25059.4 + 2.2.0-beta.24327.2 + 1.1.2-beta1.22216.1 + 10.3.0 3.2.2146 0.3.49-beta + + + 1.8.1 + + + 0.2.0 + - - 8.0.22 - 8.0.22-servicing.25527.7 - 8.0.22 - $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 8.0.2 - 8.0.22 - 8.0.22-servicing.25527.7 - 8.0.0 - $(MicrosoftExtensionsDependencyModelPackageVersion) - 8.0.1 - 8.0.3 - 8.0.1 - 8.0.22 - 8.0.0 - 8.0.0 - 8.0.22 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.2 - 8.0.1 - 8.0.7 - 8.0.1 - 8.0.2 - 8.0.0 - 8.0.1 - 8.0.6 - - 8.0.5 - 8.0.0 - 8.0.2 + + 1.1.0-beta.25317.4 - - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - 6.11.1-rc.2 - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) + + 9.0.11-servicing.25519.1 - - 17.11.1-release-24455-02 - 17.11.1-release-24455-02 - 17.11.1-release-24455-02 + + + 1.1.0-rtm.25262.1 - 8.0.0 - 8.0.0 - 8.0.0 + 9.0.11 + 9.0.11-servicing.25517.16 + 9.0.11 + 9.0.11 + 9.0.11-servicing.25517.16 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 8.0.0-rc.1.23414.4 + 9.0.11-servicing.25517.16 + 9.0.11-servicing.25517.16 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 2.1.0 + 9.0.11 + 8.0.0 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 8.0.0 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + + 8.0.5 + 9.0.11 + 9.0.11 - - 8.3.657409 + + 9.0.11-servicing.25520.1 + 9.0.11-servicing.25520.1 + 9.0.11 + 9.0.11 + + + + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4-rc.9 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + 6.12.4 + + + + 17.12.0-release-24508-01 + 17.12.0-release-24508-01 + 17.12.0-release-24508-01 - 8.0.0-preview.23614.1 - 3.11.0-beta1.23614.1 + 9.0.0-preview.26057.1 + 3.11.0-beta1.26057.1 - 17.11.48 - $(MicrosoftBuildPackageVersion) - - 17.8.43 - $(MicrosoftBuildMinimumVersion) - $(MicrosoftBuildMinimumVersion) - 17.11.48-servicing-25466-05 - $(MicrosoftBuildMinimumVersion) - $(MicrosoftBuildMinimumVersion) - $(MicrosoftBuildTasksCorePackageVersion) - $(MicrosoftBuildMinimumVersion) + 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.12.53 + 17.12.53-preview-25570-13 + 17.11.48 + 17.12 - 8.0.418 + 9.0.113 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.418-servicing.26055.10 + 9.0.113-servicing.25602.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.8.403-beta.24526.2 + 12.9.101-beta.25070.7 - 4.11.0-3.25569.22 - 4.11.0-3.25569.22 - 4.11.0-3.25569.22 - 4.11.0-3.25569.22 - 4.11.0-3.25569.22 - 4.11.0-3.25569.22 - 4.11.0-3.25569.22 - $(MicrosoftNetCompilersToolsetPackageVersion) + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 + 4.12.0-3.25571.3 - 8.0.22 - 8.0.22-servicing.25528.8 - 8.0.22-servicing.25528.8 - 8.0.22-servicing.25528.8 - 8.0.22-servicing.25528.8 - 8.0.22-servicing.25528.8 - 8.0.22 + 9.0.11 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11 + 9.0.11 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 - - 9.0.0-preview.24577.3 - 9.0.0-preview.24577.3 - 9.0.0-preview.24577.3 + + 9.0.0-preview.25608.8 + 9.0.0-preview.25608.8 + 9.0.0-preview.25608.8 - 8.0.22-servicing.25528.2 + 9.0.11-rtm.25520.2 + 9.0.11-rtm.25520.2 + + + + $(MicrosoftNETCoreAppHostwinx64PackageVersion) + $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) + $(MicrosoftAspNetCoreAppRuntimewinx64PackageVersion) + $(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion) + + + $(MicrosoftNETCoreAppRuntimePackageVersion) + $(MicrosoftNETCoreAppRuntimePackageVersion) + + + + $(MicrosoftAspNetCoreAppRuntimePackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + $(NUnit3DotNetNewTemplatePackageVersion) + + + 2.2.0-beta.19072.10 + 2.0.0 + 9.0.0-preview.25381.1 @@ -195,17 +269,20 @@ 4.0.1 - - 1.0.0-beta.23475.1 + + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 - 8.0.0-beta.23615.1 - 8.0.0-beta.23615.1 - 8.0.0-beta.23615.1 - 8.0.0-beta.23615.1 - 8.0.0-beta.23615.1 - 8.0.0-beta.23615.1 + 9.0.0-beta.25564.5 + 9.0.0-beta.25564.5 + 9.0.0-beta.25564.5 + 9.0.0-beta.25564.5 + 9.0.0-beta.25564.5 + 9.0.0-beta.25564.5 @@ -215,8 +292,8 @@ 6.12.0 6.1.0 - 8.0.0-beta.25611.2 4.18.4 + 3.4.3 1.3.2 8.0.0-beta.23607.1 @@ -229,15 +306,35 @@ <_DotNetHiveRoot Condition="!HasTrailingSlash('$(_DotNetHiveRoot)')">$(_DotNetHiveRoot)/ $(_DotNetHiveRoot)dotnet$(ExeExtension) - + + 8.0.100 + 8.2.2 + 9.0.100 + 9.0.0 + 35.0.7 + 18.0.9617 + 18.0.9617 + 15.0.9617 + 18.0.9617 - 8.0.22 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) + 9.0.11-servicing.25516.4 + 9.0.11 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) $(MicrosoftNETCoreAppRefPackageVersion) - 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) + 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(MonoWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) + + + + 15.7.179 + 15.7.179 + + + + 2.0.1-servicing-26011-01 + diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 59b2d55e1a33..792b60b49d42 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,17 +1,10 @@ -# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. -# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# 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. # -# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry -# under for each Maestro managed private feed. Two additional credential -# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # -# This script needs to be called in every job that will restore packages and which the base repo has -# private AzDO feeds in the NuGet.config. -# -# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` -# from the AzureDevOps-Artifact-Feeds-Pats variable group. -# -# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing +# See example call for this script below. # # - task: PowerShell@2 # displayName: Setup Private Feeds Credentials @@ -21,11 +14,18 @@ # arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) +# +# Note that the NuGetAuthenticate task should be called after SetupNugetSources. +# This ensures that: +# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) +# - The credential provider is installed. +# +# This logic is also abstracted into enable-internal-sources.yml. [CmdletBinding()] param ( [Parameter(Mandatory = $true)][string]$ConfigFile, - [Parameter(Mandatory = $true)][string]$Password + $Password ) $ErrorActionPreference = "Stop" @@ -48,11 +48,17 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source function AddCredential($creds, $source, $username, $pwd) { + # If no cred supplied, don't do anything. + if (!$pwd) { + return; + } + # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -110,11 +116,6 @@ if (!(Test-Path $ConfigFile -PathType Leaf)) { ExitWithExitCode 1 } -if (!$Password) { - Write-PipelineTelemetryError -Category 'Build' -Message 'Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Please supply a valid PAT' - ExitWithExitCode 1 -} - # Load NuGet.config $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName @@ -127,11 +128,14 @@ if ($sources -eq $null) { $doc.DocumentElement.AppendChild($sources) | Out-Null } -# Looks for a node. Create it if none is found. -$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") -if ($creds -eq $null) { - $creds = $doc.CreateElement("packageSourceCredentials") - $doc.DocumentElement.AppendChild($creds) | Out-Null +$creds = $null +if ($Password) { + # Looks for a node. Create it if none is found. + $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") + if ($creds -eq $null) { + $creds = $doc.CreateElement("packageSourceCredentials") + $doc.DocumentElement.AppendChild($creds) | Out-Null + } } # Check for disabledPackageSources; we'll enable any darc-int ones we find there @@ -153,7 +157,7 @@ if ($dotnet31Source -ne $null) { 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') +$dotnetVersions = @('5','6','7','8','9') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; @@ -164,4 +168,4 @@ foreach ($dotnetVersion in $dotnetVersions) { } } -$doc.Save($filename) \ No newline at end of file +$doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index c0e7bbef21c4..facb415ca6ff 100644 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,28 +1,27 @@ #!/usr/bin/env bash -# This file is a temporary workaround for internal builds to be able to restore from private AzDO feeds. -# This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080 +# 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. +# +# Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # -# What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry -# under for each Maestro's managed private feed. Two additional credential -# entries are also added for the two private static internal feeds: dotnet3-internal and dotnet3-internal-transport. -# -# This script needs to be called in every job that will restore packages and which the base repo has -# private AzDO feeds in the NuGet.config. -# -# See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)` -# from the AzureDevOps-Artifact-Feeds-Pats variable group. -# -# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing. +# See example call for this script below. # # - task: Bash@3 -# displayName: Setup Private Feeds Credentials +# displayName: Setup Internal Feeds # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(System.DefaultWorkingDirectory)/NuGet.config $Token +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') -# env: -# Token: $(dn-bot-dnceng-artifact-feeds-rw) +# - task: NuGetAuthenticate@1 +# +# Note that the NuGetAuthenticate task should be called after SetupNugetSources. +# This ensures that: +# - Appropriate creds are set for the added internal feeds (if not supplied to the scrupt) +# - The credential provider is installed. +# +# This logic is also abstracted into enable-internal-sources.yml. ConfigFile=$1 CredToken=$2 @@ -48,11 +47,6 @@ if [ ! -f "$ConfigFile" ]; then ExitWithExitCode 1 fi -if [ -z "$CredToken" ]; then - Write-PipelineTelemetryError -category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. Please supply a valid PAT" - ExitWithExitCode 1 -fi - if [[ `uname -s` == "Darwin" ]]; then NL=$'\\\n' TB='' @@ -105,7 +99,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8') +DotNetVersions=('5' '6' '7' '8' '9') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; @@ -140,18 +134,20 @@ PackageSources+="$IFS" PackageSources+=$(grep -oh '"darc-int-[^"]*"' $ConfigFile | tr -d '"') IFS=$PrevIFS -for FeedName in ${PackageSources[@]} ; do - # Check if there is no existing credential for this FeedName - grep -i "<$FeedName>" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." +if [ "$CredToken" ]; then + for FeedName in ${PackageSources[@]} ; do + # Check if there is no existing credential for this FeedName + grep -i "<$FeedName>" $ConfigFile + if [ "$?" != "0" ]; then + echo "Adding credentials for $FeedName." - PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + PackageSourceCredentialsNodeFooter="" + NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" - sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile - fi -done + 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 diff --git a/eng/common/build.cmd b/eng/common/build.cmd new file mode 100644 index 000000000000..99daf368abae --- /dev/null +++ b/eng/common/build.cmd @@ -0,0 +1,3 @@ +@echo off +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 33a6f2d0e248..438f9920c43e 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -19,6 +19,7 @@ Param( [switch] $pack, [switch] $publish, [switch] $clean, + [switch][Alias('pb')]$productBuild, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -58,6 +59,7 @@ function Print-Usage() { Write-Host " -sign Sign build outputs" Write-Host " -publish Publish artifacts (e.g. symbols)" Write-Host " -clean Clean the solution" + Write-Host " -productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)" Write-Host "" Write-Host "Advanced settings:" @@ -120,6 +122,7 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` + /p:DotNetBuildRepo=$productBuild ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` diff --git a/eng/common/build.sh b/eng/common/build.sh index 50af40cdd2ce..ac1ee8620cd2 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -22,6 +22,9 @@ usage() echo " --sourceBuild Source-build the solution (short: -sb)" echo " Will additionally trigger the following actions: --restore, --build, --pack" echo " If --configuration is not set explicitly, will also set it to 'Release'" + echo " --productBuild Build the solution in the way it will be built in the full .NET product (VMR) build (short: -pb)" + echo " Will additionally trigger the following actions: --restore, --build, --pack" + echo " If --configuration is not set explicitly, will also set it to 'Release'" echo " --rebuild Rebuild solution" echo " --test Run all unit tests in the solution (short: -t)" echo " --integrationTest Run all integration tests in the solution" @@ -59,6 +62,7 @@ scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" restore=false build=false source_build=false +product_build=false rebuild=false test=false integration_test=false @@ -105,7 +109,7 @@ while [[ $# > 0 ]]; do -binarylog|-bl) binary_log=true ;; - -excludeCIBinarylog|-nobl) + -excludecibinarylog|-nobl) exclude_ci_binary_log=true ;; -pipelineslog|-pl) @@ -126,6 +130,13 @@ while [[ $# > 0 ]]; do -sourcebuild|-sb) build=true source_build=true + product_build=true + restore=true + pack=true + ;; + -productBuild|-pb) + build=true + product_build=true restore=true pack=true ;; @@ -219,7 +230,9 @@ function Build { /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ + /p:DotNetBuildRepo=$product_build \ /p:ArcadeBuildFromSource=$source_build \ + /p:DotNetBuildSourceOnly=$source_build \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml new file mode 100644 index 000000000000..8da43d3b5837 --- /dev/null +++ b/eng/common/core-templates/job/job.yml @@ -0,0 +1,253 @@ +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + templateContext: {} + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + # publishing defaults + artifacts: '' + enableMicrobuild: false + microbuildUseESRP: true + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + enableBuildRetry: false + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + componentGovernanceSteps: [] + preSteps: [] + artifactPublishSteps: [] + runAsPublic: false + +# 1es specific parameters + is1ESPipeline: '' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: + - task: NuGetAuthenticate@1 + + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} + richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin + uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} + continueOnError: true + + - ${{ each step in parameters.componentGovernanceSteps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + # Publish test results + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + # gather artifacts + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: CopyFiles@2 + displayName: Gather logs for publish to artifacts + inputs: + SourceFolder: 'artifacts/log' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log' + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - task: CopyFiles@2 + displayName: Gather logs for publish to artifacts + inputs: + SourceFolder: 'artifacts/log/$(_BuildConfig)' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + continueOnError: true + condition: always() + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - task: CopyFiles@2 + displayName: Gather buildconfiguration for build retry + inputs: + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' + continueOnError: true + condition: always() + - ${{ each step in parameters.artifactPublishSteps }}: + - ${{ step }} diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml new file mode 100644 index 000000000000..edefa789d360 --- /dev/null +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -0,0 +1,121 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex + GithubPat: $(BotAccount-dotnet-bot-repo-PAT) + + SourcesDirectory: $(System.DefaultWorkingDirectory) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + is1ESPipeline: '' +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish Localization Files + pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' + publishLocation: Container + artifactName: Loc + condition: ${{ parameters.condition }} + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish LocProject.json + pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' + publishLocation: Container + artifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml new file mode 100644 index 000000000000..6b5ff28cc706 --- /dev/null +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -0,0 +1,172 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + + is1ESPipeline: '' + + repositoryAlias: self + + officialBuildId: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + # unconditional - needed for logs publishing (redactor tool version) + - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 + os: windows + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - checkout: ${{ parameters.repositoryAlias }} + fetchDepth: 3 + clean: true + + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: AzureCLI@2 + displayName: Publish Build Assets + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:MaestroApiEndpoint=https://maestro.dot.net + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(OfficialBuildId) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if (Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs" + } + + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish ReleaseConfigs Artifact + pathToPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + publishLocation: Container + artifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > + -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(System.AccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml new file mode 100644 index 000000000000..1037ccedcb55 --- /dev/null +++ b/eng/common/core-templates/job/source-build.yml @@ -0,0 +1,99 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # buildArguments: '' + # Specifies additional build arguments to pass to the build script. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + + is1ESPipeline: '' + + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + # /eng/common/core-templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic + ${{ if eq(parameters.is1ESPipeline, 'true') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals build.ubuntu.2004.amd64 + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + image: 1es-azurelinux-3 + os: linux + ${{ else }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml new file mode 100644 index 000000000000..ddf8c2e00d80 --- /dev/null +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -0,0 +1,81 @@ +parameters: + runAsPublic: false + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') + dependsOn: '' + pool: '' + is1ESPipeline: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2022-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + + steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET 8 SDK + inputs: + packageType: sdk + version: 8.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + + - script: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: AzureCLI@2 + displayName: Log in to Azure and upload stage1 artifacts to source index + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml new file mode 100644 index 000000000000..4571a7864df6 --- /dev/null +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -0,0 +1,33 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + is1ESPipeline: '' + +jobs: +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml new file mode 100644 index 000000000000..bf33cdc2cc77 --- /dev/null +++ b/eng/common/core-templates/jobs/jobs.yml @@ -0,0 +1,123 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/core-templates/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + + artifacts: {} + is1ESPipeline: '' + repositoryAlias: self + officialBuildId: '' + +# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, +# and some (Microbuild) should only be applied to non-PR cases for internal builds. + +jobs: +- ${{ each job in parameters.jobs }}: + - ${{ if eq(parameters.is1ESPipeline, 'true') }}: + - template: /eng/common/templates-official/job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + + - ${{ else }}: + - template: /eng/common/templates/job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml new file mode 100644 index 000000000000..0b408a67bd51 --- /dev/null +++ b/eng/common/core-templates/jobs/source-build.yml @@ -0,0 +1,63 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/core-templates/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + + is1ESPipeline: '' + + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + enableInternalSources: ${{ parameters.enableInternalSources }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/post-build/common-variables.yml b/eng/common/core-templates/post-build/common-variables.yml new file mode 100644 index 000000000000..d5627a994ae5 --- /dev/null +++ b/eng/common/core-templates/post-build/common-variables.yml @@ -0,0 +1,22 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro.dot.net" + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + - name: BinlogToolVersion + value: 1.0.11 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml new file mode 100644 index 000000000000..221d1ac6de19 --- /dev/null +++ b/eng/common/core-templates/post-build/post-build.yml @@ -0,0 +1,327 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + + - name: is1ESPipeline + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobs: + - job: + displayName: NuGet Validation + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: windows.vs2022.amd64 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 + + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + ${{ else }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 + os: windows + ${{ else }}: + name: NetCore1ESPool-Publishing-Internal + demands: ImageOverride -equals windows.vs2019.amd64 + steps: + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > + -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(System.AccessToken)' + -WaitPublishingFinish true + -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000000..a7abd58c4bb6 --- /dev/null +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -0,0 +1,74 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + is1ESPipeline: '' + +steps: + - ${{ if eq(parameters.is1ESPipeline, '') }}: + - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error + + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: AzureCLI@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json + + $BarId = ${{ parameters.BARBuildId }} + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/core-templates/steps/component-governance.yml b/eng/common/core-templates/steps/component-governance.yml new file mode 100644 index 000000000000..cf0649aa9565 --- /dev/null +++ b/eng/common/core-templates/steps/component-governance.yml @@ -0,0 +1,16 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + is1ESPipeline: false + displayName: 'Component Detection' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + displayName: ${{ parameters.displayName }} + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/steps/enable-internal-runtimes.yml b/eng/common/core-templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..6bdbf62ac500 --- /dev/null +++ b/eng/common/core-templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,32 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true +- name: is1ESPipeline + type: boolean + default: false + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl + is1ESPipeline: ${{ parameters.is1ESPipeline }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml new file mode 100644 index 000000000000..4085512b6909 --- /dev/null +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -0,0 +1,47 @@ +parameters: +# This is the Azure federated service connection that we log into to get an access token. +- name: nugetFederatedServiceConnection + type: string + default: 'dnceng-artifacts-feeds-read' +- name: is1ESPipeline + type: boolean + default: false +# Legacy parameters to allow for PAT usage +- name: legacyCredential + type: string + default: '' + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - ${{ if ne(parameters.legacyCredential, '') }}: + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token + env: + Token: ${{ parameters.legacyCredential }} + # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. + # If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that + # may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token. + - ${{ else }}: + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config + - ${{ else }}: + - template: /eng/common/templates/steps/get-federated-access-token.yml + parameters: + federatedServiceConnection: ${{ parameters.nugetFederatedServiceConnection }} + outputVariableName: 'dnceng-artifacts-feeds-read-access-token' + - task: PowerShell@2 + displayName: Setup Internal Feeds + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + # This is required in certain scenarios to install the ADO credential provider. + # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others + # (e.g. dotnet msbuild). + - task: NuGetAuthenticate@1 diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml new file mode 100644 index 000000000000..7f5b84c4cb82 --- /dev/null +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -0,0 +1,54 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + +parameters: + PackageVersion: 9.0.0 + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + is1ESPipeline: false + # disable publishArtifacts if some other step is publishing the artifacts (like job.yml). + publishArtifacts: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- ${{ if eq(parameters.publishArtifacts, 'true')}}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + targetPath: '${{ parameters.manifestDirPath }}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..9db5617ea7de --- /dev/null +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -0,0 +1,55 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' +- name: is1ESPipeline + type: boolean + default: false + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/core-templates/steps/get-federated-access-token.yml b/eng/common/core-templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..3a4d4410c482 --- /dev/null +++ b/eng/common/core-templates/steps/get-federated-access-token.yml @@ -0,0 +1,42 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: is1ESPipeline + type: boolean +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/core-templates/steps/publish-build-artifacts.yml b/eng/common/core-templates/steps/publish-build-artifacts.yml new file mode 100644 index 000000000000..f24ce346684e --- /dev/null +++ b/eng/common/core-templates/steps/publish-build-artifacts.yml @@ -0,0 +1,20 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false +- name: args + type: object + default: {} +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - template: /eng/common/templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ each parameter in parameters.args }}: + ${{ parameter.key }}: ${{ parameter.value }} +- ${{ else }}: + - template: /eng/common/templates-official/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ each parameter in parameters.args }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml new file mode 100644 index 000000000000..0623ac6e1123 --- /dev/null +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -0,0 +1,58 @@ +parameters: + StageLabel: '' + JobLabel: '' + CustomSensitiveDataList: '' + # A default - in case value from eng/common/core-templates/post-build/common-variables.yml is not passed + BinlogToolVersion: '1.0.11' + is1ESPipeline: false + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + inputs: + targetType: inline + script: | + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + continueOnError: true + condition: always() + +- task: PowerShell@2 + displayName: Redact Logs + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 + # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + # If the file exists - sensitive data for redaction will be sourced from it + # (single entry per line, lines starting with '# ' are considered comments and skipped) + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' + -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + '$(publishing-dnceng-devdiv-code-r-build-re)' + '$(MaestroAccessToken)' + '$(dn-bot-all-orgs-artifact-feeds-rw)' + '$(akams-client-id)' + '$(microsoft-symbol-server-pat)' + '$(symweb-symbol-server-pat)' + '$(dn-bot-all-orgs-build-rw-code-rw)' + ${{parameters.CustomSensitiveDataList}} + continueOnError: true + condition: always() + +- task: CopyFiles@2 + displayName: Gather post build logs + inputs: + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' + +- template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish Logs + pathToPublish: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' + publishLocation: Container + artifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/core-templates/steps/publish-pipeline-artifacts.yml b/eng/common/core-templates/steps/publish-pipeline-artifacts.yml new file mode 100644 index 000000000000..2efec04dc2c1 --- /dev/null +++ b/eng/common/core-templates/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,20 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: args + type: object + default: {} + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - template: /eng/common/templates/steps/publish-pipeline-artifacts.yml + parameters: + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} +- ${{ else }}: + - template: /eng/common/templates-official/steps/publish-pipeline-artifacts.yml + parameters: + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/core-templates/steps/retain-build.yml b/eng/common/core-templates/steps/retain-build.yml new file mode 100644 index 000000000000..83d97a26a01f --- /dev/null +++ b/eng/common/core-templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/core-templates/steps/send-to-helix.yml b/eng/common/core-templates/steps/send-to-helix.yml new file mode 100644 index 000000000000..68fa739c4ab2 --- /dev/null +++ b/eng/common/core-templates/steps/send-to-helix.yml @@ -0,0 +1,93 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixProjectPath: 'eng/common/helixpublish.proj' # optional -- path to the project file to build relative to BUILD_SOURCESDIRECTORY + HelixProjectArguments: '' # optional -- arguments passed to the build command + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/${{ parameters.HelixProjectPath }} /restore /p:TreatWarningsAsErrors=false ${{ parameters.HelixProjectArguments }} /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml new file mode 100644 index 000000000000..7846584d2a77 --- /dev/null +++ b/eng/common/core-templates/steps/source-build.yml @@ -0,0 +1,137 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/core-templates/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + + is1ESPipeline: false + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo. + internalRestoreArgs= + if ! git diff --quiet; then + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + ${{ parameters.platform.buildArguments }} \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + $baseOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true \ + /p:DotNetBuildSourceOnly=true \ + /p:DotNetBuildRepo=true \ + /p:AssetManifestFileName=$assetManifestFileName + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(System.DefaultWorkingDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/sb/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + displayName: Publish BuildLogs + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() + sbomEnabled: false # we don't need SBOM for logs + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + displayName: Component Detection (Exclude upstream cache) + is1ESPipeline: ${{ parameters.is1ESPipeline }} + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} + disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/core-templates/variables/pool-providers.yml b/eng/common/core-templates/variables/pool-providers.yml new file mode 100644 index 000000000000..41053d382a2e --- /dev/null +++ b/eng/common/core-templates/variables/pool-providers.yml @@ -0,0 +1,8 @@ +parameters: + is1ESPipeline: false + +variables: + - ${{ if eq(parameters.is1ESPipeline, 'true') }}: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ else }}: + - template: /eng/common/templates/variables/pool-providers.yml \ No newline at end of file diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index f163fb9dae96..7e9ba2b75ed3 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -5,15 +5,15 @@ __NDK_Version=r21 usage() { echo "Creates a toolchain and sysroot used for cross-compiling for Android." - echo. + echo echo "Usage: $0 [BuildArch] [ApiLevel]" - echo. + echo echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" - echo. + echo echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" echo "by setting the TOOLCHAIN_DIR environment variable" - echo. + echo echo "By default, the NDK will be downloaded into the cross/android-rootfs/android-ndk-$__NDK_Version directory. If you already have an NDK installation," echo "you can set the NDK_DIR environment variable to have this script use that installation of the NDK." echo "By default, this script will generate a file, android_platform, in the root of the ROOTFS_DIR directory that contains the RID for the supported and tested Android build: android.28-arm64. This file is to replace '/etc/os-release', which is not available for Android." diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 9caf9b021dbd..4b5e8d7166bd 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -8,7 +8,7 @@ usage() echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" - echo " for FreeBSD can be: freebsd12, freebsd13" + echo " for FreeBSD can be: freebsd13, freebsd14" echo " for illumos can be: illumos" echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" @@ -30,7 +30,8 @@ __IllumosArch=arm7 __HaikuArch=arm __QEMUArch=arm __UbuntuArch=armhf -__UbuntuRepo="http://ports.ubuntu.com/" +__UbuntuRepo= +__UbuntuSuites="updates security backports" __LLDB_Package="liblldb-3.9-dev" __SkipUnmount=0 @@ -71,9 +72,9 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="12.4-RELEASE" +__FreeBSDBase="13.3-RELEASE" __FreeBSDPkg="1.17.0" -__FreeBSDABI="12" +__FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" __FreeBSDPackages+=" libinotify" @@ -129,6 +130,7 @@ __AlpineKeys=' 616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ== ' __Keyring= +__KeyringFile="/usr/share/keyrings/ubuntu-archive-keyring.gpg" __SkipSigCheck=0 __UseMirror=0 @@ -142,7 +144,6 @@ while :; do case $lowerI in -\?|-h|--help) usage - exit 1 ;; arm) __BuildArch=arm @@ -163,6 +164,7 @@ while :; do __UbuntuArch=armel __UbuntuRepo="http://ftp.debian.org/debian/" __CodeName=jessie + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" ;; armv6) __BuildArch=armv6 @@ -170,10 +172,12 @@ while :; do __QEMUArch=arm __UbuntuRepo="http://raspbian.raspberrypi.org/raspbian/" __CodeName=buster + __KeyringFile="/usr/share/keyrings/raspbian-archive-keyring.gpg" __LLDB_Package="liblldb-6.0-dev" + __UbuntuSuites= - if [[ -e "/usr/share/keyrings/raspbian-archive-keyring.gpg" ]]; then - __Keyring="--keyring /usr/share/keyrings/raspbian-archive-keyring.gpg" + if [[ -e "$__KeyringFile" ]]; then + __Keyring="--keyring $__KeyringFile" fi ;; riscv64) @@ -182,13 +186,8 @@ while :; do __AlpinePackages="${__AlpinePackages// lldb-dev/}" __QEMUArch=riscv64 __UbuntuArch=riscv64 - __UbuntuRepo="http://deb.debian.org/debian-ports" __UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}" unset __LLDB_Package - - if [[ -e "/usr/share/keyrings/debian-ports-archive-keyring.gpg" ]]; then - __Keyring="--keyring /usr/share/keyrings/debian-ports-archive-keyring.gpg --include=debian-ports-archive-keyring" - fi ;; ppc64le) __BuildArch=ppc64le @@ -229,12 +228,19 @@ while :; do __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" ;; lldb*) - version="${lowerI/lldb/}" - parts=(${version//./ }) + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + majorVersion="${version%%.*}" + + [ -z "${version##*.*}" ] && minorVersion="${version#*.}" + if [ -z "$minorVersion" ]; then + minorVersion=0 + fi # for versions > 6.0, lldb has dropped the minor version - if [[ "${parts[0]}" -gt 6 ]]; then - version="${parts[0]}" + if [ "$majorVersion" -le 6 ]; then + version="$majorVersion.$minorVersion" + else + version="$majorVersion" fi __LLDB_Package="liblldb-${version}-dev" @@ -243,15 +249,19 @@ while :; do unset __LLDB_Package ;; llvm*) - version="${lowerI/llvm/}" - parts=(${version//./ }) - __LLVM_MajorVersion="${parts[0]}" - __LLVM_MinorVersion="${parts[1]}" - - # for versions > 6.0, llvm has dropped the minor version - if [[ -z "$__LLVM_MinorVersion" && "$__LLVM_MajorVersion" -le 6 ]]; then - __LLVM_MinorVersion=0; + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + __LLVM_MajorVersion="${version%%.*}" + + [ -z "${version##*.*}" ] && __LLVM_MinorVersion="${version#*.}" + if [ -z "$__LLVM_MinorVersion" ]; then + __LLVM_MinorVersion=0 + fi + + # for versions > 6.0, lldb has dropped the minor version + if [ "$__LLVM_MajorVersion" -gt 6 ]; then + __LLVM_MinorVersion= fi + ;; xenial) # Ubuntu 16.04 if [[ "$__CodeName" != "jessie" ]]; then @@ -278,8 +288,17 @@ while :; do __CodeName=jammy fi ;; + noble) # Ubuntu 24.04 + if [[ "$__CodeName" != "jessie" ]]; then + __CodeName=noble + fi + if [[ -n "$__LLDB_Package" ]]; then + __LLDB_Package="liblldb-18-dev" + fi + ;; jessie) # Debian 8 __CodeName=jessie + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -288,6 +307,7 @@ while :; do stretch) # Debian 9 __CodeName=stretch __LLDB_Package="liblldb-6.0-dev" + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -296,6 +316,7 @@ while :; do buster) # Debian 10 __CodeName=buster __LLDB_Package="liblldb-6.0-dev" + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -303,6 +324,15 @@ while :; do ;; bullseye) # Debian 11 __CodeName=bullseye + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi + ;; + bookworm) # Debian 12 + __CodeName=bookworm + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -310,6 +340,7 @@ while :; do ;; sid) # Debian sid __CodeName=sid + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then __UbuntuRepo="http://ftp.debian.org/debian/" @@ -323,25 +354,24 @@ while :; do alpine*) __CodeName=alpine __UbuntuRepo= - version="${lowerI/alpine/}" - if [[ "$version" == "edge" ]]; then + if [[ "$lowerI" == "alpineedge" ]]; then __AlpineVersion=edge else - parts=(${version//./ }) - __AlpineMajorVersion="${parts[0]}" - __AlpineMinoVersion="${parts[1]}" - __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion" + version="$(echo "$lowerI" | tr -d '[:alpha:]-=')" + __AlpineMajorVersion="${version%%.*}" + __AlpineMinorVersion="${version#*.}" + __AlpineVersion="$__AlpineMajorVersion.$__AlpineMinorVersion" fi ;; - freebsd12) + freebsd13) __CodeName=freebsd __SkipUnmount=1 ;; - freebsd13) + freebsd14) __CodeName=freebsd - __FreeBSDBase="13.2-RELEASE" - __FreeBSDABI="13" + __FreeBSDBase="14.0-RELEASE" + __FreeBSDABI="14" __SkipUnmount=1 ;; illumos) @@ -420,6 +450,10 @@ fi __UbuntuPackages+=" ${__LLDB_Package:-}" +if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ports.ubuntu.com/" +fi + if [[ -n "$__LLVM_MajorVersion" ]]; then __UbuntuPackages+=" libclang-common-${__LLVM_MajorVersion}${__LLVM_MinorVersion:+.$__LLVM_MinorVersion}-dev" fi @@ -442,13 +476,39 @@ fi mkdir -p "$__RootfsDir" __RootfsDir="$( cd "$__RootfsDir" && pwd )" +__hasWget= +ensureDownloadTool() +{ + if command -v wget &> /dev/null; then + __hasWget=1 + elif command -v curl &> /dev/null; then + __hasWget=0 + else + >&2 echo "ERROR: either wget or curl is required by this script." + exit 1 + fi +} + if [[ "$__CodeName" == "alpine" ]]; then __ApkToolsVersion=2.12.11 - __ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33 __ApkToolsDir="$(mktemp -d)" __ApkKeysDir="$(mktemp -d)" + arch="$(uname -m)" - wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir" + ensureDownloadTool + + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" + else + curl -SLO --create-dirs --output-dir "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" + fi + if [[ "$arch" == "x86_64" ]]; then + __ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33" + elif [[ "$arch" == "aarch64" ]]; then + __ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0" + else + echo "WARNING: add missing hash for your host architecture. To find the value, use: 'find /tmp -name apk.static -exec sha512sum {} \;'" + fi echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" @@ -477,20 +537,23 @@ if [[ "$__CodeName" == "alpine" ]]; then fi # initialize DB + # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" --initdb add if [[ "$__AlpineLlvmLibsLookup" == 1 ]]; then + # shellcheck disable=SC2086 __AlpinePackages+=" $("$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ - search 'llvm*-libs' | sort | tail -1 | sed 's/-[^-]*//2g')" + search 'llvm*-libs' | grep -E '^llvm' | sort | tail -1 | sed 's/-[^-]*//2g')" fi # install all packages in one go + # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ @@ -501,12 +564,23 @@ if [[ "$__CodeName" == "alpine" ]]; then elif [[ "$__CodeName" == "freebsd" ]]; then mkdir -p "$__RootfsDir"/usr/local/etc JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} - wget -O - "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + + ensureDownloadTool + + if [[ "$__hasWget" == 1 ]]; then + wget -O- "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + else + curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version + fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager - wget -O - "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + else + curl -SL "https://github.com/freebsd/pkg/archive/${__FreeBSDPkg}.tar.gz" | tar -C "$__RootfsDir"/tmp -zxf - + fi cd "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # needed for install to succeed mkdir -p "$__RootfsDir"/host/etc @@ -514,27 +588,43 @@ elif [[ "$__CodeName" == "freebsd" ]]; then rm -rf "$__RootfsDir/tmp/pkg-${__FreeBSDPkg}" # install packages we need. INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update + # shellcheck disable=SC2086 INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} + + ensureDownloadTool + echo "Downloading sysroot." - wget -O - https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + else + curl -SL https://github.com/illumos/sysroot/releases/download/20181213-de6af22ae73b-v1/illumos-sysroot-i386-20181213-de6af22ae73b-v1.tar.gz | tar -C "$__RootfsDir" -xzf - + fi echo "Building binutils. Please wait.." - wget -O - https://ftp.gnu.org/gnu/binutils/binutils-2.33.1.tar.bz2 | tar -xjf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf - + else + curl -SL https://ftp.gnu.org/gnu/binutils/binutils-2.42.tar.xz | tar -xJf - + fi mkdir build-binutils && cd build-binutils - ../binutils-2.33.1/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" + ../binutils-2.42/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" make -j "$JOBS" && make install && cd .. echo "Building gcc. Please wait.." - wget -O - https://ftp.gnu.org/gnu/gcc/gcc-8.4.0/gcc-8.4.0.tar.xz | tar -xJf - + if [[ "$__hasWget" == 1 ]]; then + wget -O- https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf - + else + curl -SL https://ftp.gnu.org/gnu/gcc/gcc-13.3.0/gcc-13.3.0.tar.xz | tar -xJf - + fi CFLAGS="-fPIC" CXXFLAGS="-fPIC" CXXFLAGS_FOR_TARGET="-fPIC" CFLAGS_FOR_TARGET="-fPIC" export CFLAGS CXXFLAGS CXXFLAGS_FOR_TARGET CFLAGS_FOR_TARGET mkdir build-gcc && cd build-gcc - ../gcc-8.4.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.10" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ + ../gcc-13.3.0/configure --prefix="$__RootfsDir" --target="${__illumosArch}-sun-solaris2.11" --program-prefix="${__illumosArch}-illumos-" --with-sysroot="$__RootfsDir" --with-gnu-as \ --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ --disable-libquadmath-support --disable-shared --enable-tls make -j "$JOBS" && make install && cd .. @@ -542,9 +632,13 @@ elif [[ "$__CodeName" == "illumos" ]]; then if [[ "$__UseMirror" == 1 ]]; then BaseUrl=https://pkgsrc.smartos.skylime.net fi - BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" + BaseUrl="$BaseUrl/packages/SmartOS/2019Q4/${__illumosArch}/All" echo "Downloading manifest" - wget "$BaseUrl" + if [[ "$__hasWget" == 1 ]]; then + wget "$BaseUrl" + else + curl -SLO "$BaseUrl" + fi echo "Downloading dependencies." read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do @@ -552,7 +646,11 @@ elif [[ "$__CodeName" == "illumos" ]]; then # find last occurrence of package in listing and extract its name package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)" echo "Resolved name '$package'" - wget "$BaseUrl"/"$package".tgz + if [[ "$__hasWget" == 1 ]]; then + wget "$BaseUrl"/"$package".tgz + else + curl -SLO "$BaseUrl"/"$package".tgz + fi ar -x "$package".tgz tar --skip-old-files -xzf "$package".tmp.tg* -C "$__RootfsDir" 2>/dev/null done @@ -561,10 +659,17 @@ elif [[ "$__CodeName" == "illumos" ]]; then rm -rf "$__RootfsDir"/{tmp,+*} mkdir -p "$__RootfsDir"/usr/include/net mkdir -p "$__RootfsDir"/usr/include/netpacket - wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h - wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h - wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h - wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + wget -P "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + wget -P "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + wget -P "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + else + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/bpf.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/net https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/io/bpf/net/dlt.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/netpacket https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/inet/sockmods/netpacket/packet.h + curl -SLO --create-dirs --output-dir "$__RootfsDir"/usr/include/sys https://raw.githubusercontent.com/illumos/illumos-gate/master/usr/src/uts/common/sys/sdt.h + fi elif [[ "$__CodeName" == "haiku" ]]; then JOBS=${MAXJOBS:="$(getconf _NPROCESSORS_ONLN)"} @@ -574,9 +679,16 @@ elif [[ "$__CodeName" == "haiku" ]]; then mkdir "$__RootfsDir/tmp/download" + ensureDownloadTool + echo "Downloading Haiku package tool" - git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 $__RootfsDir/tmp/script - wget -O "$__RootfsDir/tmp/download/hosttools.zip" $($__RootfsDir/tmp/script/fetch.sh --hosttools) + git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" + if [[ "$__hasWget" == 1 ]]; then + wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + else + curl -SLo "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" + fi + unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" @@ -589,14 +701,25 @@ elif [[ "$__CodeName" == "haiku" ]]; then echo "Downloading $package..." # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60 # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598 - hpkgDownloadUrl="$(wget -qO- --post-data='{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ - --header='Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" - wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + if [[ "$__hasWget" == 1 ]]; then + hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + else + hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ + --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" + fi done for package in haiku haiku_devel; do echo "Downloading $package..." - hpkgVersion="$(wget -qO- $HpkgBaseUrl | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" - wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + if [[ "$__hasWget" == 1 ]]; then + hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + else + hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + fi done # Set up the sysroot @@ -609,7 +732,11 @@ elif [[ "$__CodeName" == "haiku" ]]; then # Download buildtools echo "Downloading Haiku buildtools" - wget -O "$__RootfsDir/tmp/download/buildtools.zip" $($__RootfsDir/tmp/script/fetch.sh --buildtools --arch=$__HaikuArch) + if [[ "$__hasWget" == 1 ]]; then + wget -O "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + else + curl -SLo "$__RootfsDir/tmp/download/buildtools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --buildtools --arch=$__HaikuArch)" + fi unzip -o "$__RootfsDir/tmp/download/buildtools.zip" -d "$__RootfsDir" # Cleaning up temporary files @@ -622,10 +749,22 @@ elif [[ -n "$__CodeName" ]]; then __Keyring="$__Keyring --force-check-gpg" fi + # shellcheck disable=SC2086 + echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" - cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list" + + mkdir -p "$__RootfsDir/etc/apt/sources.list.d/" + cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <>Start configuring Tizen rootfs" ln -sfn asm-${LINK_ARCH} ./usr/include/asm patch -p1 < $__TIZEN_CROSSDIR/tizen.patch +if [[ "$TIZEN_ARCH" == "riscv64" ]]; then + echo "Fixing broken symlinks in $PWD" + rm ./usr/lib64/libresolv.so + ln -s ../../lib64/libresolv.so.2 ./usr/lib64/libresolv.so + rm ./usr/lib64/libpthread.so + ln -s ../../lib64/libpthread.so.0 ./usr/lib64/libpthread.so + rm ./usr/lib64/libdl.so + ln -s ../../lib64/libdl.so.2 ./usr/lib64/libdl.so + rm ./usr/lib64/libutil.so + ln -s ../../lib64/libutil.so.1 ./usr/lib64/libutil.so + rm ./usr/lib64/libm.so + ln -s ../../lib64/libm.so.6 ./usr/lib64/libm.so + rm ./usr/lib64/librt.so + ln -s ../../lib64/librt.so.1 ./usr/lib64/librt.so + rm ./lib/ld-linux-riscv64-lp64d.so.1 + ln -s ../lib64/ld-linux-riscv64-lp64d.so.1 ./lib/ld-linux-riscv64-lp64d.so.1 +fi echo "<:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>) + add_link_options($<$:--stdlib=${CLR_CMAKE_CXX_STANDARD_LIBRARY}>) +endif() + +option(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC "Statically link against the C++ standard library" OFF) +if(CLR_CMAKE_CXX_STANDARD_LIBRARY_STATIC) + add_link_options($<$:-static-libstdc++>) +endif() + +set(CLR_CMAKE_CXX_ABI_LIBRARY "" CACHE STRING "C++ ABI implementation library to link against. Only supported with the Clang compiler.") +if (CLR_CMAKE_CXX_ABI_LIBRARY) + # The user may specify the ABI library with the 'lib' prefix, like 'libstdc++'. Strip the prefix here so the linker finds the right library. + string(REGEX REPLACE "^lib(.+)" "\\1" CLR_CMAKE_CXX_ABI_LIBRARY ${CLR_CMAKE_CXX_ABI_LIBRARY}) + # We need to specify this as a linker-backend option as Clang will filter this option out when linking to libc++. + add_link_options("LINKER:-l${CLR_CMAKE_CXX_ABI_LIBRARY}") +endif() + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index 8fda30bdce2b..e33743105635 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -1,6 +1,6 @@ param ( $darcVersion = $null, - $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16', + $versionEndpoint = 'https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20', $verbosity = 'minimal', $toolpath = $null ) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index c305ae6bd771..36dbd45e1ce8 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -2,7 +2,7 @@ source="${BASH_SOURCE[0]}" darcVersion='' -versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2019-01-16' +versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20' verbosity='minimal' while [[ $# > 0 ]]; do diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 7e69e3a9e24a..7b9d97e3bd4d 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -71,6 +71,9 @@ case $cpuname in i[3-6]86) buildarch=x86 ;; + riscv64) + buildarch=riscv64 + ;; *) echo "Unknown CPU $cpuname detected, treating it as x64" buildarch=x64 @@ -82,7 +85,7 @@ if [[ $architecture != "" ]] && [[ $architecture != $buildarch ]]; then dotnetRoot="$dotnetRoot/$architecture" fi -InstallDotNet $dotnetRoot $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { +InstallDotNet "$dotnetRoot" $version "$architecture" $runtime true $runtimeSourceFeed $runtimeSourceFeedKey || { local exit_code=$? Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "dotnet-install.sh failed (exit code '$exit_code')." >&2 ExitWithExitCode $exit_code diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh index bbb4922151e6..b8ecca72bbf5 100644 --- a/eng/common/generate-sbom-prep.sh +++ b/eng/common/generate-sbom-prep.sh @@ -14,10 +14,10 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" . $scriptroot/pipeline-logging-functions.sh + # replace all special characters with _, some builds use special characters like : in Agent.Jobname, that is not a permissible name while uploading artifacts. artifact_name=$SYSTEM_STAGENAME"_"$AGENT_JOBNAME"_SBOM" safe_artifact_name="${artifact_name//["/:<>\\|?@*$" ]/_}" - manifest_dir=$1 # Normally - we'd listen to the manifest path given, but 1ES templates will overwrite if this level gets uploaded directly diff --git a/eng/common/helixpublish.proj b/eng/common/helixpublish.proj index d7f185856e79..c1323bf41210 100644 --- a/eng/common/helixpublish.proj +++ b/eng/common/helixpublish.proj @@ -1,3 +1,4 @@ + diff --git a/eng/common/internal/Directory.Build.props b/eng/common/internal/Directory.Build.props index dbf99d82a5c2..f1d041c33da5 100644 --- a/eng/common/internal/Directory.Build.props +++ b/eng/common/internal/Directory.Build.props @@ -1,4 +1,11 @@ + + + false + false + + + diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b166..f70261ed689b 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 7f5ce6d60813..feaa6d20812d 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -1,9 +1,10 @@ + net472 - false false + false @@ -14,17 +15,8 @@ - - - - https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json; - - - $(RestoreSources); - https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json; - - + diff --git a/eng/common/native/CommonLibrary.psm1 b/eng/common/native/CommonLibrary.psm1 index ca38268c44d8..f71f6af6cdbc 100644 --- a/eng/common/native/CommonLibrary.psm1 +++ b/eng/common/native/CommonLibrary.psm1 @@ -277,7 +277,8 @@ function Get-MachineArchitecture { if (($ProcessorArchitecture -Eq "AMD64") -Or ($ProcessorArchitecture -Eq "IA64") -Or ($ProcessorArchitecture -Eq "ARM64") -Or - ($ProcessorArchitecture -Eq "LOONGARCH64")) { + ($ProcessorArchitecture -Eq "LOONGARCH64") -Or + ($ProcessorArchitecture -Eq "RISCV64")) { return "x64" } return "x86" diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index 2d5660642b8d..9a0e1f2b4567 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -2,7 +2,9 @@ # # This file detects the C/C++ compiler and exports it to the CC/CXX environment variables # -# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here! +# NOTE: some scripts source this file and rely on stdout being empty, make sure +# to not output *anything* here, unless it is an error message that fails the +# build. if [ -z "$build_arch" ] || [ -z "$compiler" ]; then echo "Usage..." @@ -17,11 +19,9 @@ case "$compiler" in # clangx.y or clang-x.y version="$(echo "$compiler" | tr -d '[:alpha:]-=')" majorVersion="${version%%.*}" - [ -z "${version##*.*}" ] && minorVersion="${version#*.}" - if [ -z "$minorVersion" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -le 6 ]; then - minorVersion=0; - fi + # LLVM based on v18 released in early 2024, with two releases per year + maxVersion="$((18 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 6)))" compiler=clang ;; @@ -29,7 +29,9 @@ case "$compiler" in # gccx.y or gcc-x.y version="$(echo "$compiler" | tr -d '[:alpha:]-=')" majorVersion="${version%%.*}" - [ -z "${version##*.*}" ] && minorVersion="${version#*.}" + + # GCC based on v14 released in early 2024, with one release per year + maxVersion="$((14 + ((($(date +%Y) - 2024) * 12 + $(date +%-m) - 3) / 12)))" compiler=gcc ;; esac @@ -47,91 +49,98 @@ check_version_exists() { desired_version=-1 # Set up the environment to be used for building with the desired compiler. - if command -v "$compiler-$1.$2" > /dev/null; then - desired_version="-$1.$2" - elif command -v "$compiler$1$2" > /dev/null; then - desired_version="$1$2" - elif command -v "$compiler-$1$2" > /dev/null; then - desired_version="-$1$2" + if command -v "$compiler-$1" > /dev/null; then + desired_version="-$1" + elif command -v "$compiler$1" > /dev/null; then + desired_version="$1" fi echo "$desired_version" } +__baseOS="$(uname)" +set_compiler_version_from_CC() { + if [ "$__baseOS" = "Darwin" ]; then + # On Darwin, the versions from -version/-dumpversion refer to Xcode + # versions, not llvm versions, so we can't rely on them. + return + fi + + version="$("$CC" -dumpversion)" + if [ -z "$version" ]; then + echo "Error: $CC -dumpversion didn't provide a version" + exit 1 + fi + + # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments. + IFS=. read -r majorVersion _ < /dev/null; then - if [ "$(uname)" != "Darwin" ]; then - echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH." - fi - CC="$(command -v "$compiler")" - CXX="$(command -v "$cxxCompiler")" - else - echo "No usable version of $compiler found." + if ! command -v "$compiler" > /dev/null; then + echo "Error: No compatible version of $compiler was found within the range of $minVersion to $maxVersion. Please upgrade your toolchain or specify the compiler explicitly using CLR_CC and CLR_CXX environment variables." exit 1 fi - else - if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then - if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then - if command -v "$compiler" > /dev/null; then - echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH." - CC="$(command -v "$compiler")" - CXX="$(command -v "$cxxCompiler")" - else - echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH." - exit 1 - fi - fi - fi + + CC="$(command -v "$compiler" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler" 2> /dev/null)" + set_compiler_version_from_CC fi else - desired_version="$(check_version_exists "$majorVersion" "$minorVersion")" + desired_version="$(check_version_exists "$majorVersion")" if [ "$desired_version" = "-1" ]; then - echo "Could not find specific version of $compiler: $majorVersion $minorVersion." + echo "Error: Could not find specific version of $compiler: $majorVersion." exit 1 fi fi if [ -z "$CC" ]; then - CC="$(command -v "$compiler$desired_version")" - CXX="$(command -v "$cxxCompiler$desired_version")" - if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi + CC="$(command -v "$compiler$desired_version" 2> /dev/null)" + CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)" + if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi + set_compiler_version_from_CC fi else if [ ! -f "$CLR_CC" ]; then - echo "CLR_CC is set but path '$CLR_CC' does not exist" + echo "Error: CLR_CC is set but path '$CLR_CC' does not exist" exit 1 fi CC="$CLR_CC" CXX="$CLR_CXX" + set_compiler_version_from_CC fi if [ -z "$CC" ]; then - echo "Unable to find $compiler." + echo "Error: Unable to find $compiler." exit 1 fi -# Only lld version >= 9 can be considered stable. lld doesn't support s390x. -if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then - if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then - LDFLAGS="-fuse-ld=lld" +if [ "$__baseOS" != "Darwin" ]; then + # On Darwin, we always want to use the Apple linker. + + # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0. + if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then + if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then + LDFLAGS="-fuse-ld=lld" + fi fi fi -SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")" +SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)" export CC CXX LDFLAGS SCAN_BUILD_COMMAND diff --git a/eng/common/native/init-distro-rid.sh b/eng/common/native/init-distro-rid.sh index de1687b2ccbe..83ea7aab0e08 100644 --- a/eng/common/native/init-distro-rid.sh +++ b/eng/common/native/init-distro-rid.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # getNonPortableDistroRid # @@ -11,21 +11,16 @@ # non-portable rid getNonPortableDistroRid() { - local targetOs="$1" - local targetArch="$2" - local rootfsDir="$3" - local nonPortableRid="" + targetOs="$1" + targetArch="$2" + rootfsDir="$3" + nonPortableRid="" if [ "$targetOs" = "linux" ]; then + # shellcheck disable=SC1091 if [ -e "${rootfsDir}/etc/os-release" ]; then - source "${rootfsDir}/etc/os-release" - - if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then - # remove the last version digit - VERSION_ID="${VERSION_ID%.*}" - fi - - if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then + . "${rootfsDir}/etc/os-release" + if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then nonPortableRid="${ID}.${VERSION_ID}-${targetArch}" else # Rolling release distros either do not set VERSION_ID, set it as blank or @@ -33,45 +28,33 @@ getNonPortableDistroRid() # so omit it here to be consistent with everything else. nonPortableRid="${ID}-${targetArch}" fi - elif [ -e "${rootfsDir}/android_platform" ]; then - source "$rootfsDir"/android_platform + # shellcheck disable=SC1091 + . "${rootfsDir}/android_platform" nonPortableRid="$RID" fi fi if [ "$targetOs" = "freebsd" ]; then - # $rootfsDir can be empty. freebsd-version is shell script and it should always work. - __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; }) + # $rootfsDir can be empty. freebsd-version is a shell script and should always work. + __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1) nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" - elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then + elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then __android_sdk_version=$(getprop ro.build.version.sdk) nonPortableRid="android.$__android_sdk_version-${targetArch}" elif [ "$targetOs" = "illumos" ]; then __uname_version=$(uname -v) - case "$__uname_version" in - omnios-*) - __omnios_major_version=$(echo "${__uname_version:8:2}") - nonPortableRid=omnios."$__omnios_major_version"-"$targetArch" - ;; - joyent_*) - __smartos_major_version=$(echo "${__uname_version:7:4}") - nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" - ;; - illumos_*) - nonPortableRid=openindiana-"$targetArch" - ;; - esac + nonPortableRid="illumos-${targetArch}" elif [ "$targetOs" = "solaris" ]; then __uname_version=$(uname -v) - __solaris_major_version=$(echo "${__uname_version%.*}") - nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" + __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1) + nonPortableRid="solaris.$__solaris_major_version-${targetArch}" elif [ "$targetOs" = "haiku" ]; then - __uname_release=$(uname -r) + __uname_release="$(uname -r)" nonPortableRid=haiku.r"$__uname_release"-"$targetArch" fi - echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" + echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]' } # initDistroRidGlobal @@ -85,26 +68,23 @@ getNonPortableDistroRid() # None # # Notes: -# -# It is important to note that the function does not return anything, but it -# exports the following variables on success: -# -# __DistroRid : Non-portable rid of the target platform. -# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. -# +# It is important to note that the function does not return anything, but it +# exports the following variables on success: +# __DistroRid : Non-portable rid of the target platform. +# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform. initDistroRidGlobal() { - local targetOs="$1" - local targetArch="$2" - local rootfsDir="" - if [ "$#" -ge 3 ]; then + targetOs="$1" + targetArch="$2" + rootfsDir="" + if [ $# -ge 3 ]; then rootfsDir="$3" fi if [ -n "${rootfsDir}" ]; then # We may have a cross build. Check for the existence of the rootfsDir if [ ! -e "${rootfsDir}" ]; then - echo "Error rootfsDir has been passed, but the location is not valid." + echo "Error: rootfsDir has been passed, but the location is not valid." exit 1 fi fi @@ -119,7 +99,7 @@ initDistroRidGlobal() STRINGS="$(command -v llvm-strings || true)" fi - # Check for musl-based distros (e.g Alpine Linux, Void Linux). + # Check for musl-based distros (e.g. Alpine Linux, Void Linux). if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl || ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then __PortableTargetOS="linux-musl" diff --git a/eng/common/native/init-os-and-arch.sh b/eng/common/native/init-os-and-arch.sh index e693617a6c2b..38921d4338f7 100644 --- a/eng/common/native/init-os-and-arch.sh +++ b/eng/common/native/init-os-and-arch.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # Use uname to determine what the OS is. OSName=$(uname -s | tr '[:upper:]' '[:lower:]') @@ -35,6 +35,10 @@ fi case "$CPUName" in arm64|aarch64) arch=arm64 + if [ "$(getconf LONG_BIT)" -lt 64 ]; then + # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS) + arch=arm + fi ;; loongarch64) @@ -50,6 +54,7 @@ case "$CPUName" in ;; armv7l|armv8l) + # shellcheck disable=SC1091 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then arch=armel else diff --git a/eng/common/post-build/check-channel-consistency.ps1 b/eng/common/post-build/check-channel-consistency.ps1 index 63f3464c986a..61208d2d1351 100644 --- a/eng/common/post-build/check-channel-consistency.ps1 +++ b/eng/common/post-build/check-channel-consistency.ps1 @@ -4,10 +4,18 @@ param( ) try { - . $PSScriptRoot\post-build-utils.ps1 + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 if ($PromoteToChannels -eq "") { - Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." + Write-PipelineTaskError -Type 'warning' -Message "This build won't publish assets as it's not configured to any Maestro channel. If that wasn't intended use Darc to configure a default channel using add-default-channel for this branch or to promote it to a channel using add-build-to-channel. See https://github.com/dotnet/arcade/blob/main/Documentation/Darc.md#assigning-an-individual-build-to-a-channel for more info." ExitWithExitCode 0 } diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index 22b1c4dfe4a7..e5de00c89836 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -5,9 +5,14 @@ param( [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) -try { - . $PSScriptRoot\post-build-utils.ps1 +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 +try { & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index 6cbbcafade26..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -118,4 +118,4 @@ if ($LASTEXITCODE -ne 0) { Write-Error "The verify tool found some problems." } else { Write-Output "The verify tool succeeded." -} \ No newline at end of file +} diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 238945cb5ab4..a261517ef906 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -5,11 +5,17 @@ param( [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, - [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters + [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters, + [Parameter(Mandatory=$false)][string] $RequireDefaultChannels ) try { - . $PSScriptRoot\post-build-utils.ps1 + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 $darc = Get-Darc @@ -28,6 +34,10 @@ try { if ("false" -eq $WaitPublishingFinish) { $optionalParams.Add("--no-wait") | Out-Null } + + if ("true" -eq $RequireDefaultChannels) { + $optionalParams.Add("--default-channels-required") | Out-Null + } & $darc add-build-to-channel ` --id $buildId ` @@ -37,6 +47,7 @@ try { --azdev-pat "$AzdoToken" ` --bar-uri "$MaestroApiEndPoint" ` --ci ` + --verbose ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 new file mode 100644 index 000000000000..b7fc19591507 --- /dev/null +++ b/eng/common/post-build/redact-logs.ps1 @@ -0,0 +1,89 @@ +[CmdletBinding(PositionalBinding=$False)] +param( + [Parameter(Mandatory=$true, Position=0)][string] $InputPath, + [Parameter(Mandatory=$true)][string] $BinlogToolVersion, + [Parameter(Mandatory=$false)][string] $DotnetPath, + [Parameter(Mandatory=$false)][string] $PackageFeed = 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json', + # File with strings to redact - separated by newlines. + # For comments start the line with '# ' - such lines are ignored + [Parameter(Mandatory=$false)][string] $TokensFilePath, + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact +) + +try { + $ErrorActionPreference = 'Stop' + Set-StrictMode -Version 2.0 + + # `tools.ps1` checks $ci to perform some actions. Since the post-build + # scripts don't necessarily execute in the same agent that run the + # build.ps1/sh script this variable isn't automatically set. + $ci = $true + $disableConfigureToolsetImport = $true + . $PSScriptRoot\..\tools.ps1 + + $packageName = 'binlogtool' + + $dotnet = $DotnetPath + + if (!$dotnet) { + $dotnetRoot = InitializeDotNetCli -install:$true + $dotnet = "$dotnetRoot\dotnet.exe" + } + + $toolList = & "$dotnet" tool list -g + + if ($toolList -like "*$packageName*") { + & "$dotnet" tool uninstall $packageName -g + } + + $toolPath = "$PSScriptRoot\..\..\..\.tools" + $verbosity = 'minimal' + + New-Item -ItemType Directory -Force -Path $toolPath + + Push-Location -Path $toolPath + + try { + Write-Host "Installing Binlog redactor CLI..." + Write-Host "'$dotnet' new tool-manifest" + & "$dotnet" new tool-manifest + Write-Host "'$dotnet' tool install $packageName --local --add-source '$PackageFeed' -v $verbosity --version $BinlogToolVersion" + & "$dotnet" tool install $packageName --local --add-source "$PackageFeed" -v $verbosity --version $BinlogToolVersion + + if (Test-Path $TokensFilePath) { + Write-Host "Adding additional sensitive data for redaction from file: " $TokensFilePath + $TokensToRedact += Get-Content -Path $TokensFilePath | Foreach {$_.Trim()} | Where { $_ -notmatch "^# " } + } + + $optionalParams = [System.Collections.ArrayList]::new() + + Foreach ($p in $TokensToRedact) + { + if($p -match '^\$\(.*\)$') + { + Write-Host ("Ignoring token {0} as it is probably unexpanded AzDO variable" -f $p) + } + elseif($p) + { + $optionalParams.Add("-p:" + $p) | Out-Null + } + } + + & $dotnet binlogtool redact --input:$InputPath --recurse --in-place ` + @optionalParams + + if ($LastExitCode -ne 0) { + Write-PipelineTelemetryError -Category 'Redactor' -Type 'warning' -Message "Problems using Redactor tool (exit code: $LastExitCode). But ignoring them now." + } + } + finally { + Pop-Location + } + + Write-Host 'done.' +} +catch { + Write-Host $_ + Write-PipelineTelemetryError -Category 'Redactor' -Message "There was an error while trying to redact logs. Error: $_" + ExitWithExitCode 1 +} diff --git a/eng/common/post-build/sourcelink-validation.ps1 b/eng/common/post-build/sourcelink-validation.ps1 index 4011d324e739..1976ef70fb85 100644 --- a/eng/common/post-build/sourcelink-validation.ps1 +++ b/eng/common/post-build/sourcelink-validation.ps1 @@ -6,7 +6,15 @@ param( [Parameter(Mandatory=$true)][string] $SourcelinkCliVersion # Version of SourceLink CLI to use ) -. $PSScriptRoot\post-build-utils.ps1 +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +# `tools.ps1` checks $ci to perform some actions. Since the post-build +# scripts don't necessarily execute in the same agent that run the +# build.ps1/sh script this variable isn't automatically set. +$ci = $true +$disableConfigureToolsetImport = $true +. $PSScriptRoot\..\tools.ps1 # Cache/HashMap (File -> Exist flag) used to consult whether a file exist # in the repository at a specific commit point. This is populated by inserting diff --git a/eng/common/post-build/symbols-validation.ps1 b/eng/common/post-build/symbols-validation.ps1 index cd2181bafa05..7146e593ffae 100644 --- a/eng/common/post-build/symbols-validation.ps1 +++ b/eng/common/post-build/symbols-validation.ps1 @@ -322,8 +322,6 @@ function InstallDotnetSymbol { } try { - . $PSScriptRoot\post-build-utils.ps1 - InstallDotnetSymbol foreach ($Job in @(Get-Job)) { diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 5bfbb02ef043..3849bdb3cf51 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -5,11 +5,11 @@ - + - + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 81ded5b7f477..4715d75e974d 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -6,6 +6,7 @@ Param( [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located + [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list # format. @@ -74,7 +75,7 @@ try { } Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel } $gdnFolder = Join-Path $workingDirectory '.gdn' @@ -103,6 +104,7 @@ try { -TargetDirectory $targetDirectory ` -GdnFolder $gdnFolder ` -ToolsList $tools ` + -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 588ff8e22fbe..3ac1d92b3700 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,6 +3,7 @@ Param( [string] $Repository, [string] $BranchName='master', [string] $WorkingDirectory, + [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel='Standard' ) @@ -20,7 +21,14 @@ $ci = $true # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' +# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file +$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) +$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") +$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" +$zipFile = "$WorkingDirectory/gdn.zip" + Add-Type -AssemblyName System.IO.Compression.FileSystem +$gdnFolder = (Join-Path $WorkingDirectory '.gdn') try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index e5f543ea68c2..4585cfd6bba1 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 7fe603fe995d..648c5068d7d6 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -4,8 +4,6 @@ function Install-Gdn { [Parameter(Mandatory=$true)] [string]$Path, - [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json", - # If omitted, install the latest version of Guardian, otherwise install that specific version. [string]$Version ) @@ -21,7 +19,7 @@ function Install-Gdn { $ci = $true . $PSScriptRoot\..\tools.ps1 - $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") if ($Version) { $argumentList += "-Version $Version" diff --git a/eng/common/sdl/trim-assets-version.ps1 b/eng/common/sdl/trim-assets-version.ps1 index a2e004877045..0daa2a9e9462 100644 --- a/eng/common/sdl/trim-assets-version.ps1 +++ b/eng/common/sdl/trim-assets-version.ps1 @@ -72,4 +72,4 @@ catch { Write-Host $_ Write-PipelineTelemetryError -Force -Category 'Sdl' -Message $_ ExitWithExitCode 1 -} \ No newline at end of file +} diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md new file mode 100644 index 000000000000..4bf4cf41bd7c --- /dev/null +++ b/eng/common/template-guidance.md @@ -0,0 +1,133 @@ +# Overview + +Arcade provides templates for public (`/templates`) and 1ES pipeline templates (`/templates-official`) scenarios. Pipelines which are required to be managed by 1ES pipeline templates should reference `/templates-offical`, all other pipelines may reference `/templates`. + +## How to use + +Basic guidance is: + +- 1ES Pipeline Template or 1ES Microbuild template runs should reference `eng/common/templates-official`. Any internal production-graded pipeline should use these templates. + +- All other runs should reference `eng/common/templates`. + +See [azure-pipelines.yml](../../azure-pipelines.yml) (templates-official example) or [azure-pipelines-pr.yml](../../azure-pipelines-pr.yml) (templates example) for examples. + +#### The `templateIs1ESManaged` parameter + +The `templateIs1ESManaged` is available on most templates and affects which of the variants is used for nested templates. See [Development Notes](#development-notes) below for more information on the `templateIs1ESManaged1 parameter. + +- For templates under `job/`, `jobs/`, `steps`, or `post-build/`, this parameter must be explicitly set. + +## Multiple outputs + +1ES pipeline templates impose a policy where every publish artifact execution results in additional security scans being injected into your pipeline. When using `templates-official/jobs/jobs.yml`, Arcade reduces the number of additional security injections by gathering all publishing outputs into the [Build.ArtifactStagingDirectory](https://learn.microsoft.com/en-us/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#build-variables-devops-services), and utilizing the [outputParentDirectory](https://eng.ms/docs/cloud-ai-platform/devdiv/one-engineering-system-1es/1es-docs/1es-pipeline-templates/features/outputs#multiple-outputs) feature of 1ES pipeline templates. When implementing your pipeline, if you ensure publish artifacts are located in the `$(Build.ArtifactStagingDirectory)`, and utilize the 1ES provided template context, then you can reduce the number of security scans for your pipeline. + +Example: +``` yaml +# azure-pipelines.yml +extends: + template: azure-pipelines/MicroBuild.1ES.Official.yml@MicroBuildTemplate + parameters: + stages: + - stage: build + jobs: + - template: /eng/common/templates-official/jobs/jobs.yml@self + parameters: + # 1ES makes use of outputs to reduce security task injection overhead + templateContext: + outputs: + - output: pipelineArtifact + displayName: 'Publish logs from source' + continueOnError: true + condition: always() + targetPath: $(Build.ArtifactStagingDirectory)/artifacts/log + artifactName: Logs + jobs: + - job: Windows + steps: + - script: echo "friendly neighborhood" > artifacts/marvel/spiderman.txt + # copy build outputs to artifact staging directory for publishing + - task: CopyFiles@2 + displayName: Gather build output + inputs: + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' +``` + +Note: Multiple outputs are ONLY applicable to 1ES PT publishing (only usable when referencing `templates-official`). + +## Development notes + +**Folder / file structure** + +``` text +eng\common\ + [templates || templates-official]\ + job\ + job.yml (shim + artifact publishing logic) + onelocbuild.yml (shim) + publish-build-assets.yml (shim) + source-build.yml (shim) + source-index-stage1.yml (shim) + jobs\ + codeql-build.yml (shim) + jobs.yml (shim) + source-build.yml (shim) + post-build\ + post-build.yml (shim) + common-variabls.yml (shim) + setup-maestro-vars.yml (shim) + steps\ + publish-build-artifacts.yml (logic) + publish-pipeline-artifacts.yml (logic) + component-governance.yml (shim) + generate-sbom.yml (shim) + publish-logs.yml (shim) + retain-build.yml (shim) + send-to-helix.yml (shim) + source-build.yml (shim) + variables\ + pool-providers.yml (logic + redirect) # templates/variables/pool-providers.yml will redirect to templates-official/variables/pool-providers.yml if you are running in the internal project + sdl-variables.yml (logic) + core-templates\ + job\ + job.yml (logic) + onelocbuild.yml (logic) + publish-build-assets.yml (logic) + source-build.yml (logic) + source-index-stage1.yml (logic) + jobs\ + codeql-build.yml (logic) + jobs.yml (logic) + source-build.yml (logic) + post-build\ + common-variabls.yml (logic) + post-build.yml (logic) + setup-maestro-vars.yml (logic) + steps\ + component-governance.yml (logic) + generate-sbom.yml (logic) + publish-build-artifacts.yml (redirect) + publish-logs.yml (logic) + publish-pipeline-artifacts.yml (redirect) + retain-build.yml (logic) + send-to-helix.yml (logic) + source-build.yml (logic) + variables\ + pool-providers.yml (redirect) +``` + +In the table above, a file is designated as "shim", "logic", or "redirect". + +- shim - represents a yaml file which is an intermediate step between pipeline logic and .Net Core Engineering's templates (`core-templates`) and defines the `is1ESPipeline` parameter value. + +- logic - represents actual base template logic. + +- redirect- represents a file in `core-templates` which redirects to the "logic" file in either `templates` or `templates-official`. + +Logic for Arcade's templates live **primarily** in the `core-templates` folder. The exceptions to the location of the logic files are around artifact publishing, which is handled differently between 1es pipeline templates and standard templates. `templates` and `templates-official` provide shim entry points which redirect to `core-templates` while also defining the `is1ESPipeline` parameter. If a shim is referenced in `templates`, then `is1ESPipeline` is set to `false`. If a shim is referenced in `templates-official`, then `is1ESPipeline` is set to `true`. + +Within `templates` and `templates-official`, the templates at the "stages", and "jobs" / "job" level have been replaced with shims. Templates at the "steps" and "variables" level are typically too granular to be replaced with shims and instead persist logic which is directly applicable to either scenario. + +Within `core-templates`, there are a handful of places where logic is dependent on which shim entry point was used. In those places, we redirect back to the respective logic file in `templates` or `templates-official`. diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 4cca1114fcca..81ea7a261f2d 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,271 +1,81 @@ -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - parameters: -# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - cancelTimeoutInMinutes: '' - condition: '' - container: '' - continueOnError: false - dependsOn: '' - displayName: '' - pool: '' - steps: [] - strategy: '' - timeoutInMinutes: '' - variables: [] - workspace: '' - templateContext: '' - -# Job base template specific parameters - # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md - artifacts: '' - enableMicrobuild: false - microbuildUseESRP: true - enablePublishBuildArtifacts: false - enablePublishBuildAssets: false - enablePublishTestResults: false - enablePublishUsingPipelines: false - enableBuildRetry: false - disableComponentGovernance: '' - componentGovernanceIgnoreDirectories: '' - mergeTestResults: false - testRunTitle: '' - testResultsFormat: '' - name: '' - preSteps: [] - runAsPublic: false # Sbom related params enableSbom: true - PackageVersion: 7.0.0 + runAsPublic: false + PackageVersion: 9.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom jobs: -- job: ${{ parameters.name }} - - ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: - cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.container, '') }}: - container: ${{ parameters.container }} - - ${{ if ne(parameters.continueOnError, '') }}: - continueOnError: ${{ parameters.continueOnError }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - - ${{ if ne(parameters.strategy, '') }}: - strategy: ${{ parameters.strategy }} - - ${{ if ne(parameters.timeoutInMinutes, '') }}: - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - ${{ if ne(parameters.templateContext, '') }}: - templateContext: ${{ parameters.templateContext }} - - variables: - - ${{ if ne(parameters.enableTelemetry, 'false') }}: - - name: DOTNET_CLI_TELEMETRY_PROFILE - value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' - # Retry signature validation up to three times, waiting 2 seconds between attempts. - # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY - value: 3,2000 - - ${{ each variable in parameters.variables }}: - # handle name-value variable syntax - # example: - # - name: [key] - # value: [value] - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - # handle variable groups - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} - - # handle template variable syntax - # example: - # - template: path/to/template.yml - # parameters: - # [key]: [value] - - ${{ if ne(variable.template, '') }}: - - template: ${{ variable.template }} - ${{ if ne(variable.parameters, '') }}: - parameters: ${{ variable.parameters }} - - # handle key-value variable syntax. - # example: - # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - - ${{ each pair in variable }}: - - name: ${{ pair.key }} - value: ${{ pair.value }} - - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds - - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - ${{ if ne(parameters.workspace, '') }}: - workspace: ${{ parameters.workspace }} - - steps: - - ${{ if ne(parameters.preSteps, '') }}: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@1 - - - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} - targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} - itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} - - - ${{ each step in parameters.steps }}: - - ${{ step }} - - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - - template: /eng/common/templates-official/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false - ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) - - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - task: CopyFiles@2 - displayName: Gather binaries for publish to artifacts - inputs: - SourceFolder: 'artifacts/bin' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' - - task: CopyFiles@2 - displayName: Gather packages for publish to artifacts - inputs: - SourceFolder: 'artifacts/packages' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish pipeline artifacts - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - task: 1ES.PublishPipelineArtifact@1 - inputs: - targetPath: 'artifacts/log' - artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: 'Publish logs' - continueOnError: true - condition: always() - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} - continueOnError: true - condition: always() - - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: - - task: PublishTestResults@2 - displayName: Publish XUnit Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: - - task: PublishTestResults@2 - displayName: Publish TRX Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' - searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates-official/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion}} - BuildDropPath: ${{ parameters.buildDropPath }} - IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - task: 1ES.PublishPipelineArtifact@1 - inputs: - targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' - artifactName: 'BuildConfiguration' - displayName: 'Publish build retry configuration' - continueOnError: true +- template: /eng/common/core-templates/job/job.yml + parameters: + is1ESPipeline: true + + componentGovernanceSteps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion }} + BuildDropPath: ${{ parameters.buildDropPath }} + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + publishArtifacts: false + + # publish artifacts + # for 1ES managed templates, use the templateContext.output to handle multiple outputs. + templateContext: + outputParentDirectory: $(Build.ArtifactStagingDirectory) + outputs: + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - output: buildArtifacts + displayName: Publish pipeline artifacts + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + condition: always() + continueOnError: true + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - output: pipelineArtifact + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)_Attempt$(System.JobAttempt)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + sbomEnabled: false # we don't need SBOM for logs + + - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: + - output: buildArtifacts + displayName: Publish Logs + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + publishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + sbomEnabled: false # we don't need SBOM for logs + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - output: pipelineArtifact + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/eng/common/BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true + sbomEnabled: false # we don't need SBOM for BuildConfiguration + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - output: pipelineArtifact + displayName: Publish SBOM manifest + continueOnError: true + targetPath: $(Build.ArtifactStagingDirectory)/sbom + artifactName: $(ARTIFACT_NAME) + + # add any outputs provided via root yaml + - ${{ if ne(parameters.templateContext.outputs, '') }}: + - ${{ each output in parameters.templateContext.outputs }}: + - ${{ output }} + + # add any remaining templateContext properties + ${{ each context in parameters.templateContext }}: + ${{ if and(ne(context.key, 'outputParentDirectory'), ne(context.key, 'outputs')) }}: + ${{ context.key }}: ${{ context.value }} + + ${{ each parameter in parameters }}: + ${{ if and(ne(parameter.key, 'templateContext'), ne(parameter.key, 'is1ESPipeline')) }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index 68e7a65605c5..0f0c514b912d 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -1,112 +1,7 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: '' - - CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex - GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - - SourcesDirectory: $(System.DefaultWorkingDirectory) - CreatePr: true - AutoCompletePr: false - ReusePr: true - UseLfLineEndings: true - UseCheckedInLocProjectJson: false - SkipLocProjectJsonGeneration: false - LanguageSet: VS_Main_Languages - LclSource: lclFilesInRepo - LclPackageId: '' - RepoType: gitHub - GitHubOrg: dotnet - MirrorRepo: '' - MirrorBranch: main - condition: '' - JobNameSuffix: '' - jobs: -- job: OneLocBuild${{ parameters.JobNameSuffix }} - - dependsOn: ${{ parameters.dependsOn }} - - displayName: OneLocBuild${{ parameters.JobNameSuffix }} - - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - steps: - - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - - task: Powershell@2 - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} - - - task: OneLocBuild@2 - displayName: OneLocBuild - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: eng/Localize/LocProject.json - outDir: $(Build.ArtifactStagingDirectory) - lclSource: ${{ parameters.LclSource }} - lclPackageId: ${{ parameters.LclPackageId }} - isCreatePrSelected: ${{ parameters.CreatePr }} - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} - ${{ if eq(parameters.CreatePr, true) }}: - isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - isShouldReusePrSelected: ${{ parameters.ReusePr }} - packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" - ${{ if ne(parameters.MirrorRepo, '') }}: - isMirrorRepoSelected: true - gitHubOrganization: ${{ parameters.GitHubOrg }} - mirrorRepo: ${{ parameters.MirrorRepo }} - mirrorBranch: ${{ parameters.MirrorBranch }} - condition: ${{ parameters.condition }} - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Localization Files - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} +- template: /eng/common/core-templates/job/onelocbuild.yml + parameters: + is1ESPipeline: true - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish LocProject.json - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} \ No newline at end of file + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 53109246d948..d667a70e8de7 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -1,177 +1,7 @@ -parameters: - configuration: 'Debug' - - # Optional: condition for the job to run - condition: '' - - # Optional: 'true' if future jobs should run even if this job fails - continueOnError: false - - # Optional: dependencies of the job - dependsOn: '' - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishUsingPipelines: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishAssetsImmediately: false - - artifactsPublishingAdditionalParameters: '' - - signingValidationAdditionalParameters: '' - - repositoryAlias: self - - officialBuildId: '' - jobs: -- job: Asset_Registry_Publish - - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/common-variables.yml - - name: OfficialBuildId - ${{ if ne(parameters.officialBuildId, '') }}: - value: ${{ parameters.officialBuildId }} - ${{ else }}: - value: $(Build.BuildNumber) - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: ${{ parameters.repositoryAlias }} - fetchDepth: 3 - clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(OfficialBuildId) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force - $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" - Add-Content -Path $filePath -Value $(BARBuildId) - Add-Content -Path $filePath -Value "$(DefaultChannels)" - Add-Content -Path $filePath -Value $(IsStableBuild) - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: 1ES.PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' +- template: /eng/common/core-templates/job/publish-build-assets.yml + parameters: + is1ESPipeline: true - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates-official/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f75400757d1e..1a480034b678 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -1,79 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - - # Optional list of directories to ignore for component governance scans. - cgIgnoreDirectories: [] - - # If set to true and running on a non-public project, - # Internal blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: -- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} - displayName: Source-Build (${{ parameters.platform.name }}) - - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-azurelinux-3 - os: linux - - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all +- template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: true - steps: - - ${{ if eq(parameters.enableInternalSources, true) }}: - - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - - template: /eng/common/templates-official/steps/source-build.yml - parameters: - platform: ${{ parameters.platform }} - cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 8de0dfaf3494..6d5ead316f92 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,83 +1,7 @@ -parameters: - runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 - sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json - sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" - preSteps: [] - binlogPath: artifacts/log/Debug/Build.binlog - condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') - dependsOn: '' - pool: '' - jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexUploadPackageVersion - value: ${{ parameters.sourceIndexUploadPackageVersion }} - - name: SourceIndexProcessBinlogPackageVersion - value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - template: /eng/common/templates-official/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 - os: windows - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Get stage 1 auth token - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - - - script: | - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: true - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml index f6476912a861..a726322ecfe0 100644 --- a/eng/common/templates-official/jobs/codeql-build.yml +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -1,31 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - jobs: -- template: /eng/common/templates-official/jobs/jobs.yml +- template: /eng/common/core-templates/jobs/codeql-build.yml parameters: - enableMicrobuild: false - enablePublishBuildArtifacts: false - enablePublishTestResults: false - enablePublishBuildAssets: false - enablePublishUsingPipelines: false - enableTelemetry: true + is1ESPipeline: true - variables: - - group: Publish-Build-Assets - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.109.0 - - name: GuardianPackagesConfigFile - value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - - name: GuardianVersion - value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - jobs: ${{ parameters.jobs }} - + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 03aa64e1741f..007deddaea0f 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -1,101 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable publishing using release pipelines - enablePublishUsingPipelines: false - - # Optional: Enable running the source-build jobs to build repo from source - enableSourceBuild: false - - # Optional: Parameters for source-build template. - # See /eng/common/templates-official/jobs/source-build.yml for options - sourceBuildParameters: [] - - graphFileGeneration: - # Optional: Enable generating the graph files at the end of the build - enabled: false - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - - # Optional: Override automatically derived dependsOn value for "publish build assets" job - publishBuildAssetsDependsOn: '' - - # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. - publishAssetsImmediately: false - - # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - enableSourceIndex: false - sourceIndexParams: {} - repositoryAlias: self - officialBuildId: '' - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - jobs: -- ${{ each job in parameters.jobs }}: - - template: ../job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - -- ${{ if eq(parameters.enableSourceBuild, true) }}: - - template: /eng/common/templates-official/jobs/source-build.yml - parameters: - allCompletedJobId: Source_Build_Complete - ${{ each parameter in parameters.sourceBuildParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if eq(parameters.enableSourceIndex, 'true') }}: - - template: ../job/source-index-stage1.yml - parameters: - runAsPublic: ${{ parameters.runAsPublic }} - ${{ each parameter in parameters.sourceIndexParams }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - - template: ../job/publish-build-assets.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - dependsOn: - - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.publishBuildAssetsDependsOn }}: - - ${{ job.job }} - - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.jobs }}: - - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: true - runAsPublic: ${{ parameters.runAsPublic }} - publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} - enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} - repositoryAlias: ${{ parameters.repositoryAlias }} - officialBuildId: ${{ parameters.officialBuildId }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 21a346fbd6c7..483e7b611f34 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -1,59 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/templates-official/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - - # Optional list of directories to ignore for component governance scans. - cgIgnoreDirectories: [] - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: +- template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: true -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/templates-official/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} - enableInternalSources: ${{ parameters.enableInternalSources }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/templates-official/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} - cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} - enableInternalSources: ${{ parameters.enableInternalSources }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index 173914f2364a..c32fc49233f8 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -1,22 +1,8 @@ variables: - - group: Publish-Build-Assets +- template: /eng/common/core-templates/post-build/common-variables.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true - # Whether the build is internal or not - - name: IsInternalBuild - value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - # Default Maestro++ API Endpoint and API Version - - name: MaestroApiEndPoint - value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - - name: MaestroApiVersion - value: "2020-02-20" - - - name: SourceLinkCLIVersion - value: 3.0.0 - - name: SymbolToolVersion - value: 1.0.1 - - - name: runCodesignValidationInjection - value: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 07837055ee30..2364c0fd4a52 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -1,291 +1,8 @@ -parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - stages: -- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - - stage: Validate - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Validate Build Assets - variables: - - template: common-variables.yml - - template: /eng/common/templates-official/variables/pool-providers.yml - jobs: - - job: - displayName: NuGet Validation - condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates-official/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: AzurePipelines-EO - image: 1ESPT-Windows2022 - demands: Cmd - os: windows - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 - os: windows - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 - - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x +- template: /eng/common/core-templates/post-build/post-build.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 3a56abf8922e..024397d87864 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -1,70 +1,8 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - steps: - - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - checkDownloadedFiles: true - - - task: PowerShell@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - targetType: inline - pwsh: true - script: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 - - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" - - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" +- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: true - Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" - } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index cbba0596709d..30bb3985ca2b 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -1,13 +1,7 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - steps: -- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable -- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml index 93a8394a666b..f9dd238c6cd5 100644 --- a/eng/common/templates-official/steps/enable-internal-runtimes.yml +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -1,28 +1,9 @@ # Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' # variable with the base64-encoded SAS token, by default - -parameters: -- name: federatedServiceConnection - type: string - default: 'dotnetbuilds-internal-read' -- name: outputVariableName - type: string - default: 'dotnetbuilds-internal-container-read-token-base64' -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: true - steps: -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates-official/steps/get-delegation-sas.yml - parameters: - federatedServiceConnection: ${{ parameters.federatedServiceConnection }} - outputVariableName: ${{ parameters.outputVariableName }} - expiryInHours: ${{ parameters.expiryInHours }} - base64Encode: ${{ parameters.base64Encode }} - storageAccount: dotnetbuilds - container: internal - permissions: rl +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/enable-internal-sources.yml b/eng/common/templates-official/steps/enable-internal-sources.yml new file mode 100644 index 000000000000..e6d57182284d --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-sources.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml index 1536353566c7..9a89a4706d94 100644 --- a/eng/common/templates-official/steps/generate-sbom.yml +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -1,48 +1,7 @@ -# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. -# PackageName - The name of the package this SBOM represents. -# PackageVersion - The version of the package this SBOM represents. -# ManifestDirPath - The path of the directory where the generated manifest files will be placed -# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. - -parameters: - PackageVersion: 8.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' - PackageName: '.NET' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - IgnoreDirectories: '' - sbomContinueOnError: true - steps: -- task: PowerShell@2 - displayName: Prep for SBOM generation in (Non-linux) - condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) - inputs: - filePath: ./eng/common/generate-sbom-prep.ps1 - arguments: ${{parameters.manifestDirPath}} - -# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 -- script: | - chmod +x ./eng/common/generate-sbom-prep.sh - ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} - displayName: Prep for SBOM generation in (Linux) - condition: eq(variables['Agent.Os'], 'Linux') - continueOnError: ${{ parameters.sbomContinueOnError }} - -- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - continueOnError: ${{ parameters.sbomContinueOnError }} - inputs: - PackageName: ${{ parameters.packageName }} - BuildDropPath: ${{ parameters.buildDropPath }} - PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }}/$(ARTIFACT_NAME) - ${{ if ne(parameters.IgnoreDirectories, '') }}: - AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - -- task: 1ES.PublishPipelineArtifact@1 - displayName: Publish SBOM manifest - continueOnError: ${{parameters.sbomContinueOnError}} - inputs: - targetPath: '${{parameters.manifestDirPath}}' - artifactName: $(ARTIFACT_NAME) +- template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: true + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index c690cc0a070c..c5a9c1f8275c 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -1,52 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: false -- name: storageAccount - type: string -- name: container - type: string -- name: permissions - type: string - default: 'rl' - steps: -- task: AzureCLI@2 - displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: true - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml index 55e33bd38f71..c8dcf6b81392 100644 --- a/eng/common/templates-official/steps/get-federated-access-token.yml +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -1,40 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: stepName - type: string - default: 'getFederatedAccessToken' -- name: condition - type: string - default: '' -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' -- name: isStepOutputVariable - type: boolean - default: false - steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - name: ${{ parameters.stepName }} - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml new file mode 100644 index 000000000000..100a3fc98493 --- /dev/null +++ b/eng/common/templates-official/steps/publish-build-artifacts.yml @@ -0,0 +1,41 @@ +parameters: +- name: displayName + type: string + default: 'Publish to Build Artifact' + +- name: condition + type: string + default: succeeded() + +- name: artifactName + type: string + +- name: pathToPublish + type: string + +- name: continueOnError + type: boolean + default: false + +- name: publishLocation + type: string + default: 'Container' + +- name: is1ESPipeline + type: boolean + default: true + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error +- task: 1ES.PublishBuildArtifacts@1 + displayName: ${{ parameters.displayName }} + condition: ${{ parameters.condition }} + ${{ if parameters.continueOnError }}: + continueOnError: ${{ parameters.continueOnError }} + inputs: + PublishLocation: ${{ parameters.publishLocation }} + PathtoPublish: ${{ parameters.pathToPublish }} + ${{ if parameters.artifactName }}: + ArtifactName: ${{ parameters.artifactName }} + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml index af5a40b64c4b..579fd531e94c 100644 --- a/eng/common/templates-official/steps/publish-logs.yml +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -1,23 +1,7 @@ -parameters: - StageLabel: '' - JobLabel: '' - steps: -- task: Powershell@2 - displayName: Prepare Binlogs to Upload - inputs: - targetType: inline - script: | - New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - continueOnError: true - condition: always() +- template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: true -- task: 1ES.PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/PostBuildLogs' - PublishLocation: Container - ArtifactName: PostBuildLogs - continueOnError: true - condition: always() + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/publish-pipeline-artifacts.yml b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml new file mode 100644 index 000000000000..172f9f0fdc97 --- /dev/null +++ b/eng/common/templates-official/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,28 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: true + +- name: args + type: object + default: {} + +steps: +- ${{ if ne(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates-official cannot be referenced from a non-1ES managed template': error +- task: 1ES.PublishPipelineArtifact@1 + displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} + ${{ if parameters.args.condition }}: + condition: ${{ parameters.args.condition }} + ${{ else }}: + condition: succeeded() + ${{ if parameters.args.continueOnError }}: + continueOnError: ${{ parameters.args.continueOnError }} + inputs: + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.properties }}: + properties: ${{ parameters.args.properties }} + ${{ if parameters.args.sbomEnabled }}: + sbomEnabled: ${{ parameters.args.sbomEnabled }} diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml index 83d97a26a01f..5594551508a3 100644 --- a/eng/common/templates-official/steps/retain-build.yml +++ b/eng/common/templates-official/steps/retain-build.yml @@ -1,28 +1,7 @@ -parameters: - # Optional azure devops PAT with build execute permissions for the build's organization, - # only needed if the build that should be retained ran on a different organization than - # the pipeline where this template is executing from - Token: '' - # Optional BuildId to retain, defaults to the current running build - BuildId: '' - # Azure devops Organization URI for the build in the https://dev.azure.com/ format. - # Defaults to the organization the current pipeline is running on - AzdoOrgUri: '$(System.CollectionUri)' - # Azure devops project for the build. Defaults to the project the current pipeline is running on - AzdoProject: '$(System.TeamProject)' - steps: - - task: powershell@2 - inputs: - targetType: 'filePath' - filePath: eng/common/retain-build.ps1 - pwsh: true - arguments: > - -AzdoOrgUri: ${{parameters.AzdoOrgUri}} - -AzdoProject ${{parameters.AzdoProject}} - -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} - -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} - displayName: Enable permanent build retention - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - BUILD_ID: $(Build.BuildId) \ No newline at end of file +- template: /eng/common/core-templates/steps/retain-build.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml index 22f2501307d4..6500f21bf845 100644 --- a/eng/common/templates-official/steps/send-to-helix.yml +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -1,92 +1,7 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' - HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group - HelixConfiguration: '' # optional -- additional property attached to a job - HelixPreCommands: '' # optional -- commands to run before Helix work item execution - HelixPostCommands: '' # optional -- commands to run after Helix work item execution - HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj - WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects - WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects - WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true - XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects - XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects - XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner - XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects - IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." - IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO - condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() - continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false - steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} +- template: /eng/common/core-templates/steps/send-to-helix.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index c307825c9122..8f92c49e7b06 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -1,135 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. - - # This is a 'steps' template, and is intended for advanced scenarios where the existing build - # infra has a careful build methodology that must be followed. For example, a repo - # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline - # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to - # GitHub. Using this steps template leaves room for that infra to be included. - - # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' - # for details. The entire object is described in the 'job' template for simplicity, even though - # the usage of the properties on this object is split between the 'job' and 'steps' templates. - platform: {} - - # Optional list of directories to ignore for component governance scans. - cgIgnoreDirectories: [] - steps: -# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) -- script: | - set -x - df -h - - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. - # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. - # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those - # changes. - internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then - # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh - $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh $(System.DefaultWorkingDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) - internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. - # This only works if there is a username/email configured, which won't be the case in most CI runs. - git config --get user.email - if [ $? -ne 0 ]; then - git config user.email dn-bot@microsoft.com - git config user.name dn-bot - fi - fi - - # If building on the internal project, the internal storage variable may be available (usually only if needed) - # In that case, add variables to allow the download of internal runtimes if the specified versions are not found - # in the default public locations. - internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' - fi - - buildConfig=Release - # Check if AzDO substitutes in a build config from a variable, and use it if so. - if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then - buildConfig='$(_BuildConfig)' - fi - - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - - targetRidArgs= - if [ '${{ parameters.platform.targetRID }}' != '' ]; then - targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' - fi - - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - - baseOsArgs= - if [ '${{ parameters.platform.baseOS }}' != '' ]; then - baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' - fi - - publishArgs= - if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then - publishArgs='--publish' - fi - - assetManifestFileName=SourceBuild_RidSpecific.xml - if [ '${{ parameters.platform.name }}' != '' ]; then - assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml - fi - - ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ - --configuration $buildConfig \ - --restore --build --pack $publishArgs -bl \ - $officialBuildArgs \ - $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ - $targetRidArgs \ - $runtimeOsArgs \ - $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ - /p:AssetManifestFileName=$assetManifestFileName - displayName: Build - -# Upload build logs for diagnosis. -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)' - Contents: | - **/*.log - **/*.binlog - artifacts/source-build/self/prebuilt-report/** - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - -- task: 1ES.PublishPipelineArtifact@1 - displayName: Publish BuildLogs - inputs: - targetPath: '$(Build.StagingDirectory)/BuildLogs' - artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) - continueOnError: true - condition: succeededOrFailed() +- template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: true -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- task: ComponentGovernanceComponentDetection@0 - displayName: Component Detection (Exclude upstream cache) - inputs: - ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: - ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' - ${{ else }}: - ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 80454d5a5587..5bdd3dd85fd2 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -1,263 +1,82 @@ -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - -parameters: -# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - cancelTimeoutInMinutes: '' - condition: '' - container: '' - continueOnError: false - dependsOn: '' - displayName: '' - pool: '' - steps: [] - strategy: '' - timeoutInMinutes: '' - variables: [] - workspace: '' - templateContext: '' - -# Job base template specific parameters - # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md - artifacts: '' - enableMicrobuild: false +parameters: enablePublishBuildArtifacts: false - enablePublishBuildAssets: false - enablePublishTestResults: false - enablePublishUsingPipelines: false - enableBuildRetry: false disableComponentGovernance: '' componentGovernanceIgnoreDirectories: '' - mergeTestResults: false - testRunTitle: '' - testResultsFormat: '' - name: '' - preSteps: [] - runAsPublic: false # Sbom related params enableSbom: true - PackageVersion: 7.0.0 + runAsPublic: false + PackageVersion: 9.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: -- job: ${{ parameters.name }} - - ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: - cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} - - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - - ${{ if ne(parameters.container, '') }}: - container: ${{ parameters.container }} - - ${{ if ne(parameters.continueOnError, '') }}: - continueOnError: ${{ parameters.continueOnError }} - - ${{ if ne(parameters.dependsOn, '') }}: - dependsOn: ${{ parameters.dependsOn }} - - ${{ if ne(parameters.displayName, '') }}: - displayName: ${{ parameters.displayName }} - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - - ${{ if ne(parameters.strategy, '') }}: - strategy: ${{ parameters.strategy }} - - ${{ if ne(parameters.timeoutInMinutes, '') }}: - timeoutInMinutes: ${{ parameters.timeoutInMinutes }} - - ${{ if ne(parameters.templateContext, '') }}: - templateContext: ${{ parameters.templateContext }} - - variables: - - ${{ if ne(parameters.enableTelemetry, 'false') }}: - - name: DOTNET_CLI_TELEMETRY_PROFILE - value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' - # Retry signature validation up to three times, waiting 2 seconds between attempts. - # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY - value: 3,2000 - - ${{ each variable in parameters.variables }}: - # handle name-value variable syntax - # example: - # - name: [key] - # value: [value] - - ${{ if ne(variable.name, '') }}: - - name: ${{ variable.name }} - value: ${{ variable.value }} - - # handle variable groups - - ${{ if ne(variable.group, '') }}: - - group: ${{ variable.group }} +- template: /eng/common/core-templates/job/job.yml + parameters: + is1ESPipeline: false - # handle template variable syntax - # example: - # - template: path/to/template.yml - # parameters: - # [key]: [value] - - ${{ if ne(variable.template, '') }}: - - template: ${{ variable.template }} - ${{ if ne(variable.parameters, '') }}: - parameters: ${{ variable.parameters }} + ${{ each parameter in parameters }}: + ${{ if and(ne(parameter.key, 'steps'), ne(parameter.key, 'is1ESPipeline')) }}: + ${{ parameter.key }}: ${{ parameter.value }} - # handle key-value variable syntax. - # example: - # - [key]: [value] - - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: - - ${{ each pair in variable }}: - - name: ${{ pair.key }} - value: ${{ pair.value }} + steps: + - ${{ each step in parameters.steps }}: + - ${{ step }} - # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds - - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: DotNet-HelixApi-Access - - ${{ if ne(parameters.workspace, '') }}: - workspace: ${{ parameters.workspace }} - - steps: - - ${{ if ne(parameters.preSteps, '') }}: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + componentGovernanceSteps: + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - - - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@1 - - - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - - task: DownloadPipelineArtifact@2 - inputs: - buildType: current - artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} - targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} - itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} - - - ${{ each step in parameters.steps }}: - - ${{ step }} - - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} - richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - - template: /eng/common/templates/steps/component-governance.yml - parameters: - ${{ if eq(parameters.disableComponentGovernance, '') }}: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: - disableComponentGovernance: false + disableComponentGovernance: true ${{ else }}: - disableComponentGovernance: true - ${{ else }}: - disableComponentGovernance: ${{ parameters.disableComponentGovernance }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) - - - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - - task: CopyFiles@2 - displayName: Gather binaries for publish to artifacts - inputs: - SourceFolder: 'artifacts/bin' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' - - task: CopyFiles@2 - displayName: Gather packages for publish to artifacts - inputs: - SourceFolder: 'artifacts/packages' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' - - task: PublishBuildArtifacts@1 - displayName: Publish pipeline artifacts - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} - continueOnError: true - condition: always() - - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - publish: artifacts/log - artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: Publish logs - continueOnError: true - condition: always() - - - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: - - task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/artifacts/log/$(_BuildConfig)' - PublishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} - continueOnError: true - condition: always() - - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: - - task: PublishTestResults@2 - displayName: Publish XUnit Test Results - inputs: - testResultsFormat: 'xUnit' - testResultsFiles: '*.xml' - searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: - - task: PublishTestResults@2 - displayName: Publish TRX Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '*.trx' - searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' - testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx - mergeTestResults: ${{ parameters.mergeTestResults }} - continueOnError: true - condition: always() - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: - - template: /eng/common/templates/steps/generate-sbom.yml - parameters: - PackageVersion: ${{ parameters.packageVersion}} - BuildDropPath: ${{ parameters.buildDropPath }} - IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - - - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish build retry configuration - continueOnError: true + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + artifactPublishSteps: + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish pipeline artifacts + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + publishLocation: Container + artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + targetPath: '$(Build.ArtifactStagingDirectory)/artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + sbomEnabled: false # we don't need SBOM for logs + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + parameters: + is1ESPipeline: false + args: + displayName: Publish Logs + pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' + publishLocation: Container + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: false + args: + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true + sbomEnabled: false # we don't need SBOM for BuildConfiguration diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 2cd3840c9927..ff829dc4c700 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -1,109 +1,7 @@ -parameters: - # Optional: dependencies of the job - dependsOn: '' - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: '' - - CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex - GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - - SourcesDirectory: $(System.DefaultWorkingDirectory) - CreatePr: true - AutoCompletePr: false - ReusePr: true - UseLfLineEndings: true - UseCheckedInLocProjectJson: false - SkipLocProjectJsonGeneration: false - LanguageSet: VS_Main_Languages - LclSource: lclFilesInRepo - LclPackageId: '' - RepoType: gitHub - GitHubOrg: dotnet - MirrorRepo: '' - MirrorBranch: main - condition: '' - JobNameSuffix: '' - jobs: -- job: OneLocBuild${{ parameters.JobNameSuffix }} - - dependsOn: ${{ parameters.dependsOn }} - - displayName: OneLocBuild${{ parameters.JobNameSuffix }} - - variables: - - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat - - name: _GenerateLocProjectArguments - value: -SourcesDirectory ${{ parameters.SourcesDirectory }} - -LanguageSet "${{ parameters.LanguageSet }}" - -CreateNeutralXlfs - - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - - name: _GenerateLocProjectArguments - value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - - task: Powershell@2 - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 - arguments: $(_GenerateLocProjectArguments) - displayName: Generate LocProject.json - condition: ${{ parameters.condition }} - - - task: OneLocBuild@2 - displayName: OneLocBuild - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - inputs: - locProj: eng/Localize/LocProject.json - outDir: $(Build.ArtifactStagingDirectory) - lclSource: ${{ parameters.LclSource }} - lclPackageId: ${{ parameters.LclPackageId }} - isCreatePrSelected: ${{ parameters.CreatePr }} - isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} - ${{ if eq(parameters.CreatePr, true) }}: - isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - isShouldReusePrSelected: ${{ parameters.ReusePr }} - packageSourceAuth: patAuth - patVariable: ${{ parameters.CeapexPat }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - repoType: ${{ parameters.RepoType }} - gitHubPatVariable: "${{ parameters.GithubPat }}" - ${{ if ne(parameters.MirrorRepo, '') }}: - isMirrorRepoSelected: true - gitHubOrganization: ${{ parameters.GitHubOrg }} - mirrorRepo: ${{ parameters.MirrorRepo }} - mirrorBranch: ${{ parameters.MirrorBranch }} - condition: ${{ parameters.condition }} - - - task: PublishBuildArtifacts@1 - displayName: Publish Localization Files - inputs: - PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} +- template: /eng/common/core-templates/job/onelocbuild.yml + parameters: + is1ESPipeline: false - - task: PublishBuildArtifacts@1 - displayName: Publish LocProject.json - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' - PublishLocation: Container - ArtifactName: Loc - condition: ${{ parameters.condition }} \ No newline at end of file + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index b4ece772c326..ab2edec2adb5 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -1,173 +1,7 @@ -parameters: - configuration: 'Debug' - - # Optional: condition for the job to run - condition: '' - - # Optional: 'true' if future jobs should run even if this job fails - continueOnError: false - - # Optional: dependencies of the job - dependsOn: '' - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool - pool: {} - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishUsingPipelines: false - - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishAssetsImmediately: false - - artifactsPublishingAdditionalParameters: '' - - signingValidationAdditionalParameters: '' - - repositoryAlias: self - - officialBuildId: '' - jobs: -- job: Asset_Registry_Publish - - dependsOn: ${{ parameters.dependsOn }} - timeoutInMinutes: 150 - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - displayName: Publish Assets - ${{ else }}: - displayName: Publish to Build Asset Registry - - variables: - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: Publish-Build-Assets - - group: AzureDevOps-Artifact-Feeds-Pats - - name: runCodesignValidationInjection - value: false - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/common-variables.yml - - name: OfficialBuildId - ${{ if ne(parameters.officialBuildId, '') }}: - value: ${{ parameters.officialBuildId }} - ${{ else }}: - value: $(Build.BuildNumber) - - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: ${{ parameters.repositoryAlias }} - fetchDepth: 3 - clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: NuGetAuthenticate@1 - - - task: AzureCLI@2 - displayName: Publish Build Assets - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 - arguments: > - -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(OfficialBuildId) - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} - - - task: powershell@2 - displayName: Create ReleaseConfigs Artifact - inputs: - targetType: inline - script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - - - task: PublishBuildArtifacts@1 - displayName: Publish ReleaseConfigs Artifact - inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - task: powershell@2 - displayName: Check if SymbolPublishingExclusionsFile.txt exists - inputs: - targetType: inline - script: | - $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" - if(Test-Path -Path $symbolExclusionfile) - { - Write-Host "SymbolExclusionFile exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" - } - else{ - Write-Host "Symbols Exclusion file does not exists" - Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" - } - - - task: PublishBuildArtifacts@1 - displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt' - PublishLocation: Container - ArtifactName: ReleaseConfigs - - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - - template: /eng/common/templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion 3 - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' +- template: /eng/common/core-templates/job/publish-build-assets.yml + parameters: + is1ESPipeline: false - - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - - template: /eng/common/templates/steps/publish-logs.yml - parameters: - JobLabel: 'Publish_Artifacts_Logs' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 97021335cfc4..e44d47b1d760 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -1,78 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. The template produces a server job with a - # default ID 'Source_Build_Complete' to put in a dependency list if necessary. - - # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. - jobNamePrefix: 'Source_Build' - - # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for - # managed-only repositories. This is an object with these properties: - # - # name: '' - # The name of the job. This is included in the job ID. - # targetRID: '' - # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false - # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. - # skipPublishValidation: false - # Disables publishing validation. By default, a check is performed to ensure no packages are - # published by source-build. - # container: '' - # A container to use. Runs in docker. - # pool: {} - # A pool to use. Runs directly on an agent. - # buildScript: '' - # Specifies the build script to invoke to perform the build in the repo. The default - # './build.sh' should work for typical Arcade repositories, but this is customizable for - # difficult situations. - # jobProperties: {} - # A list of job properties to inject at the top level, for potential extensibility beyond - # container and pool. - platform: {} - - # Optional list of directories to ignore for component governance scans. - cgIgnoreDirectories: [] - - # If set to true and running on a non-public project, - # Internal blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: -- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} - displayName: Source-Build (${{ parameters.platform.name }}) - - ${{ each property in parameters.platform.jobProperties }}: - ${{ property.key }}: ${{ property.value }} - - ${{ if ne(parameters.platform.container, '') }}: - container: ${{ parameters.platform.container }} - - ${{ if eq(parameters.platform.pool, '') }}: - # The default VM host AzDO pool. This should be capable of running Docker containers: almost all - # source-build builds run in Docker, including the default managed platform. - # /eng/common/templates/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 - - ${{ if ne(parameters.platform.pool, '') }}: - pool: ${{ parameters.platform.pool }} - - workspace: - clean: all +- template: /eng/common/core-templates/job/source-build.yml + parameters: + is1ESPipeline: false - steps: - - ${{ if eq(parameters.enableInternalSources, true) }}: - - template: /eng/common/templates/steps/enable-internal-runtimes.yml - - template: /eng/common/templates/steps/source-build.yml - parameters: - platform: ${{ parameters.platform }} - cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 81606fd9a541..89f3291593cb 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,82 +1,7 @@ -parameters: - runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 - sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json - sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" - preSteps: [] - binlogPath: artifacts/log/Debug/Build.binlog - condition: '' - dependsOn: '' - pool: '' - jobs: -- job: SourceIndexStage1 - dependsOn: ${{ parameters.dependsOn }} - condition: ${{ parameters.condition }} - variables: - - name: SourceIndexUploadPackageVersion - value: ${{ parameters.sourceIndexUploadPackageVersion }} - - name: SourceIndexProcessBinlogPackageVersion - value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - - name: BinlogPath - value: ${{ parameters.binlogPath }} - - template: /eng/common/templates/variables/pool-providers.yml - - ${{ if ne(parameters.pool, '') }}: - pool: ${{ parameters.pool }} - ${{ if eq(parameters.pool, '') }}: - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - ${{ each preStep in parameters.preSteps }}: - - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - - script: ${{ parameters.sourceIndexBuildCommand }} - displayName: Build Repository - - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Get stage 1 auth token - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - - - script: | - az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) - displayName: "Login to Azure" +- template: /eng/common/core-templates/job/source-index-stage1.yml + parameters: + is1ESPipeline: false - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/codeql-build.yml b/eng/common/templates/jobs/codeql-build.yml index e8b43e3b4cba..517f24d6a52c 100644 --- a/eng/common/templates/jobs/codeql-build.yml +++ b/eng/common/templates/jobs/codeql-build.yml @@ -1,31 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - # Optional: if specified, restore and use this version of Guardian instead of the default. - overrideGuardianVersion: '' - jobs: -- template: /eng/common/templates/jobs/jobs.yml +- template: /eng/common/core-templates/jobs/codeql-build.yml parameters: - enableMicrobuild: false - enablePublishBuildArtifacts: false - enablePublishTestResults: false - enablePublishBuildAssets: false - enablePublishUsingPipelines: false - enableTelemetry: true + is1ESPipeline: false - variables: - - group: Publish-Build-Assets - # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in - # sync with the packages.config file. - - name: DefaultGuardianVersion - value: 0.109.0 - - name: GuardianPackagesConfigFile - value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - - name: GuardianVersion - value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} - - jobs: ${{ parameters.jobs }} - + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 7eafc256758f..388e9037b3e6 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -1,101 +1,7 @@ -parameters: - # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md - continueOnError: false - - # Optional: Include PublishBuildArtifacts task - enablePublishBuildArtifacts: false - - # Optional: Enable publishing using release pipelines - enablePublishUsingPipelines: false - - # Optional: Enable running the source-build jobs to build repo from source - enableSourceBuild: false - - # Optional: Parameters for source-build template. - # See /eng/common/templates/jobs/source-build.yml for options - sourceBuildParameters: [] - - graphFileGeneration: - # Optional: Enable generating the graph files at the end of the build - enabled: false - # Optional: Include toolset dependencies in the generated graph files - includeToolset: false - - # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job - jobs: [] - - # Optional: Override automatically derived dependsOn value for "publish build assets" job - publishBuildAssetsDependsOn: '' - - # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. - publishAssetsImmediately: false - - # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) - artifactsPublishingAdditionalParameters: '' - signingValidationAdditionalParameters: '' - - # Optional: should run as a public build even in the internal project - # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. - runAsPublic: false - - enableSourceIndex: false - sourceIndexParams: {} - repositoryAlias: self - officialBuildId: '' - -# Internal resources (telemetry, microbuild) can only be accessed from non-public projects, -# and some (Microbuild) should only be applied to non-PR cases for internal builds. - jobs: -- ${{ each job in parameters.jobs }}: - - template: ../job/job.yml - parameters: - # pass along parameters - ${{ each parameter in parameters }}: - ${{ if ne(parameter.key, 'jobs') }}: - ${{ parameter.key }}: ${{ parameter.value }} - - # pass along job properties - ${{ each property in job }}: - ${{ if ne(property.key, 'job') }}: - ${{ property.key }}: ${{ property.value }} - - name: ${{ job.job }} - -- ${{ if eq(parameters.enableSourceBuild, true) }}: - - template: /eng/common/templates/jobs/source-build.yml - parameters: - allCompletedJobId: Source_Build_Complete - ${{ each parameter in parameters.sourceBuildParameters }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if eq(parameters.enableSourceIndex, 'true') }}: - - template: ../job/source-index-stage1.yml - parameters: - runAsPublic: ${{ parameters.runAsPublic }} - ${{ each parameter in parameters.sourceIndexParams }}: - ${{ parameter.key }}: ${{ parameter.value }} - -- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - - template: ../job/publish-build-assets.yml - parameters: - continueOnError: ${{ parameters.continueOnError }} - dependsOn: - - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.publishBuildAssetsDependsOn }}: - - ${{ job.job }} - - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - - ${{ each job in parameters.jobs }}: - - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete +- template: /eng/common/core-templates/jobs/jobs.yml + parameters: + is1ESPipeline: false - runAsPublic: ${{ parameters.runAsPublic }} - publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} - enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} - artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} - signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} - repositoryAlias: ${{ parameters.repositoryAlias }} - officialBuildId: ${{ parameters.officialBuildId }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 4dde599add97..818d4c326dbb 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -1,59 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. A job is created for each platform, as - # well as an optional server job that completes when all platform jobs complete. - - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - - # See /eng/common/templates/job/source-build.yml - jobNamePrefix: 'Source_Build' - - # This is the default platform provided by Arcade, intended for use by a managed-only repo. - defaultManagedPlatform: - name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-9-amd64' - - # Defines the platforms on which to run build jobs. One job is created for each platform, and the - # object in this array is sent to the job template as 'platform'. If no platforms are specified, - # one job runs on 'defaultManagedPlatform'. - platforms: [] - - # Optional list of directories to ignore for component governance scans. - cgIgnoreDirectories: [] - - # If set to true and running on a non-public project, - # Internal nuget and blob storage locations will be enabled. - # This is not enabled by default because many repositories do not need internal sources - # and do not need to have the required service connections approved in the pipeline. - enableInternalSources: false - jobs: +- template: /eng/common/core-templates/jobs/source-build.yml + parameters: + is1ESPipeline: false -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - -- ${{ each platform in parameters.platforms }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ platform }} - cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} - enableInternalSources: ${{ parameters.enableInternalSources }} - -- ${{ if eq(length(parameters.platforms), 0) }}: - - template: /eng/common/templates/job/source-build.yml - parameters: - jobNamePrefix: ${{ parameters.jobNamePrefix }} - platform: ${{ parameters.defaultManagedPlatform }} - cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} - enableInternalSources: ${{ parameters.enableInternalSources }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 173914f2364a..7fa105875592 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,22 +1,8 @@ variables: - - group: Publish-Build-Assets +- template: /eng/common/core-templates/post-build/common-variables.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false - # Whether the build is internal or not - - name: IsInternalBuild - value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} - - # Default Maestro++ API Endpoint and API Version - - name: MaestroApiEndPoint - value: "https://maestro.dot.net" - - name: MaestroApiAccessToken - value: $(MaestroAccessToken) - - name: MaestroApiVersion - value: "2020-02-20" - - - name: SourceLinkCLIVersion - value: 3.0.0 - - name: SymbolToolVersion - value: 1.0.1 - - - name: runCodesignValidationInjection - value: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 96ca06882384..53ede714bdd2 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -1,287 +1,8 @@ -parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - stages: -- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - - stage: Validate - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Validate Build Assets - variables: - - template: common-variables.yml - - template: /eng/common/templates/variables/pool-providers.yml - jobs: - - job: - displayName: NuGet Validation - condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - - - job: - displayName: Signing Validation - condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: ../steps/publish-logs.yml - parameters: - StageLabel: 'Validation' - JobLabel: 'Signing' - - - job: - displayName: SourceLink Validation - condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true - - - template: /eng/common/templates/job/execute-sdl.yml - parameters: - enable: ${{ parameters.SDLValidationParameters.enable }} - publishGuardianDirectoryToPipeline: ${{ parameters.SDLValidationParameters.publishGdn }} - additionalParameters: ${{ parameters.SDLValidationParameters.params }} - continueOnError: ${{ parameters.SDLValidationParameters.continueOnError }} - artifactNames: ${{ parameters.SDLValidationParameters.artifactNames }} - downloadArtifacts: ${{ parameters.SDLValidationParameters.downloadArtifacts }} - -- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - - stage: publish_using_darc - ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: - dependsOn: ${{ parameters.publishDependsOn }} - ${{ else }}: - dependsOn: ${{ parameters.validateDependsOn }} - displayName: Publish using Darc - variables: - - template: common-variables.yml - - template: /eng/common/templates/variables/pool-providers.yml - jobs: - - job: - displayName: Publish Using Darc - timeoutInMinutes: 120 - pool: - # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - name: VSEngSS-MicroBuild2022-1ES - demands: Cmd - # If it's not devdiv, it's dnceng - ${{ else }}: - name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 - steps: - - template: setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - - task: NuGetAuthenticate@1 - - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x +- template: /eng/common/core-templates/post-build/post-build.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) - -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(System.AccessToken)' - -WaitPublishingFinish true - -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' - -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 4347fa80b684..a79fab5b441e 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -1,70 +1,8 @@ -parameters: - BARBuildId: '' - PromoteToChannelIds: '' - steps: - - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: - - task: DownloadBuildArtifacts@0 - displayName: Download Release Configs - inputs: - buildType: current - artifactName: ReleaseConfigs - checkDownloadedFiles: true - - - task: AzureCLI@2 - name: setReleaseVars - displayName: Set Release Configs Vars - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: pscore - scriptLocation: inlineScript - inlineScript: | - try { - if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { - $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt - - $BarId = $Content | Select -Index 0 - $Channels = $Content | Select -Index 1 - $IsStableBuild = $Content | Select -Index 2 - - $AzureDevOpsProject = $Env:System_TeamProject - $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId - $AzureDevOpsBuildId = $Env:Build_BuildId - } - else { - . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 - $darc = Get-Darc - $buildInfo = & $darc get-build ` - --id ${{ parameters.BARBuildId }} ` - --extended ` - --output-format json ` - --ci ` - | convertFrom-Json - - $BarId = ${{ parameters.BARBuildId }} - $Channels = $Env:PromoteToMaestroChannels -split "," - $Channels = $Channels -join "][" - $Channels = "[$Channels]" - - $IsStableBuild = $buildInfo.stable - $AzureDevOpsProject = $buildInfo.azureDevOpsProject - $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId - $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId - } - - Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" - Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" - Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" +- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + # Specifies whether to use 1ES + is1ESPipeline: false - Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" - Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" - Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" - } - catch { - Write-Host $_ - Write-Host $_.Exception - Write-Host $_.ScriptStackTrace - exit 1 - } - env: - PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index cbba0596709d..c12a5f8d21d7 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -1,13 +1,7 @@ -parameters: - disableComponentGovernance: false - componentGovernanceIgnoreDirectories: '' - steps: -- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" - displayName: Set skipComponentGovernanceDetection variable -- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - - task: ComponentGovernanceComponentDetection@0 - continueOnError: true - inputs: - ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file +- template: /eng/common/core-templates/steps/component-governance.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml index 54dc9416c519..b21a8038cc1c 100644 --- a/eng/common/templates/steps/enable-internal-runtimes.yml +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -1,28 +1,10 @@ # Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' # variable with the base64-encoded SAS token, by default -parameters: -- name: federatedServiceConnection - type: string - default: 'dotnetbuilds-internal-read' -- name: outputVariableName - type: string - default: 'dotnetbuilds-internal-container-read-token-base64' -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: true - steps: -- ${{ if ne(variables['System.TeamProject'], 'public') }}: - - template: /eng/common/templates/steps/get-delegation-sas.yml - parameters: - federatedServiceConnection: ${{ parameters.federatedServiceConnection }} - outputVariableName: ${{ parameters.outputVariableName }} - expiryInHours: ${{ parameters.expiryInHours }} - base64Encode: ${{ parameters.base64Encode }} - storageAccount: dotnetbuilds - container: internal - permissions: rl +- template: /eng/common/core-templates/steps/enable-internal-runtimes.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/enable-internal-sources.yml b/eng/common/templates/steps/enable-internal-sources.yml new file mode 100644 index 000000000000..5f87e9abb8aa --- /dev/null +++ b/eng/common/templates/steps/enable-internal-sources.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/enable-internal-sources.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index b1fe8b3944b3..26dc00a2e0f3 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -1,48 +1,7 @@ -# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. -# PackageName - The name of the package this SBOM represents. -# PackageVersion - The version of the package this SBOM represents. -# ManifestDirPath - The path of the directory where the generated manifest files will be placed -# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. - -parameters: - PackageVersion: 8.0.0 - BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' - PackageName: '.NET' - ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom - IgnoreDirectories: '' - sbomContinueOnError: true - steps: -- task: PowerShell@2 - displayName: Prep for SBOM generation in (Non-linux) - condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) - inputs: - filePath: ./eng/common/generate-sbom-prep.ps1 - arguments: ${{parameters.manifestDirPath}} - -# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 -- script: | - chmod +x ./eng/common/generate-sbom-prep.sh - ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} - displayName: Prep for SBOM generation in (Linux) - condition: eq(variables['Agent.Os'], 'Linux') - continueOnError: ${{ parameters.sbomContinueOnError }} - -- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 - displayName: 'Generate SBOM manifest' - continueOnError: ${{ parameters.sbomContinueOnError }} - inputs: - PackageName: ${{ parameters.packageName }} - BuildDropPath: ${{ parameters.buildDropPath }} - PackageVersion: ${{ parameters.packageVersion }} - ManifestDirPath: ${{ parameters.manifestDirPath }} - ${{ if ne(parameters.IgnoreDirectories, '') }}: - AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' - -- task: PublishPipelineArtifact@1 - displayName: Publish SBOM manifest - continueOnError: ${{parameters.sbomContinueOnError}} - inputs: - targetPath: '${{parameters.manifestDirPath}}' - artifactName: $(ARTIFACT_NAME) +- template: /eng/common/core-templates/steps/generate-sbom.yml + parameters: + is1ESPipeline: false + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index c690cc0a070c..83760c9798e3 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -1,52 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: expiryInHours - type: number - default: 1 -- name: base64Encode - type: boolean - default: false -- name: storageAccount - type: string -- name: container - type: string -- name: permissions - type: string - default: 'rl' - steps: -- task: AzureCLI@2 - displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - # Calculate the expiration of the SAS token and convert to UTC - $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) - - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - - if ('${{ parameters.base64Encode }}' -eq 'true') { - $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) - } +- template: /eng/common/core-templates/steps/get-delegation-sas.yml + parameters: + is1ESPipeline: false - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml index 55e33bd38f71..31e151d9d9e7 100644 --- a/eng/common/templates/steps/get-federated-access-token.yml +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -1,40 +1,7 @@ -parameters: -- name: federatedServiceConnection - type: string -- name: outputVariableName - type: string -- name: stepName - type: string - default: 'getFederatedAccessToken' -- name: condition - type: string - default: '' -# Resource to get a token for. Common values include: -# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps -# - 'https://storage.azure.com/' for storage -# Defaults to Azure DevOps -- name: resource - type: string - default: '499b84ac-1321-427f-aa17-267ca6975798' -- name: isStepOutputVariable - type: boolean - default: false - steps: -- task: AzureCLI@2 - displayName: 'Getting federated access token for feeds' - name: ${{ parameters.stepName }} - ${{ if ne(parameters.condition, '') }}: - condition: ${{ parameters.condition }} - inputs: - azureSubscription: ${{ parameters.federatedServiceConnection }} - scriptType: 'pscore' - scriptLocation: 'inlineScript' - inlineScript: | - $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" - exit 1 - } - Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file +- template: /eng/common/core-templates/steps/get-federated-access-token.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml new file mode 100644 index 000000000000..6428a98dfef6 --- /dev/null +++ b/eng/common/templates/steps/publish-build-artifacts.yml @@ -0,0 +1,40 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: displayName + type: string + default: 'Publish to Build Artifact' + +- name: condition + type: string + default: succeeded() + +- name: artifactName + type: string + +- name: pathToPublish + type: string + +- name: continueOnError + type: boolean + default: false + +- name: publishLocation + type: string + default: 'Container' + +steps: +- ${{ if eq(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates cannot be referenced from a 1ES managed template': error +- task: PublishBuildArtifacts@1 + displayName: ${{ parameters.displayName }} + condition: ${{ parameters.condition }} + ${{ if parameters.continueOnError }}: + continueOnError: ${{ parameters.continueOnError }} + inputs: + PublishLocation: ${{ parameters.publishLocation }} + PathtoPublish: ${{ parameters.pathToPublish }} + ${{ if parameters.artifactName }}: + ArtifactName: ${{ parameters.artifactName }} \ No newline at end of file diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index e2f8413d8e19..4ea86bd88235 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -1,23 +1,7 @@ -parameters: - StageLabel: '' - JobLabel: '' - steps: -- task: Powershell@2 - displayName: Prepare Binlogs to Upload - inputs: - targetType: inline - script: | - New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - continueOnError: true - condition: always() +- template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: false -- task: PublishBuildArtifacts@1 - displayName: Publish Logs - inputs: - PathtoPublish: '$(System.DefaultWorkingDirectory)/PostBuildLogs' - PublishLocation: Container - ArtifactName: PostBuildLogs - continueOnError: true - condition: always() + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/publish-pipeline-artifacts.yml b/eng/common/templates/steps/publish-pipeline-artifacts.yml new file mode 100644 index 000000000000..5dd698b212fc --- /dev/null +++ b/eng/common/templates/steps/publish-pipeline-artifacts.yml @@ -0,0 +1,34 @@ +parameters: +- name: is1ESPipeline + type: boolean + default: false + +- name: args + type: object + default: {} + +steps: +- ${{ if eq(parameters.is1ESPipeline, true) }}: + - 'eng/common/templates cannot be referenced from a 1ES managed template': error +- task: PublishPipelineArtifact@1 + displayName: ${{ coalesce(parameters.args.displayName, 'Publish to Build Artifact') }} + ${{ if parameters.args.condition }}: + condition: ${{ parameters.args.condition }} + ${{ else }}: + condition: succeeded() + ${{ if parameters.args.continueOnError }}: + continueOnError: ${{ parameters.args.continueOnError }} + inputs: + targetPath: ${{ parameters.args.targetPath }} + ${{ if parameters.args.artifactName }}: + artifactName: ${{ parameters.args.artifactName }} + ${{ if parameters.args.publishLocation }}: + publishLocation: ${{ parameters.args.publishLocation }} + ${{ if parameters.args.fileSharePath }}: + fileSharePath: ${{ parameters.args.fileSharePath }} + ${{ if parameters.args.Parallel }}: + parallel: ${{ parameters.args.Parallel }} + ${{ if parameters.args.parallelCount }}: + parallelCount: ${{ parameters.args.parallelCount }} + ${{ if parameters.args.properties }}: + properties: ${{ parameters.args.properties }} \ No newline at end of file diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml index 83d97a26a01f..8e841ace3d29 100644 --- a/eng/common/templates/steps/retain-build.yml +++ b/eng/common/templates/steps/retain-build.yml @@ -1,28 +1,7 @@ -parameters: - # Optional azure devops PAT with build execute permissions for the build's organization, - # only needed if the build that should be retained ran on a different organization than - # the pipeline where this template is executing from - Token: '' - # Optional BuildId to retain, defaults to the current running build - BuildId: '' - # Azure devops Organization URI for the build in the https://dev.azure.com/ format. - # Defaults to the organization the current pipeline is running on - AzdoOrgUri: '$(System.CollectionUri)' - # Azure devops project for the build. Defaults to the project the current pipeline is running on - AzdoProject: '$(System.TeamProject)' - steps: - - task: powershell@2 - inputs: - targetType: 'filePath' - filePath: eng/common/retain-build.ps1 - pwsh: true - arguments: > - -AzdoOrgUri: ${{parameters.AzdoOrgUri}} - -AzdoProject ${{parameters.AzdoProject}} - -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} - -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} - displayName: Enable permanent build retention - env: - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - BUILD_ID: $(Build.BuildId) \ No newline at end of file +- template: /eng/common/core-templates/steps/retain-build.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 22f2501307d4..39f99fc2762d 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -1,92 +1,7 @@ -# Please remember to update the documentation if you make changes to these parameters! -parameters: - HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ - HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' - HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues - HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group - HelixConfiguration: '' # optional -- additional property attached to a job - HelixPreCommands: '' # optional -- commands to run before Helix work item execution - HelixPostCommands: '' # optional -- commands to run after Helix work item execution - HelixProjectArguments: '' # optional -- arguments passed to the build command for helixpublish.proj - WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects - WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects - WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects - CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload - XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true - XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects - XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects - XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner - XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects - IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json - WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." - IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set - HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) - Creator: '' # optional -- if the build is external, use this to specify who is sending the job - DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO - condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() - continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false - steps: - - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' - displayName: ${{ parameters.DisplayNamePrefix }} (Windows) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} - - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj ${{ parameters.HelixProjectArguments }} /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog - displayName: ${{ parameters.DisplayNamePrefix }} (Unix) - env: - BuildConfig: $(_BuildConfig) - HelixSource: ${{ parameters.HelixSource }} - HelixType: ${{ parameters.HelixType }} - HelixBuild: ${{ parameters.HelixBuild }} - HelixConfiguration: ${{ parameters.HelixConfiguration }} - HelixTargetQueues: ${{ parameters.HelixTargetQueues }} - HelixAccessToken: ${{ parameters.HelixAccessToken }} - HelixPreCommands: ${{ parameters.HelixPreCommands }} - HelixPostCommands: ${{ parameters.HelixPostCommands }} - WorkItemDirectory: ${{ parameters.WorkItemDirectory }} - WorkItemCommand: ${{ parameters.WorkItemCommand }} - WorkItemTimeout: ${{ parameters.WorkItemTimeout }} - CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} - XUnitProjects: ${{ parameters.XUnitProjects }} - XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} - XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} - XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} - XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} - IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} - DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} - DotNetCliVersion: ${{ parameters.DotNetCliVersion }} - WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} - HelixBaseUri: ${{ parameters.HelixBaseUri }} - Creator: ${{ parameters.Creator }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) - continueOnError: ${{ parameters.continueOnError }} +- template: /eng/common/core-templates/steps/send-to-helix.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index d08a0e92caa4..23c1d6f4e9f8 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -1,135 +1,7 @@ -parameters: - # This template adds arcade-powered source-build to CI. - - # This is a 'steps' template, and is intended for advanced scenarios where the existing build - # infra has a careful build methodology that must be followed. For example, a repo - # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline - # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to - # GitHub. Using this steps template leaves room for that infra to be included. - - # Defines the platform on which to run the steps. See 'eng/common/templates/job/source-build.yml' - # for details. The entire object is described in the 'job' template for simplicity, even though - # the usage of the properties on this object is split between the 'job' and 'steps' templates. - platform: {} - - # Optional list of directories to ignore for component governance scans. - cgIgnoreDirectories: [] - steps: -# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) -- script: | - set -x - df -h - - # If building on the internal project, the artifact feeds variable may be available (usually only if needed) - # In that case, call the feed setup script to add internal feeds corresponding to public ones. - # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. - # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those - # changes. - internalRestoreArgs= - if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then - # Temporarily work around https://github.com/dotnet/arcade/issues/7709 - chmod +x $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh - $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh $(System.DefaultWorkingDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) - internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. - # This only works if there is a username/email configured, which won't be the case in most CI runs. - git config --get user.email - if [ $? -ne 0 ]; then - git config user.email dn-bot@microsoft.com - git config user.name dn-bot - fi - fi - - # If building on the internal project, the internal storage variable may be available (usually only if needed) - # In that case, add variables to allow the download of internal runtimes if the specified versions are not found - # in the default public locations. - internalRuntimeDownloadArgs= - if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' - fi - - buildConfig=Release - # Check if AzDO substitutes in a build config from a variable, and use it if so. - if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then - buildConfig='$(_BuildConfig)' - fi - - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - - targetRidArgs= - if [ '${{ parameters.platform.targetRID }}' != '' ]; then - targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' - fi - - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - - baseOsArgs= - if [ '${{ parameters.platform.baseOS }}' != '' ]; then - baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' - fi - - publishArgs= - if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then - publishArgs='--publish' - fi - - assetManifestFileName=SourceBuild_RidSpecific.xml - if [ '${{ parameters.platform.name }}' != '' ]; then - assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml - fi - - ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ - --configuration $buildConfig \ - --restore --build --pack $publishArgs -bl \ - $officialBuildArgs \ - $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ - $targetRidArgs \ - $runtimeOsArgs \ - $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ - /p:AssetManifestFileName=$assetManifestFileName - displayName: Build - -# Upload build logs for diagnosis. -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)' - Contents: | - **/*.log - **/*.binlog - artifacts/source-build/self/prebuilt-report/** - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - -- task: PublishPipelineArtifact@1 - displayName: Publish BuildLogs - inputs: - targetPath: '$(Build.StagingDirectory)/BuildLogs' - artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) - continueOnError: true - condition: succeededOrFailed() +- template: /eng/common/core-templates/steps/source-build.yml + parameters: + is1ESPipeline: false -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- task: ComponentGovernanceComponentDetection@0 - displayName: Component Detection (Exclude upstream cache) - inputs: - ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: - ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' - ${{ else }}: - ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index d236f9fdbb15..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -24,34 +24,36 @@ # pool: # name: $(DncEngInternalBuildPool) # demands: ImageOverride -equals windows.vs2019.amd64 - variables: - # Coalesce the target and source branches so we know when a PR targets a release branch - # If these variables are somehow missing, fall back to main (tends to have more capacity) + - ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ else }}: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) - # Any new -Svc alternative pools should have variables added here to allow for splitting work - - name: DncEngPublicBuildPool - value: $[ - replace( + # Any new -Svc alternative pools should have variables added here to allow for splitting work + - name: DncEngPublicBuildPool + value: $[ replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore-Svc-Public' - ), - False, - 'NetCore-Public' - ) - ] + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore-Svc-Public' + ), + False, + 'NetCore-Public' + ) + ] - - name: DncEngInternalBuildPool - value: $[ - replace( + - name: DncEngInternalBuildPool + value: $[ replace( - eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), - True, - 'NetCore1ESPool-Svc-Internal' - ), - False, - 'NetCore1ESPool-Internal' - ) - ] + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index b674a90618d7..a06513a59407 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,6 +65,11 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } +# True if the build is a product build +[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } + +[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() } + function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null } @@ -158,18 +163,13 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { $env:DOTNET_CLI_TELEMETRY_OPTOUT=1 } - # Source Build uses DotNetCoreSdkDir variable - if ($env:DotNetCoreSdkDir -ne $null) { - $env:DOTNET_INSTALL_DIR = $env:DotNetCoreSdkDir - } - # Find the first path on %PATH% that contains the dotnet.exe if ($useInstalledDotNetCli -and (-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -eq $null)) { $dotnetExecutable = GetExecutableFileName 'dotnet' @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } @@ -254,7 +254,6 @@ function Retry($downloadBlock, $maxRetries = 5) { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unable to download file in $maxRetries attempts." break } - } } @@ -384,7 +383,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0 + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { @@ -424,7 +423,6 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = InitializeVisualStudioEnvironmentVariables $vsInstallDir $vsMajorVersion } else { - if (Get-Member -InputObject $GlobalJson.tools -Name 'xcopy-msbuild') { $xcopyMSBuildVersion = $GlobalJson.tools.'xcopy-msbuild' $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] @@ -450,7 +448,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if ($xcopyMSBuildVersion.Trim() -ine "none") { $vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install if ($vsInstallDir -eq $null) { - throw "Could not xcopy msbuild. Please check that package 'RoslynTools.MSBuild @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'." + throw "Could not xcopy msbuild. Please check that package 'Microsoft.DotNet.Arcade.MSBuild.Xcopy @ $xcopyMSBuildVersion' exists on feed 'dotnet-eng'." } } if ($vsInstallDir -eq $null) { @@ -487,7 +485,7 @@ function InstallXCopyMSBuild([string]$packageVersion) { } function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { - $packageName = 'RoslynTools.MSBuild' + $packageName = 'Microsoft.DotNet.Arcade.MSBuild.Xcopy' $packageDir = Join-Path $ToolsDir "msbuild\$packageVersion" $packagePath = Join-Path $packageDir "$packageName.$packageVersion.nupkg" @@ -504,6 +502,10 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) + if (!(Test-Path $packagePath)) { + Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "See https://dev.azure.com/dnceng/internal/_wiki/wikis/DNCEng%20Services%20Wiki/1074/Updating-Microsoft.DotNet.Arcade.MSBuild.Xcopy-WAS-RoslynTools.MSBuild-(xcopy-msbuild)-generation?anchor=troubleshooting for help troubleshooting issues with XCopy MSBuild" + throw + } Unzip $packagePath $packageDir } @@ -545,19 +547,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -604,11 +613,11 @@ function InitializeBuildTool() { # Use override if it exists - commonly set by source-build if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { - $initializeBuildToolFramework="net8.0" + $initializeBuildToolFramework="net9.0" } else { $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework } - + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { @@ -651,7 +660,7 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOCACHE = $true + $env:RESTORENOHTTPCACHE = $true } } @@ -684,8 +693,14 @@ function Read-ArcadeSdkVersion() { } function InitializeToolset() { - if (Test-Path variable:global:_ToolsetBuildProj) { - return $global:_ToolsetBuildProj + # For Unified Build/Source-build support, check whether the environment variable is + # set. If it is, then use this as the toolset build project. + if ($env:_InitializeToolset -ne $null) { + return $global:_InitializeToolset = $env:_InitializeToolset + } + + if (Test-Path variable:global:_InitializeToolset) { + return $global:_InitializeToolset } $nugetCache = GetNuGetPackageCachePath @@ -696,7 +711,7 @@ function InitializeToolset() { if (Test-Path $toolsetLocationFile) { $path = Get-Content $toolsetLocationFile -TotalCount 1 if (Test-Path $path) { - return $global:_ToolsetBuildProj = $path + return $global:_InitializeToolset = $path } } @@ -719,7 +734,7 @@ function InitializeToolset() { throw "Invalid toolset path: $path" } - return $global:_ToolsetBuildProj = $path + return $global:_InitializeToolset = $path } function ExitWithExitCode([int] $exitCode) { @@ -771,12 +786,10 @@ function MSBuild() { # new scripts need to work with old packages, so we need to look for the old names/versions (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')), (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path netcoreapp2.1 'Microsoft.DotNet.Arcade.Sdk.dll')) - (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path netcoreapp3.1 'Microsoft.DotNet.Arcade.Sdk.dll')) (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')) + (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')), + (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')), + (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll')) ) $selectedPath = $null foreach ($path in $possiblePaths) { @@ -835,7 +848,8 @@ function MSBuild-Core() { } } - $env:ARCADE_BUILD_TOOL_COMMAND = "$($buildTool.Path) $cmdArgs" + # Be sure quote the path in case there are spaces in the dotnet installation location. + $env:ARCADE_BUILD_TOOL_COMMAND = "`"$($buildTool.Path)`" $cmdArgs" $exitCode = Exec-Process $buildTool.Path $cmdArgs @@ -850,7 +864,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null) { + # Skip this when the build is a child of the VMR orchestrator build. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 68db15430230..01b09b65796c 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -68,6 +68,9 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} +# True if the build is a product build +product_build=${product_build:-false} + # Resolve any symlinks in the given path. function ResolvePath { local path=$1 @@ -112,7 +115,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -123,11 +126,6 @@ function InitializeDotNetCli { # so it doesn't output warnings to the console. export LTTNG_HOME="$HOME" - # Source Build uses DotNetCoreSdkDir variable - if [[ -n "${DotNetCoreSdkDir:-}" ]]; then - export DOTNET_INSTALL_DIR="$DotNetCoreSdkDir" - fi - # Find the first path on $PATH that contains the dotnet.exe if [[ "$use_installed_dotnet_cli" == true && $global_json_has_runtimes == false && -z "${DOTNET_INSTALL_DIR:-}" ]]; then local dotnet_path=`command -v dotnet` @@ -146,7 +144,7 @@ function InitializeDotNetCli { if [[ $global_json_has_runtimes == false && -n "${DOTNET_INSTALL_DIR:-}" && -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then dotnet_root="$DOTNET_INSTALL_DIR" else - dotnet_root="$repo_root/.dotnet" + dotnet_root="${repo_root}.dotnet" export DOTNET_INSTALL_DIR="$dotnet_root" @@ -165,7 +163,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" @@ -310,7 +308,7 @@ function GetDotNetInstallScript { curl "$install_script_url" -sSL --retry 10 --create-dirs -o "$install_script" || { if command -v openssl &> /dev/null; then echo "Curl failed; dumping some information about dotnet.microsoft.com for later investigation" - echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 + echo | openssl s_client -showcerts -servername dotnet.microsoft.com -connect dotnet.microsoft.com:443 || true fi echo "Will now retry the same URL with verbose logging." with_retries curl "$install_script_url" -sSL --verbose --retry 10 --create-dirs -o "$install_script" || { @@ -343,20 +341,20 @@ function InitializeBuildTool { _InitializeBuildToolCommand="msbuild" # use override if it exists - commonly set by source-build if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then - _InitializeBuildToolFramework="net8.0" + _InitializeBuildToolFramework="net9.0" else _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" fi } -# Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 +# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then - export NUGET_PACKAGES="$HOME/.nuget/packages" + export NUGET_PACKAGES="$HOME/.nuget/packages/" else - export NUGET_PACKAGES="$repo_root/.packages" - export RESTORENOCACHE=true + export NUGET_PACKAGES="$repo_root/.packages/" + export RESTORENOHTTPCACHE=true fi fi @@ -440,7 +438,7 @@ function StopProcesses { } function MSBuild { - local args=$@ + local args=( "$@" ) if [[ "$pipelines_log" == true ]]; then InitializeBuildTool InitializeToolset @@ -458,12 +456,10 @@ function MSBuild { local possiblePaths=() possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp2.1/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/netcoreapp3.1/Microsoft.DotNet.Arcade.Sdk.dll" ) possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" ) possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" ) + possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" ) + possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" ) for path in "${possiblePaths[@]}"; do if [[ -f $path ]]; then selectedPath=$path @@ -477,7 +473,7 @@ function MSBuild { args+=( "-logger:$selectedPath" ) fi - MSBuild-Core ${args[@]} + MSBuild-Core "${args[@]}" } function MSBuild-Core { @@ -510,7 +506,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - if [[ "$ci" == "true" && -n ${SYSTEM_TEAMPROJECT:-} ]]; then + # Skip this when the build is a child of the VMR orchestrator build. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/global.json b/global.json index edcf91e50c58..1f746c2d5d20 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "tools": { - "dotnet": "8.0.122", + "dotnet": "9.0.112", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" + "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" ], "aspnetcore": [ "$(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion)" @@ -13,8 +13,13 @@ "version": "16.8" } }, + "native-tools": { + "cmake": "latest" + }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25611.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", + "Microsoft.Build.NoTargets": "3.7.0", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } } From 5c35e2f53d20f321e88cd87fcc7ebf21f467d4f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 07:42:50 +0000 Subject: [PATCH 111/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 224 +++++++++++++++++----------------------- eng/Versions.props | 95 ++++++++--------- 3 files changed, 149 insertions(+), 180 deletions(-) diff --git a/NuGet.config b/NuGet.config index e31e3b13ad69..33d0c75f8bf0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1fcc837f9b2..ff9aeea4001a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - a3e0085f1d5f33a0e6250dc7b5158c28e12bd457 + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae diff --git a/eng/Versions.props b/eng/Versions.props index 3e474dc5deaa..ec008f15e271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ 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.12.53 - 17.12.53-preview-25570-13 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26056.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From ffcf67693266f347e5c4131cdc1492659120069c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 9 Jan 2026 09:38:34 -0600 Subject: [PATCH 112/280] [release/9.0.1xx] Update dependencies from dotnet/roslyn (#52097) Co-authored-by: dotnet-maestro[bot] Co-authored-by: DonnaChen888 --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 16 ++++++++-------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f32c97defe1e..549c8218105f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,43 +97,43 @@ 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 - + https://github.com/dotnet/roslyn - c795154af418b5473d67f053aec5d290a3e5c410 + fc52718eccdb37693a40a518b1178b1e23114e68 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 39bfe4b67548..e6f1e2d8da19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,14 +204,14 @@ - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 - 4.12.0-3.25571.3 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 + 4.12.0-3.25609.5 From 6abfba72604b46304fa8090a6f891298c13fc6b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jan 2026 02:02:15 +0000 Subject: [PATCH 113/280] Update dependencies from https://github.com/dotnet/arcade build 20260112.2 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25626.6 -> To Version 9.0.0-beta.26062.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 549c8218105f..7f415f551985 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 diff --git a/eng/Versions.props b/eng/Versions.props index e6f1e2d8da19..f3cbe517e066 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 + 9.0.0-beta.26062.2 + 9.0.0-beta.26062.2 + 9.0.0-beta.26062.2 + 9.0.0-beta.26062.2 diff --git a/global.json b/global.json index 1f746c2d5d20..e61b2b8ec76b 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 3a561df579cdbf08fc6ea4c6f8722b46dce040b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jan 2026 02:02:19 +0000 Subject: [PATCH 114/280] Update dependencies from https://github.com/dotnet/arcade build 20260112.2 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25626.6 -> To Version 9.0.0-beta.26062.2 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- global.json | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff9aeea4001a..e19dbed89279 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 7d6bcdd1e851735273e4eed39e40366d48f335c9 diff --git a/eng/Versions.props b/eng/Versions.props index ec008f15e271..8d7036c247f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 + 9.0.0-beta.26062.2 + 9.0.0-beta.26062.2 + 9.0.0-beta.26062.2 + 9.0.0-beta.26062.2 diff --git a/global.json b/global.json index 1f746c2d5d20..e61b2b8ec76b 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 2bbda3d812f09e68d06751e71c1fec5e424da2ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jan 2026 03:28:47 +0000 Subject: [PATCH 115/280] Update dependencies from https://github.com/dotnet/templating build 20260112.1 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.310 -> To Version 9.0.310 Microsoft.TemplateEngine.Mocks From Version 9.0.310-servicing.26056.1 -> To Version 9.0.310-servicing.26062.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33d0c75f8bf0..f5a79d40de47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff9aeea4001a..13a617ceb12e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - e9437e509698986ef26dcc6b268f8c6e19a6e7eb + 9852c1f4b8cfb9fce5209e7084450b628d8ebcae - + https://github.com/dotnet/templating - e9437e509698986ef26dcc6b268f8c6e19a6e7eb + 9852c1f4b8cfb9fce5209e7084450b628d8ebcae diff --git a/eng/Versions.props b/eng/Versions.props index ec008f15e271..3faa0a6a40fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.310-servicing.26056.1 + 9.0.310-servicing.26062.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 753e953b5322b395fc1453bc91d2d0734e4b00af Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 13 Jan 2026 05:52:42 +0000 Subject: [PATCH 116/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 252 +++++++++++++++++----------------------- eng/Versions.props | 103 ++++++++-------- global.json | 4 +- 4 files changed, 169 insertions(+), 200 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc821d0d5225..33d0c75f8bf0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f415f551985..ff9aeea4001a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + e9437e509698986ef26dcc6b268f8c6e19a6e7eb - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae @@ -589,34 +555,34 @@ - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 diff --git a/eng/Versions.props b/eng/Versions.props index f3cbe517e066..ec008f15e271 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ 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.12.55 - 17.12.55-preview-25616-06 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26056.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -270,10 +272,10 @@ - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) diff --git a/global.json b/global.json index e61b2b8ec76b..1f746c2d5d20 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 6526042d3a921b285412f42552db7d45d79f8ddc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 13 Jan 2026 07:32:02 +0000 Subject: [PATCH 117/280] Update dependencies from https://github.com/dotnet/templating build 20260112.4 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.310 -> To Version 9.0.310 Microsoft.TemplateEngine.Mocks From Version 9.0.310-servicing.26062.1 -> To Version 9.0.310-servicing.26062.4 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index f5a79d40de47..1b6e9aa3222f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27e2ef2f547..0e4bba131717 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 9852c1f4b8cfb9fce5209e7084450b628d8ebcae + 0f56b93d03501f7ed91993f0791fca2696267f95 - + https://github.com/dotnet/templating - 9852c1f4b8cfb9fce5209e7084450b628d8ebcae + 0f56b93d03501f7ed91993f0791fca2696267f95 diff --git a/eng/Versions.props b/eng/Versions.props index c01a8b3c91d4..5f0ae3c0c287 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.310-servicing.26062.1 + 9.0.310-servicing.26062.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From c6eec95377c542355b4f9a82a2e0ee70bd16b86e Mon Sep 17 00:00:00 2001 From: dotnet-sb-bot Date: Tue, 13 Jan 2026 21:35:08 +0000 Subject: [PATCH 118/280] .NET Source-Build 9.0.113 January 2026 Updates --- src/SourceBuild/content/eng/Version.Details.xml | 4 ++-- src/SourceBuild/content/eng/Versions.props | 4 ++-- src/SourceBuild/content/global.json | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/content/eng/Version.Details.xml b/src/SourceBuild/content/eng/Version.Details.xml index b522a45eebbc..974057e9603b 100644 --- a/src/SourceBuild/content/eng/Version.Details.xml +++ b/src/SourceBuild/content/eng/Version.Details.xml @@ -2,9 +2,9 @@ - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 92e45d251889042fd956e18b28d489020298d864 diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 4aadbc5f733a..90db8261b7c5 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -23,8 +23,8 @@ of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 9.0.111 - 9.0.111-servicing.25476.1 + 9.0.113 + 9.0.113-servicing.25610.1 2.0.0-beta4.24126.1 diff --git a/src/SourceBuild/content/global.json b/src/SourceBuild/content/global.json index a99ce1c1ce15..230e5479fafd 100644 --- a/src/SourceBuild/content/global.json +++ b/src/SourceBuild/content/global.json @@ -1,10 +1,10 @@ { "tools": { - "dotnet": "9.0.111" + "dotnet": "9.0.113" }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5" } } From 486e8675c9a89440a1ab1362b1cc0e69f2065c63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jan 2026 02:02:22 +0000 Subject: [PATCH 119/280] Update dependencies from https://github.com/dotnet/arcade build 20260113.2 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.26062.2 -> To Version 9.0.0-beta.26063.2 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +-- .../templates/variables/pool-providers.yml | 2 +- global.json | 4 +-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f415f551985..43475c12ccc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 diff --git a/eng/Versions.props b/eng/Versions.props index f3cbe517e066..7f5d82caa4ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 6b5ff28cc706..3cb20fb5041f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -74,7 +74,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 221d1ac6de19..864427d9694a 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -291,11 +291,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a073..18693ea120d5 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index e61b2b8ec76b..43b27ffea644 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 299840e8fa25ae7897e2e00f5aba1ab42632f23e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jan 2026 02:02:28 +0000 Subject: [PATCH 120/280] Update dependencies from https://github.com/dotnet/arcade build 20260113.2 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.26062.2 -> To Version 9.0.0-beta.26063.2 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +-- .../templates/variables/pool-providers.yml | 2 +- global.json | 4 +-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e4bba131717..a286b97e6bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - 7d6bcdd1e851735273e4eed39e40366d48f335c9 + c85f9aceddaf85296e3efbc463daaa34fef5a375 diff --git a/eng/Versions.props b/eng/Versions.props index 5f0ae3c0c287..400d6e899b8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 - 9.0.0-beta.26062.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 6b5ff28cc706..3cb20fb5041f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -74,7 +74,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 221d1ac6de19..864427d9694a 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -291,11 +291,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a073..18693ea120d5 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index e61b2b8ec76b..43b27ffea644 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26062.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26062.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From bf099a8db3d1e2e3b11a57482504c1dc312b0e59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Jan 2026 03:42:35 +0000 Subject: [PATCH 121/280] Update dependencies from https://github.com/dotnet/templating build 20260113.1 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.310 -> To Version 9.0.310 Microsoft.TemplateEngine.Mocks From Version 9.0.310-servicing.26062.4 -> To Version 9.0.310-servicing.26063.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b6e9aa3222f..0ac98986f7f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e4bba131717..f604ae14787f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - 0f56b93d03501f7ed91993f0791fca2696267f95 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 0f56b93d03501f7ed91993f0791fca2696267f95 + d45ac1b63f602baa44f952bee5743d1c863eb82e diff --git a/eng/Versions.props b/eng/Versions.props index 5f0ae3c0c287..d29f1583e752 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.310-servicing.26062.4 + 9.0.310-servicing.26063.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 873982ef623f215e459b4b1eec34fb6d9ea0fe09 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 06:00:46 +0000 Subject: [PATCH 122/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 224 +++++++++++++++++----------------------- eng/Versions.props | 95 ++++++++--------- 3 files changed, 149 insertions(+), 180 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc821d0d5225..1b6e9aa3222f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43475c12ccc5..a286b97e6bbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + 0f56b93d03501f7ed91993f0791fca2696267f95 - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + 0f56b93d03501f7ed91993f0791fca2696267f95 - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae diff --git a/eng/Versions.props b/eng/Versions.props index 7f5d82caa4ef..400d6e899b8d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ 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.12.55 - 17.12.55-preview-25616-06 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26062.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From 0e1adea73b12d419ca8b523be997434e4b3a3325 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 14 Jan 2026 07:57:14 -0600 Subject: [PATCH 123/280] Remove internal package feeds --- NuGet.config | 6 ------ 1 file changed, 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64a6b6a6d0e4..4b98d4115eb7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,6 @@ - @@ -35,13 +34,11 @@ - - @@ -68,15 +65,12 @@ - - - From 1ba596079f9502a4ee8f819cf52a9ce031749ebe Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 14 Jan 2026 08:28:17 -0600 Subject: [PATCH 124/280] Fix OmniSharp tests silently passing on script execution failures (#52435) --- .../OmniSharpTests.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index c44e8e03a90e..7af6a2137b7c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -49,8 +49,8 @@ public async Task VerifyScenario(DotNetTemplate template) string projectDirectory = DotNetHelper.ExecuteNew(templateName, projectName); (Process Process, string StdOut, string StdErr) executeResult = ExecuteHelper.ExecuteProcess( - Path.Combine(OmniSharpDirectory, "run"), - $"-s {projectDirectory}", + DotNetHelper.DotNetPath, + $"{Path.Combine(OmniSharpDirectory, "OmniSharp.dll")} -- -s {projectDirectory}", OutputHelper, logOutput: true, millisecondTimeout: 5000, @@ -59,6 +59,8 @@ public async Task VerifyScenario(DotNetTemplate template) Assert.NotEqual(0, executeResult.Process.ExitCode); Assert.DoesNotContain("ERROR", executeResult.StdOut); Assert.DoesNotContain("ERROR", executeResult.StdErr); + Assert.DoesNotContain("command not found", executeResult.StdErr, StringComparison.OrdinalIgnoreCase); + Assert.DoesNotContain("No such file or directory", executeResult.StdErr, StringComparison.OrdinalIgnoreCase); } private async Task InitializeOmniSharp() @@ -66,7 +68,7 @@ private async Task InitializeOmniSharp() if (!Directory.Exists(OmniSharpDirectory)) { using HttpClient client = new(); - string omniSharpTarballFile = $"omnisharp-linux-{Config.TargetArchitecture}.tar.gz"; + string omniSharpTarballFile = $"omnisharp-linux-{Config.TargetArchitecture}-net6.0.tar.gz"; Uri omniSharpTarballUrl = new($"https://github.com/OmniSharp/omnisharp-roslyn/releases/download/v{OmniSharpReleaseVersion}/{omniSharpTarballFile}"); await client.DownloadFileAsync(omniSharpTarballUrl, omniSharpTarballFile, OutputHelper); From 4cd2cc93b63a43cf2585354c66d90a2cf8e4a0f6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 14:29:15 +0000 Subject: [PATCH 125/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 10 +- eng/Version.Details.xml | 224 +++++++++++++++++----------------------- eng/Versions.props | 95 ++++++++--------- 3 files changed, 149 insertions(+), 180 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc821d0d5225..0ac98986f7f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,15 +27,17 @@ + + - + - + @@ -61,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43475c12ccc5..3a8c40fa01ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - b65413ac057eb0a54c51b76b1855bc377c2132c3 - https://github.com/dotnet/emsdk b65413ac057eb0a54c51b76b1855bc377c2132c3 @@ -73,67 +69,67 @@ b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + a983c60c5595960e9c542c10575c86168ef7597b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + fd1e96f4650a3d0bffa73556f46ab1328a70da92 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + a983c60c5595960e9c542c10575c86168ef7597b - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae diff --git a/eng/Versions.props b/eng/Versions.props index 7f5d82caa4ef..d02494c97383 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 10 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.11-servicing.25519.1 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 @@ -124,7 +123,10 @@ 9.0.11 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.11 9.0.11 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26057.9 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ 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.12.55 - 17.12.55-preview-25616-06 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26063.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 + 4.14.0-3.26057.9 @@ -231,9 +233,9 @@ - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 + 9.0.0-preview.25628.4 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.11-servicing.25516.4 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From 62dd686f333659e91ef4e991dfef49776ffa4b2c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 14 Jan 2026 09:22:47 -0800 Subject: [PATCH 126/280] Update branding to 9.0.311 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d02494c97383..e3dd725dfabd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 9 0 3 - 10 + 11 From 1b6b76add691c745ee07cf73c26cc4035b3350bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 10:38:04 -0800 Subject: [PATCH 127/280] [release/9.0.1xx] Update dependencies from dotnet/razor (#52455) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43475c12ccc5..d8ee98f916d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + a03910b95e37a6d2da39c64a1e2fb8262d506f96 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + a03910b95e37a6d2da39c64a1e2fb8262d506f96 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + a03910b95e37a6d2da39c64a1e2fb8262d506f96 - + https://github.com/dotnet/razor - 2920c71a15b90cb85e1847a32dfe9f13b1d77da2 + a03910b95e37a6d2da39c64a1e2fb8262d506f96 diff --git a/eng/Versions.props b/eng/Versions.props index 7f5d82caa4ef..bacd35b8cb7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 - 9.0.0-preview.25628.1 + 9.0.0-preview.26064.1 + 9.0.0-preview.26064.1 + 9.0.0-preview.26064.1 From bf9ea307c44af8af10a987021ef50b597d4ea6a1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Jan 2026 11:57:20 -0800 Subject: [PATCH 128/280] Change VersionFeature80 calculation from 14 to 13 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e3dd725dfabd..45ead1bcbb0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From dbc366b4e92958b7c0b6c40d60596421692f7414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Jan 2026 12:03:44 -0800 Subject: [PATCH 129/280] [release/9.0.3xx] Update dependencies from dotnet/roslyn (#52460) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a8c40fa01ad..973cb46cef0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -93,43 +93,43 @@ 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -378,9 +378,9 @@ https://github.com/dotnet/roslyn-analyzers 742cc53ecfc7e7245f950e5ba58268ed2829913c - + https://github.com/dotnet/roslyn - a983c60c5595960e9c542c10575c86168ef7597b + 450493a9b4ec6337bced0120e97cb76f4ed783db diff --git a/eng/Versions.props b/eng/Versions.props index d02494c97383..5a0099dd6e57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -161,7 +161,7 @@ 9.0.0-preview.26055.3 - 3.12.0-beta1.26057.9 + 3.12.0-beta1.26064.1 @@ -206,14 +206,14 @@ - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 - 4.14.0-3.26057.9 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 From cb183cf0bfe714d4ea5242c2e71fb89630d6627a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 14 Jan 2026 15:46:19 -0600 Subject: [PATCH 130/280] Fix OmniSharp test failure --- .../Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs index 7af6a2137b7c..dda024f94ea8 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/OmniSharpTests.cs @@ -74,9 +74,6 @@ private async Task InitializeOmniSharp() Directory.CreateDirectory(OmniSharpDirectory); Utilities.ExtractTarball(omniSharpTarballFile, OmniSharpDirectory, OutputHelper); - - // Ensure the run script is executable (see https://github.com/OmniSharp/omnisharp-roslyn/issues/2547) - File.SetUnixFileMode($"{OmniSharpDirectory}/run", UnixFileMode.UserRead | UnixFileMode.UserExecute); } } } From 9003c78d6124f1db647533090a8cae2d2667b7d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Jan 2026 02:01:15 +0000 Subject: [PATCH 131/280] Update dependencies from https://github.com/dotnet/razor build 20260114.2 On relative base path root Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.25628.4 -> To Version 9.0.0-preview.26064.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 973cb46cef0e..c855af01bb42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -321,22 +321,22 @@ d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - fd1e96f4650a3d0bffa73556f46ab1328a70da92 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - fd1e96f4650a3d0bffa73556f46ab1328a70da92 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - fd1e96f4650a3d0bffa73556f46ab1328a70da92 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - fd1e96f4650a3d0bffa73556f46ab1328a70da92 + 41f3afd466695ac2460260431537fe4d779ff446 diff --git a/eng/Versions.props b/eng/Versions.props index 8f0b1b75da61..9a322f2f169b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -233,9 +233,9 @@ - 9.0.0-preview.25628.4 - 9.0.0-preview.25628.4 - 9.0.0-preview.25628.4 + 9.0.0-preview.26064.2 + 9.0.0-preview.26064.2 + 9.0.0-preview.26064.2 From 8eaec4bc7ae844a40ceed8a40c85af8eef5d41dd Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 15 Jan 2026 13:21:53 +0000 Subject: [PATCH 132/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 11 +- eng/Version.Details.xml | 476 +++++++++++++++++++--------------------- eng/Versions.props | 203 ++++++++--------- 3 files changed, 329 insertions(+), 361 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b98d4115eb7..0ac98986f7f7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,19 +24,20 @@ - + + - + - + @@ -62,11 +63,11 @@ + + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5623fa70a106..c855af01bb42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,56 +1,56 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + d45ac1b63f602baa44f952bee5743d1c863eb82e - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + b73682307aa0128c5edbec94c2e6a070d13ae6bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 @@ -59,344 +59,310 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/emsdk - f364bf26bf50d8cbdd8652d284d25a8ccb55039a - - - https://github.com/dotnet/emsdk - f364bf26bf50d8cbdd8652d284d25a8ccb55039a + b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/emsdk - f364bf26bf50d8cbdd8652d284d25a8ccb55039a + b65413ac057eb0a54c51b76b1855bc377c2132c3 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 + 6c65543c1f1eb7afc55533a107775e6e5004f023 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58060180f2776452976616ae4894118dfd21f8d5 + 88a1aae37eae3f1a0fb51bc828a9b302df178b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b05fe71693c6c70b537911f88865ea456a9015f5 + 3bcdfce6d4b5e6825ae33f1e464b73264e36017f - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58060180f2776452976616ae4894118dfd21f8d5 + 88a1aae37eae3f1a0fb51bc828a9b302df178b2a https://github.com/dotnet/xdt @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae @@ -503,89 +469,89 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + d3aba8fe1a0d0f5c145506f292b72ea9d28406fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 @@ -619,9 +585,9 @@ c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + fa7cdded37981a97cec9a3e233c4a6af58a91c57 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 433603733957..9a322f2f169b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 11 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,90 +76,92 @@ 1.1.0-beta.25317.4 - - 9.0.12-servicing.25608.3 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.11-servicing.25519.1 - 9.0.12 - 9.0.12-servicing.25606.9 - 9.0.12 - 9.0.12 - 9.0.12-servicing.25606.9 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 + 9.0.11 + 9.0.11-servicing.25517.16 + 9.0.11 + 9.0.11 + 9.0.11-servicing.25517.16 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 8.0.0-rc.1.23414.4 - 9.0.12-servicing.25606.9 - 9.0.12-servicing.25606.9 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 + 9.0.11-servicing.25517.16 + 9.0.11-servicing.25517.16 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 2.1.0 - 9.0.12 + 9.0.11 8.0.0 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 8.0.0 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 - 9.0.12 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 9.0.11 + 4.5.1 + 4.5.5 8.0.5 - 9.0.12 - 9.0.12 + 4.5.4 + 9.0.11 + 9.0.11 - 9.0.12-servicing.25609.4 - 9.0.12-servicing.25609.4 - 9.0.12 - 9.0.12 + 9.0.11-servicing.25520.1 + 9.0.11-servicing.25520.1 + 9.0.11 + 9.0.11 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26064.1 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,65 +182,65 @@ 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.12.55 - 17.12.55-preview-25616-06 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.113 + 9.0.310 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.310-servicing.26063.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 - 9.0.12 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12 - 9.0.12 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 - 9.0.12-servicing.25609.3 + 9.0.11 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11 + 9.0.11 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 + 9.0.11-servicing.25520.6 - 9.0.0-preview.26064.1 - 9.0.0-preview.26064.1 - 9.0.0-preview.26064.1 + 9.0.0-preview.26064.2 + 9.0.0-preview.26064.2 + 9.0.0-preview.26064.2 - 9.0.12-rtm.25609.3 - 9.0.12-rtm.25609.3 + 9.0.11-rtm.25520.2 + 9.0.11-rtm.25520.2 @@ -317,8 +319,7 @@ 15.0.9617 18.0.9617 - 9.0.12-servicing.25602.39 - 9.0.12 + 9.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) 9.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-(?!rtm)[A-z]*[\.]*\d*`)) From 8a19265a92e865c505ba8efb0c146ae2521a342d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Jan 2026 16:17:59 -0800 Subject: [PATCH 133/280] Update VersionFeature80 and VersionFeature90 calculations to Jan release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eeff75233b8c..afdf2c96817b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,8 +37,8 @@ 36 20 - 22 - 11 + $([MSBuild]::Add($(VersionFeature), 24)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From d359a68f381f722d1dcc38d2a02e80aa36a9b694 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Jan 2026 01:42:17 +0000 Subject: [PATCH 134/280] Update dependencies from https://github.com/dotnet/templating build 20260115.3 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.310 -> To Version 9.0.311 Microsoft.TemplateEngine.Mocks From Version 9.0.310-servicing.26063.1 -> To Version 9.0.311-servicing.26065.3 --- NuGet.config | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index dc2c750c9e45..a87ee868d7a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -40,7 +40,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9668f2a99445..e2adbb2c89a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,13 +1,13 @@ - + https://github.com/dotnet/templating - d45ac1b63f602baa44f952bee5743d1c863eb82e + bb020ebdedc7c2acbc2381e30ae1f5656c4af6a0 - + https://github.com/dotnet/templating - d45ac1b63f602baa44f952bee5743d1c863eb82e + bb020ebdedc7c2acbc2381e30ae1f5656c4af6a0 diff --git a/eng/Versions.props b/eng/Versions.props index 04e632b304e8..7ddd710f791b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -189,13 +189,13 @@ - 9.0.310 + 9.0.311 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.310-servicing.26063.1 + 9.0.311-servicing.26065.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 2dd803c100ac4591a2dfcd9e735c5aaddab38d92 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 16 Jan 2026 10:19:40 -0800 Subject: [PATCH 135/280] Update dependencies for 10.0.2 Microsoft build and then update dependencies for all 2xx repos to the current version in dotnet/dotnet --- NuGet.config | 5 +- eng/Version.Details.props | 262 +++++----- eng/Version.Details.xml | 524 +++++++++---------- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 6 +- global.json | 4 +- 7 files changed, 402 insertions(+), 403 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7e04985571cd..82c3d1dd768c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,8 +4,7 @@ - - + @@ -41,7 +40,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7ecd9c967079..d9b5b8826648 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,149 +6,149 @@ This file should be imported by eng/Versions.props - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 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.25569.105 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.0-beta.25569.105 - 2.0.0-preview.1.25569.105 - 2.2.1-beta.25569.105 - 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-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 3.2.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 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 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.102 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.102 + 10.0.102 + 10.0.102 + 10.0.102 + 10.0.102 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 10.0.0-preview.7.25377.103 - 18.3.0-preview-25610-02 - 18.3.0-preview-25610-02 + 18.3.0-preview-26062-04 + 18.3.0-preview-26062-04 - 15.1.200-servicing.25605.1 + 15.1.200-servicing.26063.5 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 + 18.3.0-release-26055-04 + 18.3.0-release-26055-04 + 18.3.0-release-26055-04 - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 + 10.0.0-preview.26065.1 + 10.0.0-preview.26065.1 + 10.0.0-preview.26065.1 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 2.1.0-preview.26065.7 4.1.0-preview.26065.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74e05afcd479..ddb6624ae19f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,61 +2,61 @@ - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + d6f7f02c99e67973be3af508da3dde7012b370ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b - + https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b - + https://github.com/dotnet/fsharp - 89d788641914c5d0b87fddfa11f4df0b5cfaa73d + 5d23fef87847b07b40b1b67c9d826076d7cbaf3d - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + a99b70cf718ff7842466a7eaeefa99b471cad517 - + https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + 41f7799afd5767945acc16071ab64fa984bca274 - + https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + 41f7799afd5767945acc16071ab64fa984bca274 - + https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + 41f7799afd5767945acc16071ab64fa984bca274 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - + https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - + https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + adb4347a172149b3ec18552da62e4da6fb2cf362 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + 9f286ddee40065ea225611cb43ab0415e48994c2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -564,9 +564,9 @@ https://github.com/microsoft/testfx f2ca2cf2507b769ba4e6609683619243588ee4c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 578705ee4dbd..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index 0daa834cedbd..dc87e04b6c6c 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25611.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25611.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From a39c37b340152f60fd3b43bbada26edf5024852e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Jan 2026 02:01:11 +0000 Subject: [PATCH 136/280] Update dependencies from https://github.com/microsoft/testfx build 20260116.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26066.2 MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26066.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ec92048da30b..828848d673d0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26065.7 - 4.1.0-preview.26065.7 + 2.1.0-preview.26066.2 + 4.1.0-preview.26066.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c0a16b4524d..d7257a6e6185 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/microsoft/testfx - f2ca2cf2507b769ba4e6609683619243588ee4c1 + 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 - + https://github.com/microsoft/testfx - f2ca2cf2507b769ba4e6609683619243588ee4c1 + 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 https://github.com/dotnet/dotnet From 9e7257e51c2f273e296ea8dae894013ec814f34b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Jan 2026 02:01:14 +0000 Subject: [PATCH 137/280] Update dependencies from https://github.com/microsoft/testfx build 20260116.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26066.2 MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26066.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7ecd9c967079..a54da859d6e1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -150,8 +150,8 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25605.3 10.0.0-beta.25605.3 - 2.1.0-preview.26065.7 - 4.1.0-preview.26065.7 + 2.1.0-preview.26066.2 + 4.1.0-preview.26066.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74e05afcd479..b6126b16e375 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -556,13 +556,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - f2ca2cf2507b769ba4e6609683619243588ee4c1 + 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 - + https://github.com/microsoft/testfx - f2ca2cf2507b769ba4e6609683619243588ee4c1 + 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From dcff85052742f7ab5f1c42a64e9bdcba8cdd23f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 18 Jan 2026 02:01:43 +0000 Subject: [PATCH 138/280] Update dependencies from https://github.com/microsoft/testfx build 20260117.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26067.2 MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26067.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 828848d673d0..094f12b336e6 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26066.2 - 4.1.0-preview.26066.2 + 2.1.0-preview.26067.2 + 4.1.0-preview.26067.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7257a6e6185..0a3c4dc7b7cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/microsoft/testfx - 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 + f095074b037430e87786f1b2014feb5b99a1b4cb - + https://github.com/microsoft/testfx - 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 + f095074b037430e87786f1b2014feb5b99a1b4cb https://github.com/dotnet/dotnet From 230cf7a264c80e378f71e00f352d608c0a2365d4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 18 Jan 2026 02:01:54 +0000 Subject: [PATCH 139/280] Update dependencies from https://github.com/microsoft/testfx build 20260117.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26067.2 MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26067.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a54da859d6e1..40afc18d37d1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -150,8 +150,8 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25605.3 10.0.0-beta.25605.3 - 2.1.0-preview.26066.2 - 4.1.0-preview.26066.2 + 2.1.0-preview.26067.2 + 4.1.0-preview.26067.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6126b16e375..ccaca4a46b26 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -556,13 +556,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 + f095074b037430e87786f1b2014feb5b99a1b4cb - + https://github.com/microsoft/testfx - 85093d1f6ce77e7978a996961dc5fcd7c2dff0e4 + f095074b037430e87786f1b2014feb5b99a1b4cb https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 0bbf22b0168e2b745d41f48e84798f92bdcec487 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 11:17:11 -0800 Subject: [PATCH 140/280] Add GetTagHelpers method to TagHelperDescriptor --- src/RazorSdk/Tool/GenerateCommand.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index bf889875d0f7..16db788c5c6d 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -436,6 +436,7 @@ private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; public IReadOnlyList GetDescriptors() => TagHelpers; + public IReadOnlyList GetTagHelpers(CancellationToken cancellationToken) => TagHelpers; } } } From 27dd11b592a8e02937b5cf11bcd1c36688287f92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 18 Jan 2026 12:18:31 -0800 Subject: [PATCH 141/280] [release/9.0.1xx] Update dependencies from dotnet/templating (#52527) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 8 +++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b98d4115eb7..2ef14a275645 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,6 +27,7 @@ + @@ -34,11 +35,13 @@ + - + + @@ -65,12 +68,15 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5623fa70a106..b7bd622c29fc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + 49f403f06033a1d28efd68d72aac1aab949721ce - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + 49f403f06033a1d28efd68d72aac1aab949721ce - + https://github.com/dotnet/templating - 9887f549bbf4a5eb3796e3d783826a3758b6b1a9 + 49f403f06033a1d28efd68d72aac1aab949721ce diff --git a/eng/Versions.props b/eng/Versions.props index 433603733957..a8c74455f940 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -187,13 +187,13 @@ - 9.0.113 + 9.0.114 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.113-servicing.25602.8 + 9.0.114-servicing.26066.4 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 6623d93e7639a19cb6d0141d26f2a3b1687d9c01 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 15:52:26 -0800 Subject: [PATCH 142/280] Change GetTagHelpers method to return TagHelperCollection --- src/RazorSdk/Tool/GenerateCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index 16db788c5c6d..a888ca654e84 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -436,7 +436,7 @@ private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; public IReadOnlyList GetDescriptors() => TagHelpers; - public IReadOnlyList GetTagHelpers(CancellationToken cancellationToken) => TagHelpers; + public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => new TagHelperCollection(TagHelpers); } } } From 1c9e5f596f05db52492c83ac53ad689b78e5ea4c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Jan 2026 02:01:04 +0000 Subject: [PATCH 143/280] Update dependencies from https://github.com/microsoft/testfx build 20260118.4 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26065.7 -> To Version 2.1.0-preview.26068.4 MSTest From Version 4.1.0-preview.26065.7 -> To Version 4.1.0-preview.26068.4 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 40afc18d37d1..39e04322c27a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -150,8 +150,8 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25605.3 10.0.0-beta.25605.3 - 2.1.0-preview.26067.2 - 4.1.0-preview.26067.2 + 2.1.0-preview.26068.4 + 4.1.0-preview.26068.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ccaca4a46b26..0a2a5d852001 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -556,13 +556,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - f095074b037430e87786f1b2014feb5b99a1b4cb + 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd - + https://github.com/microsoft/testfx - f095074b037430e87786f1b2014feb5b99a1b4cb + 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 3a0defd5e0611094d314bf96cce9d46e7397eae7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Jan 2026 02:01:07 +0000 Subject: [PATCH 144/280] Update dependencies from https://github.com/microsoft/testfx build 20260118.4 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26067.2 -> To Version 2.1.0-preview.26068.4 MSTest From Version 4.1.0-preview.26067.2 -> To Version 4.1.0-preview.26068.4 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 094f12b336e6..8fa7ccaffb7b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26067.2 - 4.1.0-preview.26067.2 + 2.1.0-preview.26068.4 + 4.1.0-preview.26068.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a3c4dc7b7cf..fabd89f18bdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/microsoft/testfx - f095074b037430e87786f1b2014feb5b99a1b4cb + 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd - + https://github.com/microsoft/testfx - f095074b037430e87786f1b2014feb5b99a1b4cb + 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd https://github.com/dotnet/dotnet From 5a915c06e329eaf7d35fad9bebb775f14e1aa851 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 20:36:37 -0800 Subject: [PATCH 145/280] Refactor StaticTagHelperFeature constructor and methods --- src/RazorSdk/Tool/GenerateCommand.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index a888ca654e84..2001932d89df 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -430,13 +430,9 @@ public SourceItem(string sourcePath, string outputPath, string physicalRelativeP public string CssScope { get; } } - private class StaticTagHelperFeature : RazorEngineFeatureBase, ITagHelperFeature + private sealed class StaticTagHelperFeature(TagHelperCollection tagHelpers) : RazorEngineFeatureBase, ITagHelperFeature { - public IReadOnlyList TagHelpers { get; set; } - - public IReadOnlyList GetDescriptors(CancellationToken cancellationToken) => TagHelpers; - public IReadOnlyList GetDescriptors() => TagHelpers; - public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => new TagHelperCollection(TagHelpers); + public TagHelperCollection GetTagHelpers(CancellationToken cancellationToken) => tagHelpers; } } } From a963fc44cffc5e85568ea5abc2eb15f057e6095f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 20:37:36 -0800 Subject: [PATCH 146/280] Refactor tag helper registration and retrieval --- src/RazorSdk/Tool/DiscoverCommand.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/RazorSdk/Tool/DiscoverCommand.cs b/src/RazorSdk/Tool/DiscoverCommand.cs index 3b12d2375c41..d84727d4bcc2 100644 --- a/src/RazorSdk/Tool/DiscoverCommand.cs +++ b/src/RazorSdk/Tool/DiscoverCommand.cs @@ -171,13 +171,14 @@ private int ExecuteCore(RazorConfiguration configuration, string projectDirector b.Features.Add(new DefaultMetadataReferenceFeature() { References = metadataReferences }); b.Features.Add(new CompilationTagHelperFeature()); - b.Features.Add(new DefaultTagHelperDescriptorProvider()); + + b.RegisterDefaultTagHelperProducer(); CompilerFeatures.Register(b); }); var feature = engine.Engine.Features.OfType().Single(); - var tagHelpers = feature.GetDescriptors(); + var tagHelpers = feature.GetTagHelpers(); using (var stream = new MemoryStream()) { From 423070707f53660af11de61635ace982a43d69f0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 05:43:01 +0000 Subject: [PATCH 147/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 6 +- eng/Version.Details.props | 404 ++++----- eng/Version.Details.xml | 801 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 19 +- global.json | 6 +- 10 files changed, 628 insertions(+), 620 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47d1214ee661..7e04985571cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,8 @@ - + + @@ -39,6 +40,9 @@ + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8fa7ccaffb7b..7ecd9c967079 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,149 +5,167 @@ This file should be imported by eng/Versions.props --> - - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.0-preview.26065.102 - 10.0.3 - 10.0.3 - 18.0.10 - 18.0.10-servicing-26065-102 - 7.0.2-rc.6602 - 10.0.103 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 10.0.0-preview.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 2.0.0-preview.1.26065.102 - 2.2.3 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 14.0.103-servicing.26065.102 - 10.0.3 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 10.0.3-servicing.26065.102 - 10.0.3 - 10.0.3 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.26065.102 - 10.0.3-servicing.26065.102 - 18.0.1-release-26065-102 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26065.102 - 10.0.103 - 10.0.103-servicing.26065.102 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26065.102 - 18.0.1-release-26065-102 - 18.0.1-release-26065-102 - 3.2.3 - 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 10.0.3 - 2.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 + + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 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.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.0-beta.25569.105 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 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-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 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 + + 10.0.0-preview.7.25377.103 + + 18.3.0-preview-25610-02 + 18.3.0-preview-25610-02 + + 15.1.200-servicing.25605.1 + + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + + 18.3.0-preview-25609-01 + 18.3.0-preview-25609-01 + 18.3.0-preview-25609-01 + + 10.0.0-preview.25552.2 + 10.0.0-preview.25552.2 + 10.0.0-preview.25552.2 + + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 - 2.1.0-preview.26068.4 - 4.1.0-preview.26068.4 + 2.1.0-preview.26065.7 + 4.1.0-preview.26065.7 - + + $(MicrosoftTemplateEngineAbstractionsPackageVersion) + $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) + $(MicrosoftTemplateEngineEdgePackageVersion) + $(MicrosoftTemplateEngineMocksPackageVersion) + $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) + $(MicrosoftTemplateEngineTestHelperPackageVersion) + $(MicrosoftTemplateEngineUtilsPackageVersion) + $(MicrosoftTemplateSearchCommonPackageVersion) + $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) $(dotnetusersecretsPackageVersion) @@ -170,37 +188,13 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMetadataPackageVersion) $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - $(MicrosoftBuildNuGetSdkResolverPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -210,17 +204,11 @@ This file should be imported by eng/Versions.props $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) $(MicrosoftExtensionsLoggingConsolePackageVersion) $(MicrosoftExtensionsObjectPoolPackageVersion) - $(MicrosoftFSharpCompilerPackageVersion) $(MicrosoftJSInteropPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) $(MicrosoftNETHostModelPackageVersion) $(MicrosoftNETILLinkTasksPackageVersion) $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) $(MicrosoftNETSdkWindowsDesktopPackageVersion) - $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) @@ -228,37 +216,10 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkCommonPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) - $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) - $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksPackageVersion) - $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperPackageVersion) - $(MicrosoftTemplateEngineUtilsPackageVersion) - $(MicrosoftTemplateSearchCommonPackageVersion) - $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) $(MicrosoftWindowsDesktopAppRefPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) @@ -283,6 +244,61 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) + + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + + $(MicrosoftFSharpCompilerPackageVersion) + + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) + + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fabd89f18bdb..74e05afcd479 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/msbuild + 2960e90f194e80f8f664ac573d456058bc4f5cd9 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/msbuild + 2960e90f194e80f8f664ac573d456058bc4f5cd9 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/fsharp + 89d788641914c5d0b87fddfa11f4df0b5cfaa73d - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + f2ca2cf2507b769ba4e6609683619243588ee4c1 - + https://github.com/microsoft/testfx - 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + f2ca2cf2507b769ba4e6609683619243588ee4c1 - - https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index c282d3ae403a..92b77347d990 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index eea88e653c91..ac5c69ffcac5 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..578705ee4dbd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript + Invoke-WebRequest $uri -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,30 +556,23 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 87ba29457b35..0daa834cedbd 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.101", + "dotnet": "10.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26065.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From fdfdde20ebad65deb858dd87bfb21f799ba2314a Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 18 Jan 2026 22:17:50 -0800 Subject: [PATCH 148/280] Refactor GetTagHelpers method and improve tag helper handling --- src/RazorSdk/Tool/GenerateCommand.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index 2001932d89df..d76d49b0eb10 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -3,6 +3,7 @@ #nullable disable +using System.Collections.Immutable; using System.Diagnostics; using System.Threading; using Microsoft.AspNetCore.Razor.Language; @@ -190,7 +191,7 @@ private int ExecuteCore( { b.RegisterExtensions(); - b.Features.Add(new StaticTagHelperFeature() { TagHelpers = tagHelpers, }); + b.Features.Add(new StaticTagHelperFeature(tagHelpers)); b.ConfigureCodeGenerationOptions(b => { @@ -297,11 +298,11 @@ private VirtualRazorProjectFileSystem GetVirtualRazorProjectSystem(SourceItem[] return project; } - private IReadOnlyList GetTagHelpers(string tagHelperManifest) + private static TagHelperCollection GetTagHelpers(string tagHelperManifest) { if (!File.Exists(tagHelperManifest)) { - return Array.Empty(); + return []; } using (var stream = File.OpenRead(tagHelperManifest)) @@ -311,8 +312,9 @@ private IReadOnlyList GetTagHelpers(string tagHelperManifes var serializer = new JsonSerializer(); serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance); - var descriptors = serializer.Deserialize>(reader); - return descriptors; + var tagHelpers = serializer.Deserialize>(reader); + + return TagHelperCollection.Create(tagHelpers); } } From ab3b53b962b85f82e844f72eaff08681798a9835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Jan 2026 10:04:05 +0000 Subject: [PATCH 149/280] Update dependencies from https://github.com/dotnet/templating build 20260119.1 On relative base path root Microsoft.TemplateEngine.Abstractions From Version 9.0.311 -> To Version 9.0.311 Microsoft.TemplateEngine.Mocks From Version 9.0.311-servicing.26065.3 -> To Version 9.0.311-servicing.26069.1 --- NuGet.config | 9 +-------- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index a87ee868d7a7..27580bfe749d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -37,13 +35,11 @@ - - + - @@ -72,13 +68,10 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2adbb2c89a3..ed60ca0d36e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,11 +3,11 @@ https://github.com/dotnet/templating - bb020ebdedc7c2acbc2381e30ae1f5656c4af6a0 + a1a11ad17b8d7a0999a8c0cfe21f15fce77ae4d6 - + https://github.com/dotnet/templating - bb020ebdedc7c2acbc2381e30ae1f5656c4af6a0 + a1a11ad17b8d7a0999a8c0cfe21f15fce77ae4d6 diff --git a/eng/Versions.props b/eng/Versions.props index 7ddd710f791b..f7bca87d1eb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -195,7 +195,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.311-servicing.26065.3 + 9.0.311-servicing.26069.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From e41a21bce785c606a970ac45a27c4bb0f86cade6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 10:33:46 +0000 Subject: [PATCH 150/280] [release/10.0.2xx] Adjust MTP exit code logic (#52543) Co-authored-by: Youssef Victor --- .../Test/MTP/MicrosoftTestingPlatformTestCommand.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs index 63d307b39fd6..72544580293c 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs @@ -80,7 +80,13 @@ private int RunInternal(ParseResult parseResult, bool isHelp) actionQueue.EnqueueCompleted(); // Don't inline exitCode variable. We want to always call WaitAllActions first. var exitCode = actionQueue.WaitAllActions(); - exitCode = _output.HasHandshakeFailure ? ExitCode.GenericFailure : exitCode; + + // If all test apps exited with 0 exit code, but we detected that handshake didn't happen correctly, map that to generic failure. + if (exitCode == ExitCode.Success && _output.HasHandshakeFailure) + { + exitCode = ExitCode.GenericFailure; + } + if (exitCode == ExitCode.Success && parseResult.HasOption(definition.MinimumExpectedTestsOption) && parseResult.GetValue(definition.MinimumExpectedTestsOption) is { } minimumExpectedTests && From 9400f244dbc9e9f9e7c82bbb4028f7e5480d343d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 10:34:05 +0000 Subject: [PATCH 151/280] [release/10.0.2xx] Handle assemblies gracefully (#52508) Co-authored-by: mariam-abdulla Co-authored-by: Mariam Abdullah <122357303+mariam-abdulla@users.noreply.github.com> Co-authored-by: Youssef Victor Co-authored-by: DonnaChen888 --- src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs index 8db706d7c382..9735d0ab72b2 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs @@ -15,6 +15,7 @@ internal sealed class TestApplicationHandler private readonly Dictionary _testSessionEventCountPerSessionUid = new(); private (string? TargetFramework, string? Architecture, string ExecutionId)? _handshakeInfo; + private bool _receivedTestHostHandshake; public TestApplicationHandler(TerminalTestReporter output, TestModule module, TestOptions options) { @@ -62,6 +63,7 @@ internal void OnHandshakeReceived(HandshakeMessage handshakeMessage, bool gotSup // https://github.com/microsoft/testfx/blob/2a9a353ec2bb4ce403f72e8ba1f29e01e7cf1fd4/src/Platform/Microsoft.Testing.Platform/Hosts/CommonTestHost.cs#L87-L97 if (hostType == "TestHost") { + _receivedTestHostHandshake = true; // AssemblyRunStarted counts "retry count", and writes to terminal "(Try ) Running tests from " // So, we want to call it only for test host, and not for test host controller (or orchestrator, if in future it will handshake as well) // Calling it for both test host and test host controllers means we will count retries incorrectly, and will messages twice. @@ -263,8 +265,10 @@ internal bool HasMismatchingTestSessionEventCount() internal void OnTestProcessExited(int exitCode, string outputData, string errorData) { - if (_handshakeInfo.HasValue) + if (_receivedTestHostHandshake && _handshakeInfo.HasValue) { + // If we received a handshake from TestHostController but not from TestHost, + // call HandshakeFailure instead of AssemblyRunCompleted _output.AssemblyRunCompleted(_handshakeInfo.Value.ExecutionId, exitCode, outputData, errorData); } else From aeb736336ee4c59238b71b810b6a65623de3a171 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Jan 2026 12:48:11 +0000 Subject: [PATCH 152/280] Update dependencies from https://github.com/dotnet/razor build 20260119.1 On relative base path root Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.26064.1 -> To Version 9.0.0-preview.26069.1 --- NuGet.config | 7 ------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2ef14a275645..d753c8cf4b90 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,10 +24,8 @@ - - @@ -35,13 +33,11 @@ - - @@ -68,15 +64,12 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7bd622c29fc..4112b8609935 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -325,22 +325,22 @@ f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 - + https://github.com/dotnet/razor - a03910b95e37a6d2da39c64a1e2fb8262d506f96 + cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 diff --git a/eng/Versions.props b/eng/Versions.props index a8c74455f940..766489063f26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -231,9 +231,9 @@ - 9.0.0-preview.26064.1 - 9.0.0-preview.26064.1 - 9.0.0-preview.26064.1 + 9.0.0-preview.26069.1 + 9.0.0-preview.26069.1 + 9.0.0-preview.26069.1 From 70b0739b7ffad74b7b8bfe1edba7ec0fb0d624d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 19 Jan 2026 13:51:46 +0000 Subject: [PATCH 153/280] [release/10.0.2xx] Refactor ANSI handling for better readability (#52548) Co-authored-by: Youssef1313 --- .../MicrosoftTestingPlatformTestCommand.cs | 15 +++++++- .../Test/MTP/Terminal/TerminalTestReporter.cs | 38 +++++++++++-------- .../Terminal/TerminalTestReporterOptions.cs | 29 +++++++++++--- 3 files changed, 59 insertions(+), 23 deletions(-) diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs index 72544580293c..2883069e62e3 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs @@ -111,12 +111,23 @@ private void InitializeOutput(int degreeOfParallelism, ParseResult parseResult, // TODO: Replace this with proper CI detection that we already have in telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327 bool inCI = string.Equals(Environment.GetEnvironmentVariable("TF_BUILD"), "true", StringComparison.OrdinalIgnoreCase) || string.Equals(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), "true", StringComparison.OrdinalIgnoreCase); + AnsiMode ansiMode = AnsiMode.AnsiIfPossible; + if (noAnsi) + { + // User explicitly specified --no-ansi. + // We should respect that. + ansiMode = AnsiMode.NoAnsi; + } + else if (inCI) + { + ansiMode = AnsiMode.SimpleAnsi; + } + _output = new TerminalTestReporter(console, new TerminalTestReporterOptions() { ShowPassedTests = showPassedTests, ShowProgress = !noProgress, - UseAnsi = !noAnsi, - UseCIAnsi = inCI, + AnsiMode = ansiMode, ShowAssembly = true, ShowAssemblyStartAndComplete = true, MinimumExpectedTests = parseResult.GetValue(definition.MinimumExpectedTestsOption), diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs index b41c516cb27b..6dff401f6793 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs @@ -1,6 +1,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Concurrent; +using System.Diagnostics; using System.Globalization; using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; @@ -70,27 +71,32 @@ public TerminalTestReporter(IConsole console, TerminalTestReporterOptions option int nonAnsiUpdateCadenceInMs = 3_000; // When writing to ANSI we update the progress in place and it should look responsive so we update every half second, because we only show seconds on the screen, so it is good enough. int ansiUpdateCadenceInMs = 500; - if (!_options.UseAnsi) + + if (_options.AnsiMode == AnsiMode.SimpleAnsi) { - terminalWithProgress = new TestProgressStateAwareTerminal(new NonAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: false, updateEvery: nonAnsiUpdateCadenceInMs); + // We are told externally that we are in CI, use simplified ANSI mode. + terminalWithProgress = new TestProgressStateAwareTerminal(new SimpleAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: true, updateEvery: nonAnsiUpdateCadenceInMs); } else { - if (_options.UseCIAnsi) - { - // We are told externally that we are in CI, use simplified ANSI mode. - terminalWithProgress = new TestProgressStateAwareTerminal(new SimpleAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: true, updateEvery: nonAnsiUpdateCadenceInMs); - } - else + // We are not in CI, or in CI non-compatible with simple ANSI, autodetect terminal capabilities + // Autodetect. + (bool consoleAcceptsAnsiCodes, bool _, uint? originalConsoleMode) = NativeMethods.QueryIsScreenAndTryEnableAnsiColorCodes(); + _originalConsoleMode = originalConsoleMode; + + bool useAnsi = _options.AnsiMode switch { - // We are not in CI, or in CI non-compatible with simple ANSI, autodetect terminal capabilities - // Autodetect. - (bool consoleAcceptsAnsiCodes, bool _, uint? originalConsoleMode) = NativeMethods.QueryIsScreenAndTryEnableAnsiColorCodes(); - _originalConsoleMode = originalConsoleMode; - terminalWithProgress = consoleAcceptsAnsiCodes - ? new TestProgressStateAwareTerminal(new AnsiTerminal(console, _options.BaseDirectory), _options.ShowProgress, writeProgressImmediatelyAfterOutput: true, updateEvery: ansiUpdateCadenceInMs) - : new TestProgressStateAwareTerminal(new NonAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: false, updateEvery: nonAnsiUpdateCadenceInMs); - } + AnsiMode.ForceAnsi => true, + AnsiMode.NoAnsi => false, + AnsiMode.AnsiIfPossible => consoleAcceptsAnsiCodes, + _ => throw new UnreachableException(), + }; + + terminalWithProgress = new TestProgressStateAwareTerminal( + useAnsi ? new AnsiTerminal(console, _options.BaseDirectory) : new NonAnsiTerminal(console), + _options.ShowProgress, + writeProgressImmediatelyAfterOutput: useAnsi, + updateEvery: useAnsi ? ansiUpdateCadenceInMs : nonAnsiUpdateCadenceInMs); } _terminalWithProgress = terminalWithProgress; diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs index ebce31bfc35d..3a92d4873882 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs @@ -41,13 +41,32 @@ internal sealed class TerminalTestReporterOptions public bool ShowActiveTests { get; init; } /// - /// Gets a value indicating whether we should use ANSI escape codes or disable them. When true the capabilities of the console are autodetected. + /// Gets a value indicating the ANSI mode. /// - public bool UseAnsi { get; init; } + public AnsiMode AnsiMode { get; init; } +} + +internal enum AnsiMode +{ + /// + /// Disable ANSI escape codes. + /// + NoAnsi, + + /// + /// Use simplified ANSI renderer, which colors output, but does not move cursor. + /// This is used in compatible CI environments. + /// + SimpleAnsi, + + /// + /// Enable ANSI escape codes, including cursor movement, when the capabilities of the console allow it. + /// + AnsiIfPossible, /// - /// Gets a value indicating whether we are running in compatible CI, and should use simplified ANSI renderer, which colors output, but does not move cursor. - /// Setting to false will disable this option. + /// Force ANSI escape codes, regardless of the capabilities of the console. + /// This is needed only for testing. /// - public bool UseCIAnsi { get; init; } + ForceAnsi, } From 270fbb686a37023a8d8a286978ff480fd5fb9759 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 01:18:59 +0000 Subject: [PATCH 154/280] Reset files to release/9.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Versions.props - eng/common/* --- NuGet.config | 17 ++- eng/Version.Details.xml | 224 +++++++++++++++++----------------------- eng/Versions.props | 95 ++++++++--------- 3 files changed, 156 insertions(+), 180 deletions(-) diff --git a/NuGet.config b/NuGet.config index d753c8cf4b90..a87ee868d7a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,20 +24,26 @@ + + + + - + + - + + @@ -61,15 +67,18 @@ + + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4112b8609935..e2adbb2c89a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,18 +1,18 @@ - + https://github.com/dotnet/templating - 49f403f06033a1d28efd68d72aac1aab949721ce + bb020ebdedc7c2acbc2381e30ae1f5656c4af6a0 - + https://github.com/dotnet/templating - 49f403f06033a1d28efd68d72aac1aab949721ce + bb020ebdedc7c2acbc2381e30ae1f5656c4af6a0 - + https://github.com/dotnet/templating - 49f403f06033a1d28efd68d72aac1aab949721ce + b73682307aa0128c5edbec94c2e6a070d13ae6bb @@ -59,10 +59,6 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - f364bf26bf50d8cbdd8652d284d25a8ccb55039a - https://github.com/dotnet/emsdk f364bf26bf50d8cbdd8652d284d25a8ccb55039a @@ -73,67 +69,67 @@ f364bf26bf50d8cbdd8652d284d25a8ccb55039a - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/msbuild - f42d88d8b1ac5dbe867e66278c5f4d9573eec65b + 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/fsharp - 47d4e3f91e4e5414b6dafbf14288b9c5a798ef99 + 14987c804f33917bf15f4c25e0cd16ecd01807f4 - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn - fc52718eccdb37693a40a518b1178b1e23114e68 + 450493a9b4ec6337bced0120e97cb76f4ed783db https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -143,91 +139,91 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/nuget/nuget.client - 42bfb4554167e1d2fc2b950728d9bd8164f806c1 + 0da03caba83448ee887f0f1846dd05e1f1705d45 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 - + https://github.com/microsoft/vstest - bc9161306b23641b0364b8f93d546da4d48da1eb + 51441adcd6c424ae7315d66ce7e96baf34d70369 @@ -325,22 +321,22 @@ f736effe82a61eb6f5eba46e4173eae3b7d3dffd - + https://github.com/dotnet/razor - cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 + 41f3afd466695ac2460260431537fe4d779ff446 - + https://github.com/dotnet/razor - cff92f3cc3f19a607ddbb7a0cddfbccf87a1c061 + 41f3afd466695ac2460260431537fe4d779ff446 @@ -359,36 +355,6 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - https://github.com/dotnet/test-templates - 0385265f4d0b6413d64aea0223172366a9b9858c - - - https://github.com/dotnet/test-templates - 307b8f538d83a955d8f6dd909eee41a5555f2f4d - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - becc4bd157cd6608b51a5ffe414a5d2de6330272 - - - https://github.com/dotnet/test-templates - 49c9ad01f057b3c6352bbec12b117acc2224493c - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - - - https://github.com/dotnet/test-templates - 47c90e140b027225b799ca8413af10ee3d5f1126 - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms @@ -408,18 +374,18 @@ 63ae81154c50a1cf9287cc47d8351d55b4289e6d - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c - - https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + + https://github.com/dotnet/roslyn + 450493a9b4ec6337bced0120e97cb76f4ed783db - + https://github.com/dotnet/roslyn-analyzers - 5ef1abb57ce3df89eae65ecadeb1ddbab323ae05 + 742cc53ecfc7e7245f950e5ba58268ed2829913c @@ -445,15 +411,15 @@ - + https://github.com/dotnet/source-build-externals - 16c380d1ce5fa0b24e232251c31cb013bbf3365f + 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - + https://github.com/dotnet/source-build-reference-packages - 36e2d072b287fb211f288498b2d4553efdee7990 + 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae diff --git a/eng/Versions.props b/eng/Versions.props index 766489063f26..7ddd710f791b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 9 0 - 1 - 14 + 3 + 11 @@ -18,15 +18,15 @@ true release - rtm + preview rtm servicing - - + 0 true + true 6.0.1 @@ -35,7 +35,7 @@ 17 36 20 - $([MSBuild]::Add($(VersionFeature), 10)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -76,13 +76,12 @@ 1.1.0-beta.25317.4 - - 9.0.12-servicing.25608.3 + + 9.1.0-preview.1.24555.3 - - - 1.1.0-rtm.25262.1 + + 9.0.12-servicing.25608.3 @@ -124,7 +123,10 @@ 9.0.12 + 4.5.1 + 4.5.5 8.0.5 + 4.5.4 9.0.12 9.0.12 @@ -137,29 +139,29 @@ - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4-rc.9 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 - 6.12.4 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 + 6.14.0-rc.116 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 - 17.12.0-release-24508-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 + 17.14.1-release-25428-01 - 9.0.0-preview.26057.1 - 3.11.0-beta1.26057.1 + 9.0.0-preview.26055.3 + 3.12.0-beta1.26064.1 @@ -170,8 +172,8 @@ Some .NET Framework tasks and the resolver will need to run in a VS/MSBuild that is older than the very latest, based on what we want the SDK to support. So use a version that matches the version - in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 - to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. + in minimumMSBuildVersion. Note that MSBuild has started versioning before release so the version we use as the Minimum should be .0 + to ensure we load in VS but the version we build against should be the version of MSBuild that ships in the .0 VS release. In these cases, we don't want to use MicrosoftBuildVersion and other associated properties that are updated by the VMR infrastructure. So, we read this version from the 'minimumMSBuildVersion' file in non-source-only cases into MicrosoftBuildMinimumVersion, @@ -180,38 +182,38 @@ 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.12.55 - 17.12.55-preview-25616-06 + 17.14.41 + 17.14.41-servicing-25616-07 17.11.48 17.12 - 9.0.114 + 9.0.311 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 9.0.114-servicing.26066.4 + 9.0.311-servicing.26065.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) - 12.9.101-beta.25070.7 + 13.9.303-beta.25361.1 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 - 4.12.0-3.25609.5 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 + 4.14.0-3.26064.1 @@ -231,9 +233,9 @@ - 9.0.0-preview.26069.1 - 9.0.0-preview.26069.1 - 9.0.0-preview.26069.1 + 9.0.0-preview.26064.2 + 9.0.0-preview.26064.2 + 9.0.0-preview.26064.2 @@ -317,7 +319,6 @@ 15.0.9617 18.0.9617 - 9.0.12-servicing.25602.39 9.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100PackageVersion) From 739bba49c0b734417f9e0c585b588ae3d8d5c38e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Jan 2026 13:07:50 -0800 Subject: [PATCH 155/280] Skip DotnetCliSnapshotTests due to known issue --- test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs b/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs index 9c7efb37cada..9dfe150779e8 100644 --- a/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs +++ b/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs @@ -11,7 +11,7 @@ public class DotnetCliSnapshotTests : SdkTest public DotnetCliSnapshotTests(ITestOutputHelper log) : base(log) { } [MemberData(nameof(ShellNames))] - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/48817")] public async Task VerifyCompletions(string shellName) { var provider = CompletionsCommand.DefaultShells.Single(x => x.ArgumentName == shellName); From 1de676196a40d3088ea7a485b368e08130cce29c Mon Sep 17 00:00:00 2001 From: Nikolche Kolev Date: Tue, 13 Jan 2026 11:58:55 -0800 Subject: [PATCH 156/280] add missing details from the package spec --- .../GivenAResolvePackageAssetsTask.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs index 59c329436039..966c4eb6c66c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs @@ -139,6 +139,13 @@ private static string AssetsFileWithInvalidLocale(string tfm, string locale) => `{tfm}`: { `targetAlias`: `{tfm}` } + }, + `restore`: { + `frameworks`: { + `{tfm}`: { + `targetAlias`: `{tfm}` + } + } } } }".Replace("`", "\"").Replace("{tfm}", tfm).Replace("{locale}", locale); From 99ed5a458108bd10c2163b7d180255c3176a589a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 12:52:17 +0000 Subject: [PATCH 157/280] [release/10.0.2xx] [dotnet test MTP]: Only use test progress when ANSI terminal (#52569) Co-authored-by: Youssef1313 --- .../Test/MTP/Terminal/TerminalTestReporter.cs | 21 +++++++------------ .../Terminal/TerminalTestReporterOptions.cs | 9 ++------ .../TestProgressStateAwareTerminal.cs | 15 +++++++------ 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs index 6dff401f6793..85b3179ae9ba 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs @@ -65,17 +65,14 @@ internal sealed partial class TerminalTestReporter : IDisposable public TerminalTestReporter(IConsole console, TerminalTestReporterOptions options) { _options = options; - TestProgressStateAwareTerminal terminalWithProgress; - - // When not writing to ANSI we write the progress to screen and leave it there so we don't want to write it more often than every few seconds. - int nonAnsiUpdateCadenceInMs = 3_000; - // When writing to ANSI we update the progress in place and it should look responsive so we update every half second, because we only show seconds on the screen, so it is good enough. - int ansiUpdateCadenceInMs = 500; + bool showProgress = _options.ShowProgress; + ITerminal terminal; if (_options.AnsiMode == AnsiMode.SimpleAnsi) { // We are told externally that we are in CI, use simplified ANSI mode. - terminalWithProgress = new TestProgressStateAwareTerminal(new SimpleAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: true, updateEvery: nonAnsiUpdateCadenceInMs); + terminal = new SimpleAnsiTerminal(console); + showProgress = false; } else { @@ -86,20 +83,16 @@ public TerminalTestReporter(IConsole console, TerminalTestReporterOptions option bool useAnsi = _options.AnsiMode switch { - AnsiMode.ForceAnsi => true, AnsiMode.NoAnsi => false, AnsiMode.AnsiIfPossible => consoleAcceptsAnsiCodes, _ => throw new UnreachableException(), }; - terminalWithProgress = new TestProgressStateAwareTerminal( - useAnsi ? new AnsiTerminal(console, _options.BaseDirectory) : new NonAnsiTerminal(console), - _options.ShowProgress, - writeProgressImmediatelyAfterOutput: useAnsi, - updateEvery: useAnsi ? ansiUpdateCadenceInMs : nonAnsiUpdateCadenceInMs); + showProgress = showProgress && useAnsi; + terminal = useAnsi ? new AnsiTerminal(console, _options.BaseDirectory) : new NonAnsiTerminal(console); } - _terminalWithProgress = terminalWithProgress; + _terminalWithProgress = new TestProgressStateAwareTerminal(terminal, showProgress); } public void TestExecutionStarted(DateTimeOffset testStartTime, int workerCount, bool isDiscovery, bool isHelp, bool isRetry) diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs index 3a92d4873882..7345d637aca4 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs @@ -31,7 +31,8 @@ internal sealed class TerminalTestReporterOptions public int MinimumExpectedTests { get; init; } /// - /// Gets a value indicating whether we should write the progress periodically to screen. When ANSI is allowed we update the progress as often as we can. When ANSI is not allowed we update it every 3 seconds. + /// Gets a value indicating whether we should write the progress periodically to screen. When ANSI is allowed we update the progress as often as we can. + /// When ANSI is not allowed we never have progress. /// public bool ShowProgress { get; init; } @@ -63,10 +64,4 @@ internal enum AnsiMode /// Enable ANSI escape codes, including cursor movement, when the capabilities of the console allow it. /// AnsiIfPossible, - - /// - /// Force ANSI escape codes, regardless of the capabilities of the console. - /// This is needed only for testing. - /// - ForceAnsi, } diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs index 4b1deb703e3b..3a7fa52aa96d 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs @@ -6,7 +6,7 @@ namespace Microsoft.DotNet.Cli.Commands.Test.Terminal; /// /// Terminal that updates the progress in place when progress reporting is enabled. /// -internal sealed partial class TestProgressStateAwareTerminal(ITerminal terminal, bool showProgress, bool writeProgressImmediatelyAfterOutput, int updateEvery) : IDisposable +internal sealed partial class TestProgressStateAwareTerminal(ITerminal terminal, bool showProgress) : IDisposable { /// /// A cancellation token to signal the rendering thread that it should exit. @@ -20,8 +20,6 @@ internal sealed partial class TestProgressStateAwareTerminal(ITerminal terminal, private readonly ITerminal _terminal = terminal; private readonly bool _showProgress = showProgress; - private readonly bool _writeProgressImmediatelyAfterOutput = writeProgressImmediatelyAfterOutput; - private readonly int _updateEvery = updateEvery; private TestProgressState?[] _progressItems = []; /// @@ -37,7 +35,11 @@ private void ThreadProc() { try { - while (!_cts.Token.WaitHandle.WaitOne(_updateEvery)) + // When writing to ANSI, we update the progress in place and it should look responsive so we + // update every half second, because we only show seconds on the screen, so it is good enough. + // When writing to non-ANSI, we never show progress as the output can get long and messy. + const int AnsiUpdateCadenceInMs = 500; + while (!_cts.Token.WaitHandle.WaitOne(AnsiUpdateCadenceInMs)) { lock (_lock) { @@ -118,10 +120,7 @@ internal void WriteToTerminal(Action write) _terminal.StartUpdate(); _terminal.EraseProgress(); write(_terminal); - if (_writeProgressImmediatelyAfterOutput) - { - _terminal.RenderProgress(_progressItems); - } + _terminal.RenderProgress(_progressItems); } finally { From e6a41baf4540e52edf18af7c5f0e9211dd36695c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 15:51:53 +0000 Subject: [PATCH 158/280] [automated] Merge branch 'release/9.0.3xx' => 'release/10.0.1xx' (#52375) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jacques Eloff Co-authored-by: DonnaChen888 Co-authored-by: Michael Simons Co-authored-by: Sean Reeser Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Matt Thalman Co-authored-by: Michael Yanni Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Simon Zhao (BEYONDSOFT CONSULTING INC) From f87cb4ca0a8fad44a3d895eee51cb29f9323e135 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 20 Jan 2026 16:20:31 +0000 Subject: [PATCH 159/280] Reset files to release/10.0.1xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* - src/SourceBuild/* --- NuGet.config | 52 +- eng/Version.Details.props | 290 +++++ eng/Version.Details.xml | 1081 ++++++++--------- eng/common/CIBuild.cmd | 2 +- eng/common/SetupNugetSources.ps1 | 90 +- eng/common/SetupNugetSources.sh | 192 +-- eng/common/build.ps1 | 11 +- eng/common/build.sh | 33 +- eng/common/cibuild.sh | 2 +- eng/common/core-templates/job/job.yml | 48 +- eng/common/core-templates/job/onelocbuild.yml | 35 +- .../job/publish-build-assets.yml | 79 +- .../core-templates/job/source-build.yml | 11 +- .../job/source-index-stage1.yml | 47 +- .../core-templates/jobs/codeql-build.yml | 1 - eng/common/core-templates/jobs/jobs.yml | 15 +- .../core-templates/jobs/source-build.yml | 23 +- .../core-templates/post-build/post-build.yml | 26 +- .../steps/cleanup-microbuild.yml | 28 + .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/get-delegation-sas.yml | 11 +- .../steps/install-microbuild.yml | 110 ++ .../core-templates/steps/publish-logs.yml | 7 +- .../core-templates/steps/source-build.yml | 88 +- .../steps/source-index-stage1-publish.yml | 35 + eng/common/cross/arm64/tizen/tizen.patch | 2 +- eng/common/cross/build-android-rootfs.sh | 49 +- eng/common/cross/build-rootfs.sh | 237 ++-- eng/common/cross/install-debs.py | 334 +++++ eng/common/cross/tizen-build-rootfs.sh | 0 eng/common/cross/tizen-fetch.sh | 9 +- eng/common/cross/toolchain.cmake | 82 +- eng/common/darc-init.sh | 2 +- eng/common/dotnet.cmd | 7 + eng/common/dotnet.ps1 | 11 + eng/common/dotnet.sh | 26 + eng/common/generate-locproject.ps1 | 49 +- eng/common/generate-sbom-prep.sh | 0 eng/common/native/install-dependencies.sh | 62 + eng/common/post-build/publish-using-darc.ps1 | 9 +- eng/common/post-build/redact-logs.ps1 | 5 +- eng/common/sdk-task.ps1 | 14 +- eng/common/sdk-task.sh | 121 ++ eng/common/sdl/packages.config | 2 +- eng/common/templates-official/job/job.yml | 4 +- .../steps/publish-build-artifacts.yml | 7 +- .../steps/source-index-stage1-publish.yml | 7 + eng/common/templates/job/job.yml | 4 +- .../steps/publish-build-artifacts.yml | 8 +- .../steps/source-index-stage1-publish.yml | 7 + eng/common/templates/steps/vmr-sync.yml | 207 ++++ eng/common/templates/vmr-build-pr.yml | 42 + eng/common/tools.ps1 | 66 +- eng/common/tools.sh | 73 +- eng/common/vmr-sync.ps1 | 138 +++ eng/common/vmr-sync.sh | 207 ++++ global.json | 21 +- ...ing-Add-flags-when-the-clang-s-major.patch | 145 +++ 58 files changed, 3031 insertions(+), 1245 deletions(-) create mode 100644 eng/Version.Details.props mode change 100644 => 100755 eng/common/SetupNugetSources.sh create mode 100644 eng/common/core-templates/steps/cleanup-microbuild.yml create mode 100644 eng/common/core-templates/steps/install-microbuild.yml create mode 100644 eng/common/core-templates/steps/source-index-stage1-publish.yml create mode 100755 eng/common/cross/install-debs.py mode change 100644 => 100755 eng/common/cross/tizen-build-rootfs.sh mode change 100644 => 100755 eng/common/cross/tizen-fetch.sh create mode 100644 eng/common/dotnet.cmd create mode 100644 eng/common/dotnet.ps1 create mode 100755 eng/common/dotnet.sh mode change 100644 => 100755 eng/common/generate-sbom-prep.sh create mode 100755 eng/common/native/install-dependencies.sh create mode 100755 eng/common/sdk-task.sh create mode 100644 eng/common/templates-official/steps/source-index-stage1-publish.yml create mode 100644 eng/common/templates/steps/source-index-stage1-publish.yml create mode 100644 eng/common/templates/steps/vmr-sync.yml create mode 100644 eng/common/templates/vmr-build-pr.yml create mode 100755 eng/common/vmr-sync.ps1 create mode 100755 eng/common/vmr-sync.sh create mode 100644 src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch diff --git a/NuGet.config b/NuGet.config index 27580bfe749d..47d1214ee661 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,44 +3,15 @@ - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - @@ -51,6 +22,8 @@ + + @@ -60,19 +33,14 @@ + + + - - - - - - - - diff --git a/eng/Version.Details.props b/eng/Version.Details.props new file mode 100644 index 000000000000..8fa7ccaffb7b --- /dev/null +++ b/eng/Version.Details.props @@ -0,0 +1,290 @@ + + + + + 10.0.3-servicing.26065.102 + 10.0.3-servicing.26065.102 + 10.0.3-servicing.26065.102 + 10.0.3-servicing.26065.102 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.3-servicing.26065.102 + 10.0.0-preview.26065.102 + 10.0.3 + 10.0.3 + 18.0.10 + 18.0.10-servicing-26065-102 + 7.0.2-rc.6602 + 10.0.103 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 10.0.0-preview.26065.102 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 2.0.0-preview.1.26065.102 + 2.2.3 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 10.0.3 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.3-servicing.26065.102 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 14.0.103-servicing.26065.102 + 10.0.3 + 5.0.0-2.26065.102 + 5.0.0-2.26065.102 + 10.0.3-servicing.26065.102 + 10.0.3 + 10.0.3 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.26065.102 + 10.0.3-servicing.26065.102 + 18.0.1-release-26065-102 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.103 + 10.0.103 + 10.0.103 + 10.0.103 + 10.0.103 + 10.0.103 + 10.0.103 + 10.0.103 + 10.0.103-servicing.26065.102 + 10.0.103 + 10.0.103-servicing.26065.102 + 10.0.103 + 10.0.103 + 10.0.103-servicing.26065.102 + 18.0.1-release-26065-102 + 18.0.1-release-26065-102 + 3.2.3 + 10.0.3 + 10.0.3-servicing.26065.102 + 10.0.3 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 7.0.2-rc.6602 + 10.0.3 + 2.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + 10.0.3 + + 2.1.0 + + 2.1.0-preview.26068.4 + 4.1.0-preview.26068.4 + + + + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(MicrosoftBuildTasksGitPackageVersion) + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftSourceLinkAzureReposGitPackageVersion) + $(MicrosoftSourceLinkBitbucketGitPackageVersion) + $(MicrosoftSourceLinkCommonPackageVersion) + $(MicrosoftSourceLinkGitHubPackageVersion) + $(MicrosoftSourceLinkGitLabPackageVersion) + $(MicrosoftTemplateEngineAbstractionsPackageVersion) + $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) + $(MicrosoftTemplateEngineEdgePackageVersion) + $(MicrosoftTemplateEngineMocksPackageVersion) + $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) + $(MicrosoftTemplateEngineTestHelperPackageVersion) + $(MicrosoftTemplateEngineUtilsPackageVersion) + $(MicrosoftTemplateSearchCommonPackageVersion) + $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) + $(SystemCodeDomPackageVersion) + $(SystemCommandLinePackageVersion) + $(SystemComponentModelCompositionPackageVersion) + $(SystemCompositionAttributedModelPackageVersion) + $(SystemCompositionConventionPackageVersion) + $(SystemCompositionHostingPackageVersion) + $(SystemCompositionRuntimePackageVersion) + $(SystemCompositionTypedPartsPackageVersion) + $(SystemConfigurationConfigurationManagerPackageVersion) + $(SystemDiagnosticsDiagnosticSourcePackageVersion) + $(SystemFormatsAsn1PackageVersion) + $(SystemIOHashingPackageVersion) + $(SystemReflectionMetadataLoadContextPackageVersion) + $(SystemResourcesExtensionsPackageVersion) + $(SystemSecurityCryptographyPkcsPackageVersion) + $(SystemSecurityCryptographyProtectedDataPackageVersion) + $(SystemSecurityCryptographyXmlPackageVersion) + $(SystemSecurityPermissionsPackageVersion) + $(SystemServiceProcessServiceControllerPackageVersion) + $(SystemTextEncodingCodePagesPackageVersion) + $(SystemTextJsonPackageVersion) + $(SystemWindowsExtensionsPackageVersion) + + $(NETStandardLibraryRefPackageVersion) + + $(MicrosoftTestingPlatformPackageVersion) + $(MSTestPackageVersion) + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed60ca0d36e2..fabd89f18bdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,634 +1,577 @@ + - - https://github.com/dotnet/templating - a1a11ad17b8d7a0999a8c0cfe21f15fce77ae4d6 - - - https://github.com/dotnet/templating - a1a11ad17b8d7a0999a8c0cfe21f15fce77ae4d6 - - - - https://github.com/dotnet/templating - b73682307aa0128c5edbec94c2e6a070d13ae6bb - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/emsdk - f364bf26bf50d8cbdd8652d284d25a8ccb55039a - - - - https://github.com/dotnet/emsdk - f364bf26bf50d8cbdd8652d284d25a8ccb55039a - - - - https://github.com/dotnet/msbuild - 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - - - https://github.com/dotnet/msbuild - 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - - - - https://github.com/dotnet/msbuild - 6f6d310b4e44c8b10a7d2b64a712cee01afc7214 - - - - https://github.com/dotnet/fsharp - 14987c804f33917bf15f4c25e0cd16ecd01807f4 - - - - https://github.com/dotnet/fsharp - 14987c804f33917bf15f4c25e0cd16ecd01807f4 - - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 - - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 6a953e76162f3f079405f80e28664fa51b136740 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/nuget/nuget.client - 0da03caba83448ee887f0f1846dd05e1f1705d45 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/microsoft/vstest - 51441adcd6c424ae7315d66ce7e96baf34d70369 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/microsoft/vstest - 51441adcd6c424ae7315d66ce7e96baf34d70369 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/microsoft/vstest - 51441adcd6c424ae7315d66ce7e96baf34d70369 - - - - https://github.com/microsoft/vstest - 51441adcd6c424ae7315d66ce7e96baf34d70369 - + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b9a26408ddd07dc51c232082af1ca6863af7bc9 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58060180f2776452976616ae4894118dfd21f8d5 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - - https://github.com/dotnet/razor - 41f3afd466695ac2460260431537fe4d779ff446 - - - https://github.com/dotnet/razor - 41f3afd466695ac2460260431537fe4d779ff446 - - - https://github.com/dotnet/razor - 41f3afd466695ac2460260431537fe4d779ff446 - - - - https://github.com/dotnet/razor - 41f3afd466695ac2460260431537fe4d779ff446 - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b05fe71693c6c70b537911f88865ea456a9015f5 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 58060180f2776452976616ae4894118dfd21f8d5 - - - https://github.com/dotnet/xdt - 63ae81154c50a1cf9287cc47d8351d55b4289e6d - - - - https://github.com/dotnet/xdt - 63ae81154c50a1cf9287cc47d8351d55b4289e6d - - - - https://github.com/dotnet/roslyn-analyzers - 742cc53ecfc7e7245f950e5ba58268ed2829913c - - - https://github.com/dotnet/roslyn - 450493a9b4ec6337bced0120e97cb76f4ed783db - - - - https://github.com/dotnet/roslyn-analyzers - 742cc53ecfc7e7245f950e5ba58268ed2829913c - - - - https://github.com/dotnet/command-line-api - 803d8598f98fb4efd94604b32627ee9407f246db - - - https://github.com/dotnet/command-line-api - 803d8598f98fb4efd94604b32627ee9407f246db + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - - https://github.com/dotnet/symreader - 0710a7892d89999956e8808c28e9dd0512bd53f3 - - - - https://github.com/dotnet/command-line-api - 803d8598f98fb4efd94604b32627ee9407f246db - - - - - https://github.com/dotnet/source-build-externals - 71dbdccd13f28cfd1a35649263b55ebbeab26ee7 - - - - - https://github.com/dotnet/source-build-reference-packages - 6092b62b7f35fddbd6bf31e19b2ab64bbe2443ae - - - - https://github.com/dotnet/deployment-tools - b2d5c0c5841de4bc036ef4c84b5db3532504e5f3 - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - - https://github.com/dotnet/sourcelink - 657ade4711e607cc4759e89e0943aa1ca8aadc63 - - - - - https://github.com/dotnet/deployment-tools - b2d5c0c5841de4bc036ef4c84b5db3532504e5f3 - - - - - https://github.com/dotnet/symreader - 0710a7892d89999956e8808c28e9dd0512bd53f3 - + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f736effe82a61eb6f5eba46e4173eae3b7d3dffd + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - - https://github.com/dotnet/arcade - c85f9aceddaf85296e3efbc463daaa34fef5a375 - - - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2f124007573374800632d39177cde00ca9fe1ef0 - - - https://github.com/dotnet/arcade-services - e156e649f28395d9d0ee1e848225a689b59e0fd3 - - - https://github.com/dotnet/arcade-services - e156e649f28395d9d0ee1e848225a689b59e0fd3 - - - https://github.com/dotnet/scenario-tests - 0898abbb5899ef400b8372913c2320295798a687 - - - - https://github.com/dotnet/scenario-tests - 0898abbb5899ef400b8372913c2320295798a687 - - - - - https://github.com/dotnet/aspire - 5fa9337a84a52e9bd185d04d156eccbdcf592f74 - - - - https://github.com/dotnet/aspire - 5fa9337a84a52e9bd185d04d156eccbdcf592f74 - - - - https://github.com/dotnet/runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + + + https://github.com/microsoft/testfx + 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + + + https://github.com/microsoft/testfx + 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + + + https://github.com/dotnet/dotnet + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 diff --git a/eng/common/CIBuild.cmd b/eng/common/CIBuild.cmd index 56c2f25ac22f..ac1f72bf94e0 100644 --- a/eng/common/CIBuild.cmd +++ b/eng/common/CIBuild.cmd @@ -1,2 +1,2 @@ @echo off -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" \ No newline at end of file +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*" diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 792b60b49d42..65ed3a8adef0 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,13 +1,14 @@ # 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. # # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup internal Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,19 +35,28 @@ 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." + Write-Host "Package source $SourceName already present and enabled." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -59,6 +69,8 @@ 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) @@ -91,24 +103,27 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -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 +# 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 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" +# 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)'." + # 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)) { @@ -121,15 +136,17 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to or create one if none exist already +# Get reference to - fail if none exist $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-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 } $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) { @@ -138,34 +155,35 @@ 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" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources + EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds } - -$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') +$dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - 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 + 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 } } +# 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 old mode 100644 new mode 100755 index facb415ca6ff..b2163abbe71b --- 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. # @@ -52,81 +53,139 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" +# 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 +} - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -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 +# 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 + 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 fi PackageSources=() -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "... section. + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + echo "Adding ... section." - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8' '9') +# 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 +fi + +DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null if [ "$?" == "0" ]; then - 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") + AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix" + AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix" 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' @@ -139,29 +198,12 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." + echo " Inserting credential for feed: $FeedName" PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" 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/build.ps1 b/eng/common/build.ps1 index 438f9920c43e..8cfee107e7a3 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -7,6 +7,7 @@ Param( [string] $msbuildEngine = $null, [bool] $warnAsError = $true, [bool] $nodeReuse = $true, + [switch] $buildCheck = $false, [switch][Alias('r')]$restore, [switch] $deployDeps, [switch][Alias('b')]$build, @@ -20,6 +21,7 @@ Param( [switch] $publish, [switch] $clean, [switch][Alias('pb')]$productBuild, + [switch]$fromVMR, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, [switch] $ci, @@ -71,6 +73,9 @@ function Print-Usage() { Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio" Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)" + Write-Host " -nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" + Write-Host " -buildCheck Sets /check msbuild parameter" + Write-Host " -fromVMR Set when building from within the VMR" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." @@ -97,6 +102,7 @@ function Build { $bl = if ($binaryLog) { '/bl:' + (Join-Path $LogDir 'Build.binlog') } else { '' } $platformArg = if ($platform) { "/p:Platform=$platform" } else { '' } + $check = if ($buildCheck) { '/check' } else { '' } if ($projects) { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. @@ -113,6 +119,7 @@ function Build { MSBuild $toolsetBuildProj ` $bl ` $platformArg ` + $check ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` /p:Restore=$restore ` @@ -122,11 +129,13 @@ function Build { /p:Deploy=$deploy ` /p:Test=$test ` /p:Pack=$pack ` - /p:DotNetBuildRepo=$productBuild ` + /p:DotNetBuild=$productBuild ` + /p:DotNetBuildFromVMR=$fromVMR ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` /p:Sign=$sign ` /p:Publish=$publish ` + /p:RestoreStaticGraphEnableBinaryLogger=$binaryLog ` @properties } diff --git a/eng/common/build.sh b/eng/common/build.sh index ac1ee8620cd2..9767bb411a4f 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -42,6 +42,8 @@ usage() echo " --prepareMachine Prepare machine for CI run, clean up processes after build" echo " --nodeReuse Sets nodereuse msbuild parameter ('true' or 'false')" echo " --warnAsError Sets warnaserror msbuild parameter ('true' or 'false')" + echo " --buildCheck Sets /check msbuild parameter" + echo " --fromVMR Set when building from within the VMR" echo "" echo "Command line arguments not listed above are passed thru to msbuild." echo "Arguments can also be passed in with a single hyphen." @@ -63,6 +65,7 @@ restore=false build=false source_build=false product_build=false +from_vmr=false rebuild=false test=false integration_test=false @@ -76,6 +79,7 @@ clean=false warn_as_error=true node_reuse=true +build_check=false binary_log=false exclude_ci_binary_log=false pipelines_log=false @@ -87,7 +91,7 @@ verbosity='minimal' runtime_source_feed='' runtime_source_feed_key='' -properties='' +properties=() while [[ $# > 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in @@ -127,19 +131,22 @@ while [[ $# > 0 ]]; do -pack) pack=true ;; - -sourcebuild|-sb) + -sourcebuild|-source-build|-sb) build=true source_build=true product_build=true restore=true pack=true ;; - -productBuild|-pb) + -productbuild|-product-build|-pb) build=true product_build=true restore=true pack=true ;; + -fromvmr|-from-vmr) + from_vmr=true + ;; -test|-t) test=true ;; @@ -173,6 +180,9 @@ while [[ $# > 0 ]]; do node_reuse=$2 shift ;; + -buildcheck) + build_check=true + ;; -runtimesourcefeed) runtime_source_feed=$2 shift @@ -182,7 +192,7 @@ while [[ $# > 0 ]]; do shift ;; *) - properties="$properties $1" + properties+=("$1") ;; esac @@ -216,7 +226,7 @@ function Build { InitializeCustomToolset if [[ ! -z "$projects" ]]; then - properties="$properties /p:Projects=$projects" + properties+=("/p:Projects=$projects") fi local bl="" @@ -224,15 +234,21 @@ function Build { bl="/bl:\"$log_dir/Build.binlog\"" fi + local check="" + if [[ "$build_check" == true ]]; then + check="/check" + fi + MSBuild $_InitializeToolset \ $bl \ + $check \ /p:Configuration=$configuration \ /p:RepoRoot="$repo_root" \ /p:Restore=$restore \ /p:Build=$build \ - /p:DotNetBuildRepo=$product_build \ - /p:ArcadeBuildFromSource=$source_build \ + /p:DotNetBuild=$product_build \ /p:DotNetBuildSourceOnly=$source_build \ + /p:DotNetBuildFromVMR=$from_vmr \ /p:Rebuild=$rebuild \ /p:Test=$test \ /p:Pack=$pack \ @@ -240,7 +256,8 @@ function Build { /p:PerformanceTest=$performance_test \ /p:Sign=$sign \ /p:Publish=$publish \ - $properties + /p:RestoreStaticGraphEnableBinaryLogger=$binary_log \ + ${properties[@]+"${properties[@]}"} ExitWithExitCode 0 } diff --git a/eng/common/cibuild.sh b/eng/common/cibuild.sh index 1a02c0dec8fd..66e3b0ac61c3 100755 --- a/eng/common/cibuild.sh +++ b/eng/common/cibuild.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ \ No newline at end of file +. "$scriptroot/build.sh" --restore --build --test --pack --publish --ci $@ diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 8da43d3b5837..5ce518406198 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,11 +19,11 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + enableMicrobuildForMacAndLinux: false microbuildUseESRP: true enablePublishBuildArtifacts: false enablePublishBuildAssets: false enablePublishTestResults: false - enablePublishUsingPipelines: false enableBuildRetry: false mergeTestResults: false testRunTitle: '' @@ -74,9 +74,6 @@ jobs: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' - - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: - - name: EnableRichCodeNavigation - value: 'true' # Retry signature validation up to three times, waiting 2 seconds between attempts. # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY @@ -128,23 +125,12 @@ jobs: - ${{ preStep }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' + - template: /eng/common/core-templates/steps/install-microbuild.yml + parameters: + enableMicrobuild: ${{ parameters.enableMicrobuild }} + enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} + microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@1 @@ -160,27 +146,15 @@ jobs: - ${{ each step in parameters.steps }}: - ${{ step }} - - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: - - task: RichCodeNavIndexer@0 - displayName: RichCodeNav Upload - inputs: - languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} - environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'internal') }} - richNavLogOutputDirectory: $(System.DefaultWorkingDirectory)/artifacts/bin - uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} - continueOnError: true - - ${{ each step in parameters.componentGovernanceSteps }}: - ${{ step }} - - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: MicroBuildCleanup@1 - displayName: Execute Microbuild cleanup tasks - condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - template: /eng/common/core-templates/steps/cleanup-microbuild.yml + parameters: + enableMicrobuild: ${{ parameters.enableMicrobuild }} + enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} - env: - TeamName: $(_TeamName) # Publish test results - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index edefa789d360..c5788829a872 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -27,7 +27,7 @@ parameters: is1ESPipeline: '' jobs: - job: OneLocBuild${{ parameters.JobNameSuffix }} - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild${{ parameters.JobNameSuffix }} @@ -86,8 +86,7 @@ jobs: isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} ${{ if eq(parameters.CreatePr, true) }}: isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} - ${{ if eq(parameters.RepoType, 'gitHub') }}: - isShouldReusePrSelected: ${{ parameters.ReusePr }} + isShouldReusePrSelected: ${{ parameters.ReusePr }} packageSourceAuth: patAuth patVariable: ${{ parameters.CeapexPat }} ${{ if eq(parameters.RepoType, 'gitHub') }}: @@ -100,22 +99,20 @@ jobs: mirrorBranch: ${{ parameters.MirrorBranch }} condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - args: - displayName: Publish Localization Files - pathToPublish: '$(Build.ArtifactStagingDirectory)/loc' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} + # Copy the locProject.json to the root of the Loc directory, then publish a pipeline artifact + - task: CopyFiles@2 + displayName: Copy LocProject.json + inputs: + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/' + Contents: 'LocProject.json' + TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' + condition: ${{ parameters.condition }} - - template: /eng/common/core-templates/steps/publish-build-artifacts.yml + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: - displayName: Publish LocProject.json - pathToPublish: '$(System.DefaultWorkingDirectory)/eng/Localize/' - publishLocation: Container - artifactName: Loc - condition: ${{ parameters.condition }} \ No newline at end of file + targetPath: '$(Build.ArtifactStagingDirectory)/loc' + artifactName: 'Loc' + displayName: 'Publish Localization Files' + condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3cb20fb5041f..b955fac6e13f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -20,9 +20,6 @@ parameters: # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. runAsPublic: false - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing - publishUsingPipelines: false - # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing publishAssetsImmediately: false @@ -32,6 +29,15 @@ parameters: is1ESPipeline: '' + # Optional: 🌤️ or not the build has assets it wants to publish to BAR + isAssetlessBuild: false + + # Optional, publishing version + publishingVersion: 3 + + # Optional: A minimatch pattern for the asset manifests to publish to BAR + assetManifestsPattern: '*/manifests/**/*.xml' + repositoryAlias: self officialBuildId: '' @@ -84,18 +90,44 @@ jobs: - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true - - - task: DownloadBuildArtifacts@0 - displayName: Download artifact - inputs: - artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true - condition: ${{ parameters.condition }} - continueOnError: ${{ parameters.continueOnError }} + + - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: + - ${{ if eq(parameters.publishingVersion, 3) }}: + - task: DownloadPipelineArtifact@2 + displayName: Download Asset Manifests + inputs: + artifactName: AssetManifests + targetPath: '$(Build.StagingDirectory)/AssetManifests' + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - ${{ if eq(parameters.publishingVersion, 4) }}: + - task: DownloadPipelineArtifact@2 + displayName: Download V4 asset manifests + inputs: + itemPattern: '*/manifests/**/*.xml' + targetPath: '$(Build.StagingDirectory)/AllAssetManifests' + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + - task: CopyFiles@2 + displayName: Copy V4 asset manifests to AssetManifests + inputs: + SourceFolder: '$(Build.StagingDirectory)/AllAssetManifests' + Contents: ${{ parameters.assetManifestsPattern }} + TargetFolder: '$(Build.StagingDirectory)/AssetManifests' + flattenFolders: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: AzureCLI@2 displayName: Publish Build Assets inputs: @@ -104,10 +136,13 @@ jobs: scriptLocation: scriptPath scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' + /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net - /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(OfficialBuildId) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' + condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -129,6 +164,17 @@ jobs: Copy-Item -Path $symbolExclusionfile -Destination "$(Build.StagingDirectory)/ReleaseConfigs" } + - ${{ if eq(parameters.publishingVersion, 4) }}: + - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + args: + targetPath: '$(Build.ArtifactStagingDirectory)/MergedManifest.xml' + artifactName: AssetManifests + displayName: 'Publish Merged Manifest' + retryCountOnTaskFailure: 10 # for any logs being locked + sbomEnabled: false # we don't need SBOM for logs + - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -138,7 +184,7 @@ jobs: publishLocation: Container artifactName: ReleaseConfigs - - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: BARBuildId: ${{ parameters.BARBuildId }} @@ -164,6 +210,9 @@ jobs: -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 1037ccedcb55..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -12,9 +12,10 @@ parameters: # The name of the job. This is included in the job ID. # targetRID: '' # The name of the target RID to use, instead of the one auto-detected by Arcade. - # nonPortable: false + # portableBuild: false # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than - # linux-x64), and compiling against distro-provided packages rather than portable ones. + # linux-x64), and compiling against distro-provided packages rather than portable ones. The + # default is portable mode. # skipPublishValidation: false # Disables publishing validation. By default, a check is performed to ensure no packages are # published by source-build. @@ -33,9 +34,6 @@ parameters: # container and pool. platform: {} - # Optional list of directories to ignore for component governance scans. - componentGovernanceIgnoreDirectories: [] - is1ESPipeline: '' # If set to true and running on a non-public project, @@ -65,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-azurelinux-3 + image: 1es-mariner-2 os: linux ${{ else }}: pool: @@ -96,4 +94,3 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index ddf8c2e00d80..76baf5c27258 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,8 +1,5 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 - sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog @@ -16,12 +13,6 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexUploadPackageVersion - value: ${{ parameters.sourceIndexUploadPackageVersion }} - - name: SourceIndexProcessBinlogPackageVersion - value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - - name: SourceIndexPackageSource - value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - template: /eng/common/core-templates/variables/pool-providers.yml @@ -34,12 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: 1es-windows-2022-open - os: windows + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 - os: windows + image: windows.vs2026preview.scout.amd64 steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: @@ -47,35 +36,9 @@ jobs: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} - - - task: UseDotNet@2 - displayName: Use .NET 8 SDK - inputs: - packageType: sdk - version: 8.0.x - installationPath: $(Agent.TempDirectory)/dotnet - workingDirectory: $(Agent.TempDirectory) - - - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - displayName: Download Tools - # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. - workingDirectory: $(Agent.TempDirectory) - - script: ${{ parameters.sourceIndexBuildCommand }} displayName: Build Repository - - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output - displayName: Process Binlog into indexable sln - - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - task: AzureCLI@2 - displayName: Log in to Azure and upload stage1 artifacts to source index - inputs: - azureSubscription: 'SourceDotNet Stage1 Publish' - addSpnToEnvironment: true - scriptType: 'ps' - scriptLocation: 'inlineScript' - inlineScript: | - $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml + parameters: + binLogPath: ${{ parameters.binLogPath }} diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index 4571a7864df6..dbc14ac580a2 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -15,7 +15,6 @@ jobs: enablePublishBuildArtifacts: false enablePublishTestResults: false enablePublishBuildAssets: false - enablePublishUsingPipelines: false enableTelemetry: true variables: diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index bf33cdc2cc77..01ada7476651 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -5,9 +5,6 @@ parameters: # Optional: Include PublishBuildArtifacts task enablePublishBuildArtifacts: false - # Optional: Enable publishing using release pipelines - enablePublishUsingPipelines: false - # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false @@ -30,6 +27,9 @@ parameters: # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. publishAssetsImmediately: false + # Optional: 🌤️ or not the build has assets it wants to publish to BAR + isAssetlessBuild: false + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) artifactsPublishingAdditionalParameters: '' signingValidationAdditionalParameters: '' @@ -85,7 +85,6 @@ jobs: - template: /eng/common/core-templates/jobs/source-build.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - allCompletedJobId: Source_Build_Complete ${{ each parameter in parameters.sourceBuildParameters }}: ${{ parameter.key }}: ${{ parameter.value }} @@ -98,7 +97,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}: - template: ../job/publish-build-assets.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -110,12 +109,10 @@ jobs: - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: - ${{ each job in parameters.jobs }}: - ${{ job.job }} - - ${{ if eq(parameters.enableSourceBuild, true) }}: - - Source_Build_Complete runAsPublic: ${{ parameters.runAsPublic }} - publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }} + isAssetlessBuild: ${{ parameters.isAssetlessBuild }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index 0b408a67bd51..d92860cba208 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -2,28 +2,19 @@ parameters: # This template adds arcade-powered source-build to CI. A job is created for each platform, as # well as an optional server job that completes when all platform jobs complete. - # The name of the "join" job for all source-build platforms. If set to empty string, the job is - # not included. Existing repo pipelines can use this job depend on all source-build jobs - # completing without maintaining a separate list of every single job ID: just depend on this one - # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. - allCompletedJobId: '' - # See /eng/common/core-templates/job/source-build.yml jobNamePrefix: 'Source_Build' # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream-10-amd64' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, # one job runs on 'defaultManagedPlatform'. platforms: [] - # Optional list of directories to ignore for component governance scans. - componentGovernanceIgnoreDirectories: [] - is1ESPipeline: '' # If set to true and running on a non-public project, @@ -34,23 +25,12 @@ parameters: jobs: -- ${{ if ne(parameters.allCompletedJobId, '') }}: - - job: ${{ parameters.allCompletedJobId }} - displayName: Source-Build Complete - pool: server - dependsOn: - - ${{ each platform in parameters.platforms }}: - - ${{ parameters.jobNamePrefix }}_${{ platform.name }} - - ${{ if eq(length(parameters.platforms), 0) }}: - - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} - - ${{ each platform in parameters.platforms }}: - template: /eng/common/core-templates/job/source-build.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -59,5 +39,4 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} - componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 864427d9694a..b942a79ef02d 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -60,6 +60,11 @@ parameters: artifactNames: '' downloadArtifacts: true + - name: isAssetlessBuild + type: boolean + displayName: Is Assetless Build + default: false + # These parameters let the user customize the call to sdk-task.ps1 for publishing # symbols & general artifacts as well as for signing validation - name: symbolPublishingAdditionalParameters @@ -122,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -170,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -188,9 +193,6 @@ stages: buildId: $(AzDOBuildId) artifactName: PackageArtifacts checkDownloadedFiles: true - itemPattern: | - ** - !**/Microsoft.SourceBuild.Intermediate.*.nupkg # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here @@ -234,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -305,6 +307,13 @@ stages: - task: NuGetAuthenticate@1 + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + # Darc is targeting 8.0, so make sure it's installed - task: UseDotNet@2 inputs: @@ -325,3 +334,6 @@ stages: -RequireDefaultChannels ${{ parameters.requireDefaultChannels }} -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/cleanup-microbuild.yml b/eng/common/core-templates/steps/cleanup-microbuild.yml new file mode 100644 index 000000000000..c0fdcd3379d7 --- /dev/null +++ b/eng/common/core-templates/steps/cleanup-microbuild.yml @@ -0,0 +1,28 @@ +parameters: + # Enable cleanup tasks for MicroBuild + enableMicrobuild: false + # Enable cleanup tasks for MicroBuild on Mac and Linux + # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' + enableMicrobuildForMacAndLinux: false + continueOnError: false + +steps: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and( + always(), + or( + and( + eq(variables['Agent.Os'], 'Windows_NT'), + in(variables['_SignType'], 'real', 'test') + ), + and( + ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, + ne(variables['Agent.Os'], 'Windows_NT'), + eq(variables['_SignType'], 'real') + ) + )) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 7f5b84c4cb82..c05f65027979 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 9.0.0 + PackageVersion: 10.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/core-templates/steps/get-delegation-sas.yml b/eng/common/core-templates/steps/get-delegation-sas.yml index 9db5617ea7de..d2901470a7f0 100644 --- a/eng/common/core-templates/steps/get-delegation-sas.yml +++ b/eng/common/core-templates/steps/get-delegation-sas.yml @@ -31,16 +31,7 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads - # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 - $sas = "" - do { - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv - if ($LASTEXITCODE -ne 0) { - Write-Error "Failed to generate SAS token." - exit 1 - } - } while($sas.IndexOf('/') -ne -1) + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml new file mode 100644 index 000000000000..553fce66b940 --- /dev/null +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -0,0 +1,110 @@ +parameters: + # Enable install tasks for MicroBuild + enableMicrobuild: false + # Enable install tasks for MicroBuild on Mac and Linux + # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' + enableMicrobuildForMacAndLinux: false + # Determines whether the ESRP service connection information should be passed to the signing plugin. + # This overlaps with _SignType to some degree. We only need the service connection for real signing. + # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. + # Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod. + # 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 + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild + + 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 + - task: UseDotNet@2 + displayName: Install .NET 8.0 SDK for MicroBuild Plugin + inputs: + packageType: sdk + version: 8.0.x + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + set -euo pipefail + + # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly + version=$(dotnet --version) + cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json + { + "sdk": { + "version": "$version", + "paths": [ + "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild" + ], + "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin." + } + } + EOF + displayName: 'Add global.json to MicroBuild Installation path' + workingDirectory: ${{ parameters.microBuildOutputFolder }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + REM Check if ESRP is disabled while SignType is real + if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" ( + echo Error: ESRP must be enabled when SignType is real. + exit /b 1 + ) + displayName: 'Validate ESRP usage (Windows)' + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT')) + - script: | + # Check if ESRP is disabled while SignType is real + if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then + echo "Error: ESRP must be enabled when SignType is real." + exit 1 + fi + displayName: 'Validate ESRP usage (Non-Windows)' + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + # Two different MB install steps. This is due to not being able to use the agent OS during + # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, + # we can avoid including the MB install step if not enabled at all. This avoids a bunch of + # extra pipeline authorizations, since most pipelines do not sign on non-Windows. + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (Windows) + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (non-Windows) + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + workingDirectory: ${{ parameters.microBuildOutputFolder }} + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 0623ac6e1123..5a927b4c7bcb 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -26,15 +26,19 @@ steps: # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -BinlogToolVersion '${{parameters.BinlogToolVersion}}' -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' '$(microsoft-symbol-server-pat)' '$(symweb-symbol-server-pat)' + '$(dnceng-symbol-server-pat)' '$(dn-bot-all-orgs-build-rw-code-rw)' + '$(System.AccessToken)' ${{parameters.CustomSensitiveDataList}} continueOnError: true condition: always() @@ -45,6 +49,7 @@ steps: SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' + condition: always() - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 7846584d2a77..b9c86c18ae42 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,10 +11,6 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} - - # Optional list of directories to ignore for component governance scans. - componentGovernanceIgnoreDirectories: [] - is1ESPipeline: false steps: @@ -23,25 +19,12 @@ steps: set -x df -h - # If file changes are detected, set CopyWipIntoInnerSourceBuildRepo to copy the WIP changes into the inner source build repo. - internalRestoreArgs= - if ! git diff --quiet; then - internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' - # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. - # This only works if there is a username/email configured, which won't be the case in most CI runs. - git config --get user.email - if [ $? -ne 0 ]; then - git config user.email dn-bot@microsoft.com - git config user.name dn-bot - fi - fi - # If building on the internal project, the internal storage variable may be available (usually only if needed) # In that case, add variables to allow the download of internal runtimes if the specified versions are not found # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)'' fi buildConfig=Release @@ -50,88 +33,33 @@ steps: buildConfig='$(_BuildConfig)' fi - officialBuildArgs= - if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then - officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' - fi - targetRidArgs= if [ '${{ parameters.platform.targetRID }}' != '' ]; then targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi - runtimeOsArgs= - if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then - runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' - fi - - baseOsArgs= - if [ '${{ parameters.platform.baseOS }}' != '' ]; then - baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' - fi - - publishArgs= - if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then - publishArgs='--publish' - fi - - assetManifestFileName=SourceBuild_RidSpecific.xml - if [ '${{ parameters.platform.name }}' != '' ]; then - assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + portableBuildArgs= + if [ '${{ parameters.platform.portableBuild }}' != '' ]; then + portableBuildArgs='/p:PortableBuild=${{ parameters.platform.portableBuild }}' fi ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ - --restore --build --pack $publishArgs -bl \ + --restore --build --pack -bl \ + --source-build \ ${{ parameters.platform.buildArguments }} \ - $officialBuildArgs \ $internalRuntimeDownloadArgs \ - $internalRestoreArgs \ $targetRidArgs \ - $runtimeOsArgs \ - $baseOsArgs \ - /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ - /p:ArcadeBuildFromSource=true \ - /p:DotNetBuildSourceOnly=true \ - /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName + $portableBuildArgs \ displayName: Build -# Upload build logs for diagnosis. -- task: CopyFiles@2 - displayName: Prepare BuildLogs staging directory - inputs: - SourceFolder: '$(System.DefaultWorkingDirectory)' - Contents: | - **/*.log - **/*.binlog - artifacts/sb/prebuilt-report/** - TargetFolder: '$(Build.StagingDirectory)/BuildLogs' - CleanTargetFolder: true - continueOnError: true - condition: succeededOrFailed() - - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} args: displayName: Publish BuildLogs - targetPath: '$(Build.StagingDirectory)/BuildLogs' + targetPath: artifacts/log/${{ coalesce(variables._BuildConfig, 'Release') }} artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) continueOnError: true condition: succeededOrFailed() sbomEnabled: false # we don't need SBOM for logs - -# Manually inject component detection so that we can ignore the source build upstream cache, which contains -# a nupkg cache of input packages (a local feed). -# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' -# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets -- template: /eng/common/core-templates/steps/component-governance.yml - parameters: - displayName: Component Detection (Exclude upstream cache) - is1ESPipeline: ${{ parameters.is1ESPipeline }} - ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: - componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' - ${{ else }}: - componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} - disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml new file mode 100644 index 000000000000..e9a694afa58e --- /dev/null +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -0,0 +1,35 @@ +parameters: + sourceIndexUploadPackageVersion: 2.0.0-20250818.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + binlogPath: artifacts/log/Debug/Build.binlog + +steps: +- task: UseDotNet@2 + displayName: "Source Index: Use .NET 9 SDK" + inputs: + packageType: sdk + version: 9.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + +- script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: "Source Index: Download netsourceindex Tools" + # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. + workingDirectory: $(Agent.TempDirectory) + +- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: "Source Index: Process Binlog into indexable sln" + +- ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: AzureCLI@2 + displayName: "Source Index: Upload Source Index stage1 artifacts to Azure" + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 diff --git a/eng/common/cross/arm64/tizen/tizen.patch b/eng/common/cross/arm64/tizen/tizen.patch index af7c8be05906..2cebc547382e 100644 --- a/eng/common/cross/arm64/tizen/tizen.patch +++ b/eng/common/cross/arm64/tizen/tizen.patch @@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so Use the shared library, but some functions are only in the static library, so try that secondarily. */ OUTPUT_FORMAT(elf64-littleaarch64) --GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) ) +-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) ) +GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) ) diff --git a/eng/common/cross/build-android-rootfs.sh b/eng/common/cross/build-android-rootfs.sh index 7e9ba2b75ed3..fbd8d80848a6 100755 --- a/eng/common/cross/build-android-rootfs.sh +++ b/eng/common/cross/build-android-rootfs.sh @@ -6,10 +6,11 @@ usage() { echo "Creates a toolchain and sysroot used for cross-compiling for Android." echo - echo "Usage: $0 [BuildArch] [ApiLevel]" + echo "Usage: $0 [BuildArch] [ApiLevel] [--ndk NDKVersion]" echo echo "BuildArch is the target architecture of Android. Currently only arm64 is supported." echo "ApiLevel is the target Android API level. API levels usually match to Android releases. See https://source.android.com/source/build-numbers.html" + echo "NDKVersion is the version of Android NDK. The default is r21. See https://developer.android.com/ndk/downloads/revision_history" echo echo "By default, the toolchain and sysroot will be generated in cross/android-rootfs/toolchain/[BuildArch]. You can change this behavior" echo "by setting the TOOLCHAIN_DIR environment variable" @@ -25,10 +26,15 @@ __BuildArch=arm64 __AndroidArch=aarch64 __AndroidToolchain=aarch64-linux-android -for i in "$@" - do - lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")" - case $lowerI in +while :; do + if [[ "$#" -le 0 ]]; then + break + fi + + i=$1 + + lowerI="$(echo $i | tr "[:upper:]" "[:lower:]")" + case $lowerI in -?|-h|--help) usage exit 1 @@ -43,6 +49,10 @@ for i in "$@" __AndroidArch=arm __AndroidToolchain=arm-linux-androideabi ;; + --ndk) + shift + __NDK_Version=$1 + ;; *[0-9]) __ApiLevel=$i ;; @@ -50,8 +60,17 @@ for i in "$@" __UnprocessedBuildArgs="$__UnprocessedBuildArgs $i" ;; esac + shift done +if [[ "$__NDK_Version" == "r21" ]] || [[ "$__NDK_Version" == "r22" ]]; then + __NDK_File_Arch_Spec=-x86_64 + __SysRoot=sysroot +else + __NDK_File_Arch_Spec= + __SysRoot=toolchains/llvm/prebuilt/linux-x86_64/sysroot +fi + # Obtain the location of the bash script to figure out where the root of the repo is. __ScriptBaseDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" @@ -78,6 +97,7 @@ fi echo "Target API level: $__ApiLevel" echo "Target architecture: $__BuildArch" +echo "NDK version: $__NDK_Version" echo "NDK location: $__NDK_Dir" echo "Target Toolchain location: $__ToolchainDir" @@ -85,8 +105,8 @@ echo "Target Toolchain location: $__ToolchainDir" if [ ! -d $__NDK_Dir ]; then echo Downloading the NDK into $__NDK_Dir mkdir -p $__NDK_Dir - wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux-x86_64.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip - unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux-x86_64.zip -d $__CrossDir + wget -q --progress=bar:force:noscroll --show-progress https://dl.google.com/android/repository/android-ndk-$__NDK_Version-linux$__NDK_File_Arch_Spec.zip -O $__CrossDir/android-ndk-$__NDK_Version-linux.zip + unzip -q $__CrossDir/android-ndk-$__NDK_Version-linux.zip -d $__CrossDir fi if [ ! -d $__lldb_Dir ]; then @@ -116,16 +136,11 @@ for path in $(wget -qO- https://packages.termux.dev/termux-main-21/dists/stable/ fi done -cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/sysroot/usr/" +cp -R "$__TmpDir/data/data/com.termux/files/usr/"* "$__ToolchainDir/$__SysRoot/usr/" # Generate platform file for build.sh script to assign to __DistroRid echo "Generating platform file..." -echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/sysroot/android_platform - -echo "Now to build coreclr, libraries and installers; run:" -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory coreclr -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory libraries -echo ROOTFS_DIR=\$\(realpath $__ToolchainDir/sysroot\) ./build.sh --cross --arch $__BuildArch \ - --subsetCategory installer +echo "RID=android.${__ApiLevel}-${__BuildArch}" > $__ToolchainDir/$__SysRoot/android_platform + +echo "Now to build coreclr, libraries and host; run:" +echo ROOTFS_DIR=$(realpath $__ToolchainDir/$__SysRoot) ./build.sh clr+libs+host --cross --arch $__BuildArch diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 4b5e8d7166bd..8abfb71f7275 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -5,7 +5,7 @@ set -e usage() { echo "Usage: $0 [BuildArch] [CodeName] [lldbx.y] [llvmx[.y]] [--skipunmount] --rootfsdir ]" - echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86" + echo "BuildArch can be: arm(default), arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64, x86" echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" echo " for FreeBSD can be: freebsd13, freebsd14" @@ -15,6 +15,7 @@ usage() echo "llvmx[.y] - optional, LLVM version for LLVM related packages." echo "--skipunmount - optional, will skip the unmount of rootfs folder." echo "--skipsigcheck - optional, will skip package signature checks (allowing untrusted packages)." + echo "--skipemulation - optional, will skip qemu and debootstrap requirement when building environment for debian based systems." echo "--use-mirror - optional, use mirror URL to fetch resources, when available." echo "--jobs N - optional, restrict to N jobs." exit 1 @@ -52,28 +53,27 @@ __UbuntuPackages+=" symlinks" __UbuntuPackages+=" libicu-dev" __UbuntuPackages+=" liblttng-ust-dev" __UbuntuPackages+=" libunwind8-dev" -__UbuntuPackages+=" libnuma-dev" __AlpinePackages+=" gettext-dev" __AlpinePackages+=" icu-dev" __AlpinePackages+=" libunwind-dev" __AlpinePackages+=" lttng-ust-dev" __AlpinePackages+=" compiler-rt" -__AlpinePackages+=" numactl-dev" # runtime libraries' dependencies __UbuntuPackages+=" libcurl4-openssl-dev" __UbuntuPackages+=" libkrb5-dev" __UbuntuPackages+=" libssl-dev" __UbuntuPackages+=" zlib1g-dev" +__UbuntuPackages+=" libbrotli-dev" __AlpinePackages+=" curl-dev" __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.3-RELEASE" -__FreeBSDPkg="1.17.0" +__FreeBSDBase="13.4-RELEASE" +__FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" __FreeBSDPackages+=" icu" @@ -91,18 +91,18 @@ __HaikuPackages="gcc_syslibs" __HaikuPackages+=" gcc_syslibs_devel" __HaikuPackages+=" gmp" __HaikuPackages+=" gmp_devel" -__HaikuPackages+=" icu66" -__HaikuPackages+=" icu66_devel" +__HaikuPackages+=" icu[0-9]+" +__HaikuPackages+=" icu[0-9]*_devel" __HaikuPackages+=" krb5" __HaikuPackages+=" krb5_devel" __HaikuPackages+=" libiconv" __HaikuPackages+=" libiconv_devel" -__HaikuPackages+=" llvm12_libunwind" -__HaikuPackages+=" llvm12_libunwind_devel" +__HaikuPackages+=" llvm[0-9]*_libunwind" +__HaikuPackages+=" llvm[0-9]*_libunwind_devel" __HaikuPackages+=" mpfr" __HaikuPackages+=" mpfr_devel" -__HaikuPackages+=" openssl" -__HaikuPackages+=" openssl_devel" +__HaikuPackages+=" openssl3" +__HaikuPackages+=" openssl3_devel" __HaikuPackages+=" zlib" __HaikuPackages+=" zlib_devel" @@ -128,10 +128,12 @@ __AlpineKeys=' 616adfeb:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq0BFD1D4lIxQcsqEpQzU\npNCYM3aP1V/fxxVdT4DWvSI53JHTwHQamKdMWtEXetWVbP5zSROniYKFXd/xrD9X\n0jiGHey3lEtylXRIPxe5s+wXoCmNLcJVnvTcDtwx/ne2NLHxp76lyc25At+6RgE6\nADjLVuoD7M4IFDkAsd8UQ8zM0Dww9SylIk/wgV3ZkifecvgUQRagrNUdUjR56EBZ\nraQrev4hhzOgwelT0kXCu3snbUuNY/lU53CoTzfBJ5UfEJ5pMw1ij6X0r5S9IVsy\nKLWH1hiO0NzU2c8ViUYCly4Fe9xMTFc6u2dy/dxf6FwERfGzETQxqZvSfrRX+GLj\n/QZAXiPg5178hT/m0Y3z5IGenIC/80Z9NCi+byF1WuJlzKjDcF/TU72zk0+PNM/H\nKuppf3JT4DyjiVzNC5YoWJT2QRMS9KLP5iKCSThwVceEEg5HfhQBRT9M6KIcFLSs\nmFjx9kNEEmc1E8hl5IR3+3Ry8G5/bTIIruz14jgeY9u5jhL8Vyyvo41jgt9sLHR1\n/J1TxKfkgksYev7PoX6/ZzJ1ksWKZY5NFoDXTNYUgzFUTOoEaOg3BAQKadb3Qbbq\nXIrxmPBdgrn9QI7NCgfnAY3Tb4EEjs3ON/BNyEhUENcXOH6I1NbcuBQ7g9P73kE4\nVORdoc8MdJ5eoKBpO8Ww8HECAwEAAQ== 616ae350:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyduVzi1mWm+lYo2Tqt/0\nXkCIWrDNP1QBMVPrE0/ZlU2bCGSoo2Z9FHQKz/mTyMRlhNqTfhJ5qU3U9XlyGOPJ\npiM+b91g26pnpXJ2Q2kOypSgOMOPA4cQ42PkHBEqhuzssfj9t7x47ppS94bboh46\nxLSDRff/NAbtwTpvhStV3URYkxFG++cKGGa5MPXBrxIp+iZf9GnuxVdST5PGiVGP\nODL/b69sPJQNbJHVquqUTOh5Ry8uuD2WZuXfKf7/C0jC/ie9m2+0CttNu9tMciGM\nEyKG1/Xhk5iIWO43m4SrrT2WkFlcZ1z2JSf9Pjm4C2+HovYpihwwdM/OdP8Xmsnr\nDzVB4YvQiW+IHBjStHVuyiZWc+JsgEPJzisNY0Wyc/kNyNtqVKpX6dRhMLanLmy+\nf53cCSI05KPQAcGj6tdL+D60uKDkt+FsDa0BTAobZ31OsFVid0vCXtsbplNhW1IF\nHwsGXBTVcfXg44RLyL8Lk/2dQxDHNHzAUslJXzPxaHBLmt++2COa2EI1iWlvtznk\nOk9WP8SOAIj+xdqoiHcC4j72BOVVgiITIJNHrbppZCq6qPR+fgXmXa+sDcGh30m6\n9Wpbr28kLMSHiENCWTdsFij+NQTd5S47H7XTROHnalYDuF1RpS+DpQidT5tUimaT\nJZDr++FjKrnnijbyNF8b98UCAwEAAQ== 616db30d:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAnpUpyWDWjlUk3smlWeA0\nlIMW+oJ38t92CRLHH3IqRhyECBRW0d0aRGtq7TY8PmxjjvBZrxTNDpJT6KUk4LRm\na6A6IuAI7QnNK8SJqM0DLzlpygd7GJf8ZL9SoHSH+gFsYF67Cpooz/YDqWrlN7Vw\ntO00s0B+eXy+PCXYU7VSfuWFGK8TGEv6HfGMALLjhqMManyvfp8hz3ubN1rK3c8C\nUS/ilRh1qckdbtPvoDPhSbTDmfU1g/EfRSIEXBrIMLg9ka/XB9PvWRrekrppnQzP\nhP9YE3x/wbFc5QqQWiRCYyQl/rgIMOXvIxhkfe8H5n1Et4VAorkpEAXdsfN8KSVv\nLSMazVlLp9GYq5SUpqYX3KnxdWBgN7BJoZ4sltsTpHQ/34SXWfu3UmyUveWj7wp0\nx9hwsPirVI00EEea9AbP7NM2rAyu6ukcm4m6ATd2DZJIViq2es6m60AE6SMCmrQF\nwmk4H/kdQgeAELVfGOm2VyJ3z69fQuywz7xu27S6zTKi05Qlnohxol4wVb6OB7qG\nLPRtK9ObgzRo/OPumyXqlzAi/Yvyd1ZQk8labZps3e16bQp8+pVPiumWioMFJDWV\nGZjCmyMSU8V6MB6njbgLHoyg2LCukCAeSjbPGGGYhnKLm1AKSoJh3IpZuqcKCk5C\n8CM1S15HxV78s9dFntEqIokCAwEAAQ== +66ba20fe:MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAtfB12w4ZgqsXWZDfUAV/\n6Y4aHUKIu3q4SXrNZ7CXF9nXoAVYrS7NAxJdAodsY3vPCN0g5O8DFXR+390LdOuQ\n+HsGKCc1k5tX5ZXld37EZNTNSbR0k+NKhd9h6X3u6wqPOx7SIKxwAQR8qeeFq4pP\nrt9GAGlxtuYgzIIcKJPwE0dZlcBCg+GnptCUZXp/38BP1eYC+xTXSL6Muq1etYfg\nodXdb7Yl+2h1IHuOwo5rjgY5kpY7GcAs8AjGk3lDD/av60OTYccknH0NCVSmPoXK\nvrxDBOn0LQRNBLcAfnTKgHrzy0Q5h4TNkkyTgxkoQw5ObDk9nnabTxql732yy9BY\ns+hM9+dSFO1HKeVXreYSA2n1ndF18YAvAumzgyqzB7I4pMHXq1kC/8bONMJxwSkS\nYm6CoXKyavp7RqGMyeVpRC7tV+blkrrUml0BwNkxE+XnwDRB3xDV6hqgWe0XrifD\nYTfvd9ScZQP83ip0r4IKlq4GMv/R5shcCRJSkSZ6QSGshH40JYSoiwJf5FHbj9ND\n7do0UAqebWo4yNx63j/wb2ULorW3AClv0BCFSdPsIrCStiGdpgJDBR2P2NZOCob3\nG9uMj+wJD6JJg2nWqNJxkANXX37Qf8plgzssrhrgOvB0fjjS7GYhfkfmZTJ0wPOw\nA8+KzFseBh4UFGgue78KwgkCAwEAAQ== ' __Keyring= __KeyringFile="/usr/share/keyrings/ubuntu-archive-keyring.gpg" __SkipSigCheck=0 +__SkipEmulation=0 __UseMirror=0 __UnprocessedBuildArgs= @@ -162,9 +164,13 @@ while :; do armel) __BuildArch=armel __UbuntuArch=armel - __UbuntuRepo="http://ftp.debian.org/debian/" - __CodeName=jessie + __UbuntuRepo="http://archive.debian.org/debian/" + __CodeName=buster __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" + __LLDB_Package="liblldb-6.0-dev" + __UbuntuPackages="${__UbuntuPackages// libomp-dev/}" + __UbuntuPackages="${__UbuntuPackages// libomp5/}" + __UbuntuSuites= ;; armv6) __BuildArch=armv6 @@ -180,6 +186,18 @@ while :; do __Keyring="--keyring $__KeyringFile" fi ;; + loongarch64) + __BuildArch=loongarch64 + __AlpineArch=loongarch64 + __QEMUArch=loongarch64 + __UbuntuArch=loong64 + __UbuntuSuites=unreleased + __LLDB_Package="liblldb-19-dev" + + if [[ "$__CodeName" == "sid" ]]; then + __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/" + fi + ;; riscv64) __BuildArch=riscv64 __AlpineArch=riscv64 @@ -264,44 +282,21 @@ while :; do ;; xenial) # Ubuntu 16.04 - if [[ "$__CodeName" != "jessie" ]]; then - __CodeName=xenial - fi - ;; - zesty) # Ubuntu 17.04 - if [[ "$__CodeName" != "jessie" ]]; then - __CodeName=zesty - fi + __CodeName=xenial ;; bionic) # Ubuntu 18.04 - if [[ "$__CodeName" != "jessie" ]]; then - __CodeName=bionic - fi + __CodeName=bionic ;; focal) # Ubuntu 20.04 - if [[ "$__CodeName" != "jessie" ]]; then - __CodeName=focal - fi + __CodeName=focal ;; jammy) # Ubuntu 22.04 - if [[ "$__CodeName" != "jessie" ]]; then - __CodeName=jammy - fi + __CodeName=jammy ;; noble) # Ubuntu 24.04 - if [[ "$__CodeName" != "jessie" ]]; then - __CodeName=noble - fi - if [[ -n "$__LLDB_Package" ]]; then - __LLDB_Package="liblldb-18-dev" - fi - ;; - jessie) # Debian 8 - __CodeName=jessie - __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" - - if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + __CodeName=noble + if [[ -z "$__LLDB_Package" ]]; then + __LLDB_Package="liblldb-19-dev" fi ;; stretch) # Debian 9 @@ -319,7 +314,7 @@ while :; do __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + __UbuntuRepo="http://archive.debian.org/debian/" fi ;; bullseye) # Debian 11 @@ -340,10 +335,28 @@ while :; do ;; sid) # Debian sid __CodeName=sid - __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" + __UbuntuSuites= - if [[ -z "$__UbuntuRepo" ]]; then - __UbuntuRepo="http://ftp.debian.org/debian/" + # Debian-Ports architectures need different values + case "$__UbuntuArch" in + amd64|arm64|armel|armhf|i386|mips64el|ppc64el|riscv64|s390x) + __KeyringFile="/usr/share/keyrings/debian-archive-keyring.gpg" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.debian.org/debian/" + fi + ;; + *) + __KeyringFile="/usr/share/keyrings/debian-ports-archive-keyring.gpg" + + if [[ -z "$__UbuntuRepo" ]]; then + __UbuntuRepo="http://ftp.ports.debian.org/debian-ports/" + fi + ;; + esac + + if [[ -e "$__KeyringFile" ]]; then + __Keyring="--keyring $__KeyringFile" fi ;; tizen) @@ -370,7 +383,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.0-RELEASE" + __FreeBSDBase="14.2-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; @@ -388,6 +401,9 @@ while :; do --skipsigcheck) __SkipSigCheck=1 ;; + --skipemulation) + __SkipEmulation=1 + ;; --rootfsdir|-rootfsdir) shift __RootfsDir="$1" @@ -420,16 +436,15 @@ case "$__AlpineVersion" in elif [[ "$__AlpineArch" == "x86" ]]; then __AlpineVersion=3.17 # minimum version that supports lldb-dev __AlpinePackages+=" llvm15-libs" - elif [[ "$__AlpineArch" == "riscv64" ]]; then + elif [[ "$__AlpineArch" == "riscv64" || "$__AlpineArch" == "loongarch64" ]]; then + __AlpineVersion=3.21 # minimum version that supports lldb-dev + __AlpinePackages+=" llvm19-libs" + elif [[ -n "$__AlpineMajorVersion" ]]; then + # use whichever alpine version is provided and select the latest toolchain libs __AlpineLlvmLibsLookup=1 - __AlpineVersion=edge # minimum version with APKINDEX.tar.gz (packages archive) else __AlpineVersion=3.13 # 3.13 to maximize compatibility __AlpinePackages+=" llvm10-libs" - - if [[ "$__AlpineArch" == "armv7" ]]; then - __AlpinePackages="${__AlpinePackages//numactl-dev/}" - fi fi esac @@ -439,15 +454,6 @@ if [[ "$__AlpineVersion" =~ 3\.1[345] ]]; then __AlpinePackages="${__AlpinePackages/compiler-rt/compiler-rt-static}" fi -if [[ "$__BuildArch" == "armel" ]]; then - __LLDB_Package="lldb-3.5-dev" -fi - -if [[ "$__CodeName" == "xenial" && "$__UbuntuArch" == "armhf" ]]; then - # libnuma-dev is not available on armhf for xenial - __UbuntuPackages="${__UbuntuPackages//libnuma-dev/}" -fi - __UbuntuPackages+=" ${__LLDB_Package:-}" if [[ -z "$__UbuntuRepo" ]]; then @@ -496,7 +502,7 @@ if [[ "$__CodeName" == "alpine" ]]; then arch="$(uname -m)" ensureDownloadTool - + if [[ "$__hasWget" == 1 ]]; then wget -P "$__ApkToolsDir" "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" else @@ -512,11 +518,6 @@ if [[ "$__CodeName" == "alpine" ]]; then echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c chmod +x "$__ApkToolsDir/apk.static" - if [[ -f "/usr/bin/qemu-$__QEMUArch-static" ]]; then - mkdir -p "$__RootfsDir"/usr/bin - cp -v "/usr/bin/qemu-$__QEMUArch-static" "$__RootfsDir/usr/bin" - fi - if [[ "$__AlpineVersion" == "edge" ]]; then version=edge else @@ -536,6 +537,10 @@ if [[ "$__CodeName" == "alpine" ]]; then __ApkSignatureArg="--keys-dir $__ApkKeysDir" fi + if [[ "$__SkipEmulation" == "1" ]]; then + __NoEmulationArg="--no-scripts" + fi + # initialize DB # shellcheck disable=SC2086 "$__ApkToolsDir/apk.static" \ @@ -557,7 +562,7 @@ if [[ "$__CodeName" == "alpine" ]]; then "$__ApkToolsDir/apk.static" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/main" \ -X "http://dl-cdn.alpinelinux.org/alpine/$version/community" \ - -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" \ + -U $__ApkSignatureArg --root "$__RootfsDir" --arch "$__AlpineArch" $__NoEmulationArg \ add $__AlpinePackages rm -r "$__ApkToolsDir" @@ -573,7 +578,7 @@ elif [[ "$__CodeName" == "freebsd" ]]; then curl -SL "https://download.freebsd.org/ftp/releases/${__FreeBSDArch}/${__FreeBSDMachineArch}/${__FreeBSDBase}/base.txz" | tar -C "$__RootfsDir" -Jxf - ./lib ./usr/lib ./usr/libdata ./usr/include ./usr/share/keys ./etc ./bin/freebsd-version fi echo "ABI = \"FreeBSD:${__FreeBSDABI}:${__FreeBSDMachineArch}\"; FINGERPRINTS = \"${__RootfsDir}/usr/share/keys\"; REPOS_DIR = [\"${__RootfsDir}/etc/pkg\"]; REPO_AUTOUPDATE = NO; RUN_SCRIPTS = NO;" > "${__RootfsDir}"/usr/local/etc/pkg.conf - echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"${__RootfsDir}/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf + echo "FreeBSD: { url: \"pkg+http://pkg.FreeBSD.org/\${ABI}/quarterly\", mirror_type: \"srv\", signature_type: \"fingerprints\", fingerprints: \"/usr/share/keys/pkg\", enabled: yes }" > "${__RootfsDir}"/etc/pkg/FreeBSD.conf mkdir -p "$__RootfsDir"/tmp # get and build package manager if [[ "$__hasWget" == 1 ]]; then @@ -681,7 +686,7 @@ elif [[ "$__CodeName" == "haiku" ]]; then ensureDownloadTool - echo "Downloading Haiku package tool" + echo "Downloading Haiku package tools" git clone https://github.com/haiku/haiku-toolchains-ubuntu --depth 1 "$__RootfsDir/tmp/script" if [[ "$__hasWget" == 1 ]]; then wget -O "$__RootfsDir/tmp/download/hosttools.zip" "$("$__RootfsDir/tmp/script/fetch.sh" --hosttools)" @@ -691,34 +696,42 @@ elif [[ "$__CodeName" == "haiku" ]]; then unzip -o "$__RootfsDir/tmp/download/hosttools.zip" -d "$__RootfsDir/tmp/bin" - DepotBaseUrl="https://depot.haiku-os.org/__api/v2/pkg/get-pkg" - HpkgBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current" + HaikuBaseUrl="https://eu.hpkg.haiku-os.org/haiku/master/$__HaikuArch/current" + HaikuPortsBaseUrl="https://eu.hpkg.haiku-os.org/haikuports/master/$__HaikuArch/current" + + echo "Downloading HaikuPorts package repository index..." + if [[ "$__hasWget" == 1 ]]; then + wget -P "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo" + else + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuPortsBaseUrl/repo" + fi - # Download Haiku packages echo "Downloading Haiku packages" read -ra array <<<"$__HaikuPackages" for package in "${array[@]}"; do echo "Downloading $package..." - # API documented here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L60 - # The schema here: https://github.com/haiku/haikudepotserver/blob/master/haikudepotserver-api2/src/main/resources/api2/pkg.yaml#L598 + hpkgFilename="$(LD_LIBRARY_PATH="$__RootfsDir/tmp/bin" "$__RootfsDir/tmp/bin/package_repo" list -f "$__RootfsDir/tmp/download/repo" | + grep -E "${package}-" | sort -V | tail -n 1 | xargs)" + if [ -z "$hpkgFilename" ]; then + >&2 echo "ERROR: package $package missing." + exit 1 + fi + echo "Resolved filename: $hpkgFilename..." + hpkgDownloadUrl="$HaikuPortsBaseUrl/packages/$hpkgFilename" if [[ "$__hasWget" == 1 ]]; then - hpkgDownloadUrl="$(wget -qO- --post-data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ - --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" wget -P "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" else - hpkgDownloadUrl="$(curl -sSL -XPOST --data '{"name":"'"$package"'","repositorySourceCode":"haikuports_'$__HaikuArch'","versionType":"LATEST","naturalLanguageCode":"en"}' \ - --header 'Content-Type:application/json' "$DepotBaseUrl" | jq -r '.result.versions[].hpkgDownloadURL')" curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$hpkgDownloadUrl" fi done for package in haiku haiku_devel; do echo "Downloading $package..." if [[ "$__hasWget" == 1 ]]; then - hpkgVersion="$(wget -qO- "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" - wget -P "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + hpkgVersion="$(wget -qO- "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + wget -P "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" else - hpkgVersion="$(curl -sSL "$HpkgBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" - curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HpkgBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" + hpkgVersion="$(curl -sSL "$HaikuBaseUrl" | sed -n 's/^.*version: "\([^"]*\)".*$/\1/p')" + curl -SLO --create-dirs --output-dir "$__RootfsDir/tmp/download" "$HaikuBaseUrl/packages/$package-$hpkgVersion-1-$__HaikuArch.hpkg" fi done @@ -744,25 +757,67 @@ elif [[ "$__CodeName" == "haiku" ]]; then popd rm -rf "$__RootfsDir/tmp" elif [[ -n "$__CodeName" ]]; then + __Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)" + + if [[ "$__SkipEmulation" == "1" ]]; then + if [[ -z "$AR" ]]; then + if command -v ar &>/dev/null; then + AR="$(command -v ar)" + elif command -v llvm-ar &>/dev/null; then + AR="$(command -v llvm-ar)" + else + echo "Unable to find ar or llvm-ar on PATH, add them to PATH or set AR environment variable pointing to the available AR tool" + exit 1 + fi + fi + + PYTHON=${PYTHON_EXECUTABLE:-python3} + + # shellcheck disable=SC2086,SC2046 + echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ + $(for suite in $__Suites; do echo -n "--suite $suite "; done) \ + $__UbuntuPackages + + # shellcheck disable=SC2086,SC2046 + "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ + $(for suite in $__Suites; do echo -n "--suite $suite "; done) \ + $__UbuntuPackages + exit 0 + fi + + __UpdateOptions= if [[ "$__SkipSigCheck" == "0" ]]; then __Keyring="$__Keyring --force-check-gpg" + else + __Keyring= + __UpdateOptions="--allow-unauthenticated --allow-insecure-repositories" fi # shellcheck disable=SC2086 echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" - debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo" + # shellcheck disable=SC2086 + if ! debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"; then + echo "debootstrap failed! dumping debootstrap.log" + cat "$__RootfsDir/debootstrap/debootstrap.log" + exit 1 + fi + + rm -rf "$__RootfsDir"/etc/apt/*.{sources,list} "$__RootfsDir"/etc/apt/sources.list.d mkdir -p "$__RootfsDir/etc/apt/sources.list.d/" + + # shellcheck disable=SC2086 cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" < token2) - (token1 < token2) + else: + return -1 if isinstance(token1, str) else 1 + + return len(tokens1) - len(tokens2) + +def compare_debian_versions(version1, version2): + """Compare two Debian package versions.""" + epoch1, upstream1, revision1 = parse_debian_version(version1) + epoch2, upstream2, revision2 = parse_debian_version(version2) + + if epoch1 != epoch2: + return epoch1 - epoch2 + + result = compare_upstream_version(upstream1, upstream2) + if result != 0: + return result + + return compare_upstream_version(revision1, revision2) + +def resolve_dependencies(packages, aliases, desired_packages): + """Recursively resolves dependencies for the desired packages.""" + resolved = [] + to_process = deque(desired_packages) + + while to_process: + current = to_process.popleft() + resolved_package = current if current in packages else aliases.get(current, [None])[0] + + if not resolved_package: + print(f"Error: Package '{current}' was not found in the available packages.") + sys.exit(1) + + if resolved_package not in resolved: + resolved.append(resolved_package) + + deps = packages.get(resolved_package, {}).get("Depends", "") + if deps: + deps = [dep.split(' ')[0] for dep in deps.split(', ') if dep] + for dep in deps: + if dep not in resolved and dep not in to_process and dep in packages: + to_process.append(dep) + + return resolved + +def parse_package_index(content): + """Parses the Packages.gz file and returns package information.""" + packages = {} + aliases = {} + entries = re.split(r'\n\n+', content) + + for entry in entries: + fields = dict(re.findall(r'^(\S+): (.+)$', entry, re.MULTILINE)) + if "Package" in fields: + package_name = fields["Package"] + version = fields.get("Version") + filename = fields.get("Filename") + depends = fields.get("Depends") + provides = fields.get("Provides", None) + + # Only update if package_name is not in packages or if the new version is higher + if package_name not in packages or compare_debian_versions(version, packages[package_name]["Version"]) > 0: + packages[package_name] = { + "Version": version, + "Filename": filename, + "Depends": depends + } + + # Update aliases if package provides any alternatives + if provides: + provides_list = [x.strip() for x in provides.split(",")] + for alias in provides_list: + # Strip version specifiers + alias_name = re.sub(r'\s*\(=.*\)', '', alias) + if alias_name not in aliases: + aliases[alias_name] = [] + if package_name not in aliases[alias_name]: + aliases[alias_name].append(package_name) + + return packages, aliases + +def install_packages(mirror, packages_info, aliases, tmp_dir, extract_dir, ar_tool, desired_packages): + """Downloads .deb files and extracts them.""" + resolved_packages = resolve_dependencies(packages_info, aliases, desired_packages) + print(f"Resolved packages (including dependencies): {resolved_packages}") + + packages_to_download = {} + + for pkg in resolved_packages: + if pkg in packages_info: + packages_to_download[pkg] = packages_info[pkg] + + if pkg in aliases: + for alias in aliases[pkg]: + if alias in packages_info: + packages_to_download[alias] = packages_info[alias] + + asyncio.run(download_deb_files_parallel(mirror, packages_to_download, tmp_dir)) + + package_to_deb_file_map = {} + for pkg in resolved_packages: + pkg_info = packages_info.get(pkg) + if pkg_info: + deb_filename = pkg_info.get("Filename") + if deb_filename: + deb_file_path = os.path.join(tmp_dir, os.path.basename(deb_filename)) + package_to_deb_file_map[pkg] = deb_file_path + + for pkg in reversed(resolved_packages): + deb_file = package_to_deb_file_map.get(pkg) + if deb_file and os.path.exists(deb_file): + extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool) + + print("All done!") + +def extract_deb_file(deb_file, tmp_dir, extract_dir, ar_tool): + """Extract .deb file contents""" + + os.makedirs(extract_dir, exist_ok=True) + + with tempfile.TemporaryDirectory(dir=tmp_dir) as tmp_subdir: + result = subprocess.run(f"{ar_tool} t {os.path.abspath(deb_file)}", cwd=tmp_subdir, check=True, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + tar_filename = None + for line in result.stdout.decode().splitlines(): + if line.startswith("data.tar"): + tar_filename = line.strip() + break + + if not tar_filename: + raise FileNotFoundError(f"Could not find 'data.tar.*' in {deb_file}.") + + tar_file_path = os.path.join(tmp_subdir, tar_filename) + print(f"Extracting {tar_filename} from {deb_file}..") + + subprocess.run(f"{ar_tool} p {os.path.abspath(deb_file)} {tar_filename} > {tar_file_path}", check=True, shell=True) + + file_extension = os.path.splitext(tar_file_path)[1].lower() + + if file_extension == ".xz": + mode = "r:xz" + elif file_extension == ".gz": + mode = "r:gz" + elif file_extension == ".zst": + # zstd is not supported by standard library yet + decompressed_tar_path = tar_file_path.replace(".zst", "") + with open(tar_file_path, "rb") as zst_file, open(decompressed_tar_path, "wb") as decompressed_file: + dctx = zstandard.ZstdDecompressor() + dctx.copy_stream(zst_file, decompressed_file) + + tar_file_path = decompressed_tar_path + mode = "r" + else: + raise ValueError(f"Unsupported compression format: {file_extension}") + + with tarfile.open(tar_file_path, mode) as tar: + tar.extractall(path=extract_dir, filter='fully_trusted') + +def finalize_setup(rootfsdir): + lib_dir = os.path.join(rootfsdir, 'lib') + usr_lib_dir = os.path.join(rootfsdir, 'usr', 'lib') + + if os.path.exists(lib_dir): + if os.path.islink(lib_dir): + os.remove(lib_dir) + else: + os.makedirs(usr_lib_dir, exist_ok=True) + + for item in os.listdir(lib_dir): + src = os.path.join(lib_dir, item) + dest = os.path.join(usr_lib_dir, item) + + if os.path.isdir(src): + shutil.copytree(src, dest, dirs_exist_ok=True) + else: + shutil.copy2(src, dest) + + shutil.rmtree(lib_dir) + + os.symlink(usr_lib_dir, lib_dir) + +if __name__ == "__main__": + parser = argparse.ArgumentParser(description="Generate rootfs for .NET runtime on Debian-like OS") + parser.add_argument("--distro", required=False, help="Distro name (e.g., debian, ubuntu, etc.)") + parser.add_argument("--arch", required=True, help="Architecture (e.g., amd64, loong64, etc.)") + parser.add_argument("--rootfsdir", required=True, help="Destination directory.") + parser.add_argument('--suite', required=True, action='append', help='Specify one or more repository suites to collect index data.') + parser.add_argument("--mirror", required=False, help="Mirror (e.g., http://ftp.debian.org/debian-ports etc.)") + parser.add_argument("--artool", required=False, default="ar", help="ar tool to extract debs (e.g., ar, llvm-ar etc.)") + parser.add_argument("packages", nargs="+", help="List of package names to be installed.") + + args = parser.parse_args() + + if args.mirror is None: + if args.distro == "ubuntu": + args.mirror = "http://archive.ubuntu.com/ubuntu" if args.arch in ["amd64", "i386"] else "http://ports.ubuntu.com/ubuntu-ports" + elif args.distro == "debian": + args.mirror = "http://ftp.debian.org/debian-ports" + else: + raise Exception("Unsupported distro") + + DESIRED_PACKAGES = args.packages + [ # base packages + "dpkg", + "busybox", + "libc-bin", + "base-files", + "base-passwd", + "debianutils" + ] + + print(f"Creating rootfs. rootfsdir: {args.rootfsdir}, distro: {args.distro}, arch: {args.arch}, suites: {args.suite}, mirror: {args.mirror}") + + package_index_content = asyncio.run(download_package_index_parallel(args.mirror, args.arch, args.suite)) + + packages_info, aliases = parse_package_index(package_index_content) + + with tempfile.TemporaryDirectory() as tmp_dir: + install_packages(args.mirror, packages_info, aliases, tmp_dir, args.rootfsdir, args.artool, DESIRED_PACKAGES) + + finalize_setup(args.rootfsdir) diff --git a/eng/common/cross/tizen-build-rootfs.sh b/eng/common/cross/tizen-build-rootfs.sh old mode 100644 new mode 100755 diff --git a/eng/common/cross/tizen-fetch.sh b/eng/common/cross/tizen-fetch.sh old mode 100644 new mode 100755 index 28936ceef3a7..37c3a61f1de8 --- a/eng/common/cross/tizen-fetch.sh +++ b/eng/common/cross/tizen-fetch.sh @@ -156,13 +156,8 @@ fetch_tizen_pkgs() done } -if [ "$TIZEN_ARCH" == "riscv64" ]; then - BASE="Tizen-Base-RISCV" - UNIFIED="Tizen-Unified-RISCV" -else - BASE="Tizen-Base" - UNIFIED="Tizen-Unified" -fi +BASE="Tizen-Base" +UNIFIED="Tizen-Unified" Inform "Initialize ${TIZEN_ARCH} base" fetch_tizen_pkgs_init standard $BASE diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 9a7ecfbd42c5..0ff85cf0367e 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -67,6 +67,13 @@ elseif(TARGET_ARCH_NAME STREQUAL "armv6") else() set(TOOLCHAIN "arm-linux-gnueabihf") endif() +elseif(TARGET_ARCH_NAME STREQUAL "loongarch64") + set(CMAKE_SYSTEM_PROCESSOR "loongarch64") + if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/loongarch64-alpine-linux-musl) + set(TOOLCHAIN "loongarch64-alpine-linux-musl") + else() + set(TOOLCHAIN "loongarch64-linux-gnu") + endif() elseif(TARGET_ARCH_NAME STREQUAL "ppc64le") set(CMAKE_SYSTEM_PROCESSOR ppc64le) if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/powerpc64le-alpine-linux-musl) @@ -118,7 +125,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() - message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") + message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, loongarch64, ppc64le, riscv64, s390x, x64 and x86 are supported!") endif() if(DEFINED ENV{TOOLCHAIN}) @@ -148,6 +155,25 @@ if(TIZEN) include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() +function(locate_toolchain_exec exec var) + set(TOOLSET_PREFIX ${TOOLCHAIN}-) + string(TOUPPER ${exec} EXEC_UPPERCASE) + if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") + set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) + return() + endif() + + find_program(EXEC_LOCATION_${exec} + NAMES + "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" + "${TOOLSET_PREFIX}${exec}") + + if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") + message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") + endif() + set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) +endfunction() + if(ANDROID) if(TARGET_ARCH_NAME STREQUAL "arm") set(ANDROID_ABI armeabi-v7a) @@ -178,66 +204,24 @@ elseif(FREEBSD) set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld") elseif(ILLUMOS) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") + set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") include_directories(SYSTEM ${CROSS_ROOTFS}/include) - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") - locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") elseif(HAIKU) set(CMAKE_SYSROOT "${CROSS_ROOTFS}") set(CMAKE_PROGRAM_PATH "${CMAKE_PROGRAM_PATH};${CROSS_ROOTFS}/cross-tools-x86_64/bin") - - set(TOOLSET_PREFIX ${TOOLCHAIN}-) - function(locate_toolchain_exec exec var) - string(TOUPPER ${exec} EXEC_UPPERCASE) - if(NOT "$ENV{CLR_${EXEC_UPPERCASE}}" STREQUAL "") - set(${var} "$ENV{CLR_${EXEC_UPPERCASE}}" PARENT_SCOPE) - return() - endif() - - find_program(EXEC_LOCATION_${exec} - NAMES - "${TOOLSET_PREFIX}${exec}${CLR_CMAKE_COMPILER_FILE_NAME_VERSION}" - "${TOOLSET_PREFIX}${exec}") - - if (EXEC_LOCATION_${exec} STREQUAL "EXEC_LOCATION_${exec}-NOTFOUND") - message(FATAL_ERROR "Unable to find toolchain executable. Name: ${exec}, Prefix: ${TOOLSET_PREFIX}.") - endif() - set(${var} ${EXEC_LOCATION_${exec}} PARENT_SCOPE) - endfunction() - set(CMAKE_SYSTEM_PREFIX_PATH "${CROSS_ROOTFS}") + set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") + set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") locate_toolchain_exec(gcc CMAKE_C_COMPILER) locate_toolchain_exec(g++ CMAKE_CXX_COMPILER) - set(CMAKE_C_STANDARD_LIBRARIES "${CMAKE_C_STANDARD_LIBRARIES} -lssp") - set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} -lssp") - # let CMake set up the correct search paths include(Platform/Haiku) else() @@ -307,7 +291,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index 36dbd45e1ce8..e889f439b8dc 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -68,7 +68,7 @@ function InstallDarcCli { fi fi - local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" + local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" echo "Installing Darc CLI version $darcVersion..." echo "You may need to restart your command shell if this is the first dotnet tool you have installed." diff --git a/eng/common/dotnet.cmd b/eng/common/dotnet.cmd new file mode 100644 index 000000000000..527fa4bb38fb --- /dev/null +++ b/eng/common/dotnet.cmd @@ -0,0 +1,7 @@ +@echo off + +:: This script is used to install the .NET SDK. +:: It will also invoke the SDK with any provided arguments. + +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0dotnet.ps1""" %*" +exit /b %ErrorLevel% diff --git a/eng/common/dotnet.ps1 b/eng/common/dotnet.ps1 new file mode 100644 index 000000000000..45e5676c9ebd --- /dev/null +++ b/eng/common/dotnet.ps1 @@ -0,0 +1,11 @@ +# This script is used to install the .NET SDK. +# It will also invoke the SDK with any provided arguments. + +. $PSScriptRoot\tools.ps1 +$dotnetRoot = InitializeDotNetCli -install:$true + +# Invoke acquired SDK with args if they are provided +if ($args.count -gt 0) { + $env:DOTNET_NOLOGO=1 + & "$dotnetRoot\dotnet.exe" $args +} diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh new file mode 100755 index 000000000000..2ef68235675f --- /dev/null +++ b/eng/common/dotnet.sh @@ -0,0 +1,26 @@ +#!/usr/bin/env bash + +# This script is used to install the .NET SDK. +# It will also invoke the SDK with any provided arguments. + +source="${BASH_SOURCE[0]}" +# resolve $SOURCE until the file is no longer a symlink +while [[ -h $source ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +source $scriptroot/tools.sh +InitializeDotNetCli true # install + +# Invoke acquired SDK with args if they are provided +if [[ $# > 0 ]]; then + __dotnetDir=${_InitializeDotNetCli} + dotnetPath=${__dotnetDir}/dotnet + ${dotnetPath} "$@" +fi diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 524aaa57f2b7..fa1cdc2b3007 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFilesV3 = @() +$wxlFilesV5 = @() $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them if (-not $wxlFiles) { $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $content = Get-Content $_.FullName -Raw + + # Split files on schema to select different parser settings in the generated project. + if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*") + { + $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*") + { + $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + } } } @@ -114,7 +126,32 @@ $locJson = @{ CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( - $wxlFiles | ForEach-Object { + $wxlFilesV3 | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "P210WxlSchemaV4.lss" ) + LocItems = @( + $wxlFilesV5 | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100644 new mode 100755 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh new file mode 100755 index 000000000000..477a44f335be --- /dev/null +++ b/eng/common/native/install-dependencies.sh @@ -0,0 +1,62 @@ +#!/bin/sh + +set -e + +# This is a simple script primarily used for CI to install necessary dependencies +# +# Usage: +# +# ./install-dependencies.sh + +os="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + +if [ -z "$os" ]; then + . "$(dirname "$0")"/init-os-and-arch.sh +fi + +case "$os" in + linux) + if [ -e /etc/os-release ]; then + . /etc/os-release + fi + + if [ "$ID" = "debian" ] || [ "$ID_LIKE" = "debian" ]; then + apt update + + apt install -y build-essential gettext locales cmake llvm clang lld lldb liblldb-dev libunwind8-dev libicu-dev liblttng-ust-dev \ + libssl-dev libkrb5-dev pigz cpio + + localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then + pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" + $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + elif [ "$ID" = "alpine" ]; then + apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio + else + echo "Unsupported distro. distro: $ID" + exit 1 + fi + ;; + + osx|maccatalyst|ios|iossimulator|tvos|tvossimulator) + echo "Installed xcode version: $(xcode-select -p)" + + export HOMEBREW_NO_INSTALL_CLEANUP=1 + export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 + # Skip brew update for now, see https://github.com/actions/setup-python/issues/577 + # brew update --preinstall + brew bundle --no-upgrade --file=- < Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." } @@ -34,10 +39,11 @@ function Print-Usage() { function Build([string]$target) { $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" } $log = Join-Path $LogDir "$task$logSuffix.binlog" + $binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" } $outputPath = Join-Path $ToolsetDir "$task\" MSBuild $taskProject ` - /bl:$log ` + $binaryLogArg ` /t:$target ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` @@ -64,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh new file mode 100755 index 000000000000..3270f83fa9a7 --- /dev/null +++ b/eng/common/sdk-task.sh @@ -0,0 +1,121 @@ +#!/usr/bin/env bash + +show_usage() { + echo "Common settings:" + echo " --task Name of Arcade task (name of a project in SdkTasks directory of the Arcade SDK package)" + echo " --restore Restore dependencies" + echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" + echo " --help Print help and exit" + echo "" + + echo "Advanced settings:" + echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --noWarnAsError Do not warn as error" + echo "" + echo "Command line arguments not listed above are passed thru to msbuild." +} + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +Build() { + local target=$1 + local log_suffix="" + [[ "$target" != "Execute" ]] && log_suffix=".$target" + local log="$log_dir/$task$log_suffix.binlog" + local binaryLogArg="" + [[ $binary_log == true ]] && binaryLogArg="/bl:$log" + local output_path="$toolset_dir/$task/" + + MSBuild "$taskProject" \ + $binaryLogArg \ + /t:"$target" \ + /p:Configuration="$configuration" \ + /p:RepoRoot="$repo_root" \ + /p:BaseIntermediateOutputPath="$output_path" \ + /v:"$verbosity" \ + $properties +} + +binary_log=true +configuration="Debug" +verbosity="minimal" +exclude_ci_binary_log=false +restore=false +help=false +properties='' +warnAsError=true + +while (($# > 0)); do + lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" + case $lowerI in + --task) + task=$2 + shift 2 + ;; + --restore) + restore=true + shift 1 + ;; + --verbosity) + verbosity=$2 + shift 2 + ;; + --excludecibinarylog|--nobl) + binary_log=false + exclude_ci_binary_log=true + shift 1 + ;; + --noWarnAsError) + warnAsError=false + shift 1 + ;; + --help) + help=true + shift 1 + ;; + *) + properties="$properties $1" + shift 1 + ;; + esac +done + +ci=true + +if $help; then + show_usage + exit 0 +fi + +. "$scriptroot/tools.sh" +InitializeToolset + +if [[ -z "$task" ]]; then + Write-PipelineTelemetryError -Category 'Task' -Name 'MissingTask' -Message "Missing required parameter '-task '" + ExitWithExitCode 1 +fi + +taskProject=$(GetSdkTaskProject "$task") +if [[ ! -e "$taskProject" ]]; then + Write-PipelineTelemetryError -Category 'Task' -Name 'UnknownTask' -Message "Unknown task: $task" + ExitWithExitCode 1 +fi + +if $restore; then + Build "Restore" +fi + +Build "Execute" + + +ExitWithExitCode 0 diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bba1..e5f543ea68c2 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 81ea7a261f2d..92a0664f5647 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -31,6 +31,7 @@ jobs: PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked continueOnError: true - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - output: pipelineArtifact @@ -39,6 +40,7 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked sbomEnabled: false # we don't need SBOM for logs - ${{ if eq(parameters.enablePublishBuildArtifacts, true) }}: @@ -46,7 +48,7 @@ jobs: displayName: Publish Logs PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' publishLocation: Container - ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() sbomEnabled: false # we don't need SBOM for logs diff --git a/eng/common/templates-official/steps/publish-build-artifacts.yml b/eng/common/templates-official/steps/publish-build-artifacts.yml index 100a3fc98493..fcf6637b2ebc 100644 --- a/eng/common/templates-official/steps/publish-build-artifacts.yml +++ b/eng/common/templates-official/steps/publish-build-artifacts.yml @@ -24,6 +24,10 @@ parameters: - name: is1ESPipeline type: boolean default: true + +- name: retryCountOnTaskFailure + type: string + default: 10 steps: - ${{ if ne(parameters.is1ESPipeline, true) }}: @@ -38,4 +42,5 @@ steps: PathtoPublish: ${{ parameters.pathToPublish }} ${{ if parameters.artifactName }}: ArtifactName: ${{ parameters.artifactName }} - + ${{ if parameters.retryCountOnTaskFailure }}: + retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }} diff --git a/eng/common/templates-official/steps/source-index-stage1-publish.yml b/eng/common/templates-official/steps/source-index-stage1-publish.yml new file mode 100644 index 000000000000..9b8b80942b5c --- /dev/null +++ b/eng/common/templates-official/steps/source-index-stage1-publish.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml + parameters: + is1ESPipeline: true + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 5bdd3dd85fd2..238fa0818f7b 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -46,6 +46,7 @@ jobs: artifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - template: /eng/common/core-templates/steps/publish-pipeline-artifacts.yml parameters: @@ -56,6 +57,7 @@ jobs: displayName: 'Publish logs' continueOnError: true condition: always() + retryCountOnTaskFailure: 10 # for any logs being locked sbomEnabled: false # we don't need SBOM for logs - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: @@ -66,7 +68,7 @@ jobs: displayName: Publish Logs pathToPublish: '$(Build.ArtifactStagingDirectory)/artifacts/log/$(_BuildConfig)' publishLocation: Container - artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + artifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)_Attempt$(System.JobAttempt)' ) }} continueOnError: true condition: always() diff --git a/eng/common/templates/steps/publish-build-artifacts.yml b/eng/common/templates/steps/publish-build-artifacts.yml index 6428a98dfef6..605e602e94d1 100644 --- a/eng/common/templates/steps/publish-build-artifacts.yml +++ b/eng/common/templates/steps/publish-build-artifacts.yml @@ -25,6 +25,10 @@ parameters: type: string default: 'Container' +- name: retryCountOnTaskFailure + type: string + default: 10 + steps: - ${{ if eq(parameters.is1ESPipeline, true) }}: - 'eng/common/templates cannot be referenced from a 1ES managed template': error @@ -37,4 +41,6 @@ steps: PublishLocation: ${{ parameters.publishLocation }} PathtoPublish: ${{ parameters.pathToPublish }} ${{ if parameters.artifactName }}: - ArtifactName: ${{ parameters.artifactName }} \ No newline at end of file + ArtifactName: ${{ parameters.artifactName }} + ${{ if parameters.retryCountOnTaskFailure }}: + retryCountOnTaskFailure: ${{ parameters.retryCountOnTaskFailure }} diff --git a/eng/common/templates/steps/source-index-stage1-publish.yml b/eng/common/templates/steps/source-index-stage1-publish.yml new file mode 100644 index 000000000000..182cec33a7bb --- /dev/null +++ b/eng/common/templates/steps/source-index-stage1-publish.yml @@ -0,0 +1,7 @@ +steps: +- template: /eng/common/core-templates/steps/source-index-stage1-publish.yml + parameters: + is1ESPipeline: false + + ${{ each parameter in parameters }}: + ${{ parameter.key }}: ${{ parameter.value }} diff --git a/eng/common/templates/steps/vmr-sync.yml b/eng/common/templates/steps/vmr-sync.yml new file mode 100644 index 000000000000..599afb6186b8 --- /dev/null +++ b/eng/common/templates/steps/vmr-sync.yml @@ -0,0 +1,207 @@ +### These steps synchronize new code from product repositories into the VMR (https://github.com/dotnet/dotnet). +### They initialize the darc CLI and pull the new updates. +### Changes are applied locally onto the already cloned VMR (located in $vmrPath). + +parameters: +- name: targetRef + displayName: Target revision in dotnet/ to synchronize + type: string + default: $(Build.SourceVersion) + +- name: vmrPath + displayName: Path where the dotnet/dotnet is checked out to + type: string + default: $(Agent.BuildDirectory)/vmr + +- name: additionalSyncs + displayName: Optional list of package names whose repo's source will also be synchronized in the local VMR, e.g. NuGet.Protocol + type: object + default: [] + +steps: +- checkout: vmr + displayName: Clone dotnet/dotnet + path: vmr + clean: true + +- checkout: self + displayName: Clone $(Build.Repository.Name) + path: repo + fetchDepth: 0 + +# This step is needed so that when we get a detached HEAD / shallow clone, +# we still pull the commit into the temporary repo clone to use it during the sync. +# Also unshallow the clone so that forwardflow command would work. +- script: | + git branch repo-head + git rev-parse HEAD + displayName: Label PR commit + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + vmr_sha=$(grep -oP '(?<=Sha=")[^"]*' $(Agent.BuildDirectory)/repo/eng/Version.Details.xml) + echo "##vso[task.setvariable variable=vmr_sha]$vmr_sha" + displayName: Obtain the vmr sha from Version.Details.xml (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- powershell: | + [xml]$xml = Get-Content -Path $(Agent.BuildDirectory)/repo/eng/Version.Details.xml + $vmr_sha = $xml.SelectSingleNode("//Source").Sha + Write-Output "##vso[task.setvariable variable=vmr_sha]$vmr_sha" + displayName: Obtain the vmr sha from Version.Details.xml (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + git fetch --all + git checkout $(vmr_sha) + displayName: Checkout VMR at correct sha for repo flow + workingDirectory: ${{ parameters.vmrPath }} + +- script: | + git config --global user.name "dotnet-maestro[bot]" + git config --global user.email "dotnet-maestro[bot]@users.noreply.github.com" + displayName: Set git author to dotnet-maestro[bot] + workingDirectory: ${{ parameters.vmrPath }} + +- script: | + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(dn-bot-all-orgs-code-r)' \ + --ci \ + --debug + + if [ "$?" -ne 0 ]; then + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + fi + displayName: Sync repo into VMR (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- script: | + git config --global diff.astextplain.textconv echo + git config --system core.longpaths true + displayName: Configure Windows git (longpaths, astextplain) + condition: eq(variables['Agent.OS'], 'Windows_NT') + +- powershell: | + ./eng/common/vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(dn-bot-all-orgs-code-r)' ` + -ci ` + -debugOutput + + if ($LASTEXITCODE -ne 0) { + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + } + displayName: Sync repo into VMR (Windows) + condition: eq(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + +- ${{ if eq(variables['Build.Reason'], 'PullRequest') }}: + - task: CopyFiles@2 + displayName: Collect failed patches + condition: failed() + inputs: + SourceFolder: '$(Agent.TempDirectory)' + Contents: '*.patch' + TargetFolder: '$(Build.ArtifactStagingDirectory)/FailedPatches' + + - publish: '$(Build.ArtifactStagingDirectory)/FailedPatches' + artifact: $(System.JobDisplayName)_FailedPatches + displayName: Upload failed patches + condition: failed() + +- ${{ each assetName in parameters.additionalSyncs }}: + # The vmr-sync script ends up staging files in the local VMR so we have to commit those + - script: + git commit --allow-empty -am "Forward-flow $(Build.Repository.Name)" + displayName: Commit local VMR changes + workingDirectory: ${{ parameters.vmrPath }} + + - script: | + set -ex + + echo "Searching for details of asset ${{ assetName }}..." + + # Use darc to get dependencies information + dependencies=$(./.dotnet/dotnet darc get-dependencies --name '${{ assetName }}' --ci) + + # Extract repository URL and commit hash + repository=$(echo "$dependencies" | grep 'Repo:' | sed 's/Repo:[[:space:]]*//' | head -1) + + if [ -z "$repository" ]; then + echo "##vso[task.logissue type=error]Asset ${{ assetName }} not found in the dependency list" + exit 1 + fi + + commit=$(echo "$dependencies" | grep 'Commit:' | sed 's/Commit:[[:space:]]*//' | head -1) + + echo "Updating the VMR from $repository / $commit..." + cd .. + git clone $repository ${{ assetName }} + cd ${{ assetName }} + git checkout $commit + git branch "sync/$commit" + + ./eng/common/vmr-sync.sh \ + --vmr ${{ parameters.vmrPath }} \ + --tmp $(Agent.TempDirectory) \ + --azdev-pat '$(dn-bot-all-orgs-code-r)' \ + --ci \ + --debug + + if [ "$?" -ne 0 ]; then + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + fi + displayName: Sync ${{ assetName }} into (Unix) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo + + - powershell: | + $ErrorActionPreference = 'Stop' + + Write-Host "Searching for details of asset ${{ assetName }}..." + + $dependencies = .\.dotnet\dotnet darc get-dependencies --name '${{ assetName }}' --ci + + $repository = $dependencies | Select-String -Pattern 'Repo:\s+([^\s]+)' | Select-Object -First 1 + $repository -match 'Repo:\s+([^\s]+)' | Out-Null + $repository = $matches[1] + + if ($repository -eq $null) { + Write-Error "Asset ${{ assetName }} not found in the dependency list" + exit 1 + } + + $commit = $dependencies | Select-String -Pattern 'Commit:\s+([^\s]+)' | Select-Object -First 1 + $commit -match 'Commit:\s+([^\s]+)' | Out-Null + $commit = $matches[1] + + Write-Host "Updating the VMR from $repository / $commit..." + cd .. + git clone $repository ${{ assetName }} + cd ${{ assetName }} + git checkout $commit + git branch "sync/$commit" + + .\eng\common\vmr-sync.ps1 ` + -vmr ${{ parameters.vmrPath }} ` + -tmp $(Agent.TempDirectory) ` + -azdevPat '$(dn-bot-all-orgs-code-r)' ` + -ci ` + -debugOutput + + if ($LASTEXITCODE -ne 0) { + echo "##vso[task.logissue type=error]Failed to synchronize the VMR" + exit 1 + } + displayName: Sync ${{ assetName }} into (Windows) + condition: ne(variables['Agent.OS'], 'Windows_NT') + workingDirectory: $(Agent.BuildDirectory)/repo diff --git a/eng/common/templates/vmr-build-pr.yml b/eng/common/templates/vmr-build-pr.yml new file mode 100644 index 000000000000..ce3c29a62faf --- /dev/null +++ b/eng/common/templates/vmr-build-pr.yml @@ -0,0 +1,42 @@ +# This pipeline is used for running the VMR verification of the PR changes in repo-level PRs. +# +# It will run a full set of verification jobs defined in: +# https://github.com/dotnet/dotnet/blob/10060d128e3f470e77265f8490f5e4f72dae738e/eng/pipelines/templates/stages/vmr-build.yml#L27-L38 +# +# For repos that do not need to run the full set, you would do the following: +# +# 1. Copy this YML file to a repo-specific location, i.e. outside of eng/common. +# +# 2. Add `verifications` parameter to VMR template reference +# +# Examples: +# - For source-build stage 1 verification, add the following: +# verifications: [ "source-build-stage1" ] +# +# - For Windows only verifications, add the following: +# verifications: [ "unified-build-windows-x64", "unified-build-windows-x86" ] + +trigger: none +pr: none + +variables: +- template: /eng/common/templates/variables/pool-providers.yml@self + +- name: skipComponentGovernanceDetection # we run CG on internal builds only + value: true + +- name: Codeql.Enabled # we run CodeQL on internal builds only + value: false + +resources: + repositories: + - repository: vmr + type: github + name: dotnet/dotnet + endpoint: dotnet + +stages: +- template: /eng/pipelines/templates/stages/vmr-build.yml@vmr + parameters: + isBuiltFromVmr: false + scope: lite diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a06513a59407..049fe6db994e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -65,10 +65,8 @@ $ErrorActionPreference = 'Stop' # Base-64 encoded SAS token that has permission to storage container described by $runtimeSourceFeed [string]$runtimeSourceFeedKey = if (Test-Path variable:runtimeSourceFeedKey) { $runtimeSourceFeedKey } else { $null } -# True if the build is a product build -[bool]$productBuild = if (Test-Path variable:productBuild) { $productBuild } else { $false } - -[String[]]$properties = if (Test-Path variable:properties) { $properties } else { @() } +# True when the build is running within the VMR. +[bool]$fromVMR = if (Test-Path variable:fromVMR) { $fromVMR } else { $false } function Create-Directory ([string[]] $path) { New-Item -Path $path -Force -ItemType 'Directory' | Out-Null @@ -259,7 +257,20 @@ function Retry($downloadBlock, $maxRetries = 5) { function GetDotNetInstallScript([string] $dotnetRoot) { $installScript = Join-Path $dotnetRoot 'dotnet-install.ps1' + $shouldDownload = $false + if (!(Test-Path $installScript)) { + $shouldDownload = $true + } else { + # Check if the script is older than 30 days + $fileAge = (Get-Date) - (Get-Item $installScript).LastWriteTime + if ($fileAge.Days -gt 30) { + Write-Host "Existing install script is too old, re-downloading..." + $shouldDownload = $true + } + } + + if ($shouldDownload) { Create-Directory $dotnetRoot $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit $uri = "https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.ps1" @@ -383,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 - $defaultXCopyMSBuildVersion = '17.12.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { @@ -533,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - $vswhereVersion = '2.5.2' + # keep this in sync with the VSWhereVersion in DefaultVersions.props + $vswhereVersion = '3.1.7' } $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" @@ -541,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere' + Write-Host "Downloading vswhere $vswhereVersion" + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) @@ -611,14 +624,7 @@ function InitializeBuildTool() { } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - # Use override if it exists - commonly set by source-build - if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { - $initializeBuildToolFramework="net9.0" - } else { - $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework - } - - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net' } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore @@ -627,7 +633,7 @@ function InitializeBuildTool() { ExitWithExitCode 1 } - $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "net472"; ExcludePrereleaseVS = $excludePrereleaseVS } + $buildTool = @{ Path = $msbuildPath; Command = ""; Tool = "vs"; Framework = "netframework"; ExcludePrereleaseVS = $excludePrereleaseVS } } else { Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Unexpected value of -msbuildEngine: '$msbuildEngine'." ExitWithExitCode 1 @@ -660,7 +666,6 @@ function GetNuGetPackageCachePath() { $env:NUGET_PACKAGES = Join-Path $env:UserProfile '.nuget\packages\' } else { $env:NUGET_PACKAGES = Join-Path $RepoRoot '.packages\' - $env:RESTORENOHTTPCACHE = $true } } @@ -782,26 +787,13 @@ function MSBuild() { $toolsetBuildProject = InitializeToolset $basePath = Split-Path -parent $toolsetBuildProject - $possiblePaths = @( - # new scripts need to work with old packages, so we need to look for the old names/versions - (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net7.0 'Microsoft.DotNet.Arcade.Sdk.dll')), - (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.ArcadeLogging.dll')), - (Join-Path $basePath (Join-Path net8.0 'Microsoft.DotNet.Arcade.Sdk.dll')) - ) - $selectedPath = $null - foreach ($path in $possiblePaths) { - if (Test-Path $path -PathType Leaf) { - $selectedPath = $path - break - } - } + $selectedPath = Join-Path $basePath (Join-Path $buildTool.Framework 'Microsoft.DotNet.ArcadeLogging.dll') + if (-not $selectedPath) { - Write-PipelineTelemetryError -Category 'Build' -Message 'Unable to find arcade sdk logger assembly.' + Write-PipelineTelemetryError -Category 'Build' -Message "Unable to find arcade sdk logger assembly: $selectedPath" ExitWithExitCode 1 } + $args += "/logger:$selectedPath" } @@ -864,8 +856,8 @@ function MSBuild-Core() { } # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$productBuild -and -not($properties -like "*DotNetBuildRepo=true*")) { + # Skip this when the build is a child of the VMR build. + if ($ci -and $env:SYSTEM_TEAMPROJECT -ne $null -and !$fromVMR) { Write-PipelineSetResult -Result "Failed" -Message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 01b09b65796c..c1841c9dfd0f 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -5,6 +5,9 @@ # CI mode - set to true on CI server for PR validation build or official build. ci=${ci:-false} +# Build mode +source_build=${source_build:-false} + # Set to true to use the pipelines logger which will enable Azure logging output. # https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md # This flag is meant as a temporary opt-opt for the feature while validate it across @@ -58,7 +61,8 @@ use_installed_dotnet_cli=${use_installed_dotnet_cli:-true} dotnetInstallScriptVersion=${dotnetInstallScriptVersion:-'v1'} # True to use global NuGet cache instead of restoring packages to repository-local directory. -if [[ "$ci" == true ]]; then +# Keep in sync with NuGetPackageroot in Arcade SDK's RepositoryLayout.props. +if [[ "$ci" == true || "$source_build" == true ]]; then use_global_nuget_cache=${use_global_nuget_cache:-false} else use_global_nuget_cache=${use_global_nuget_cache:-true} @@ -68,8 +72,8 @@ fi runtime_source_feed=${runtime_source_feed:-''} runtime_source_feed_key=${runtime_source_feed_key:-''} -# True if the build is a product build -product_build=${product_build:-false} +# True when the build is running within the VMR. +from_vmr=${from_vmr:-false} # Resolve any symlinks in the given path. function ResolvePath { @@ -296,8 +300,29 @@ function GetDotNetInstallScript { local root=$1 local install_script="$root/dotnet-install.sh" local install_script_url="https://builds.dotnet.microsoft.com/dotnet/scripts/$dotnetInstallScriptVersion/dotnet-install.sh" + local timestamp_file="$root/.dotnet-install.timestamp" + local should_download=false if [[ ! -a "$install_script" ]]; then + should_download=true + elif [[ -f "$timestamp_file" ]]; then + # Check if the script is older than 30 days using timestamp file + local download_time=$(cat "$timestamp_file" 2>/dev/null || echo "0") + local current_time=$(date +%s) + local age_seconds=$((current_time - download_time)) + + # 30 days = 30 * 24 * 60 * 60 = 2592000 seconds + if [[ $age_seconds -gt 2592000 ]]; then + echo "Existing install script is too old, re-downloading..." + should_download=true + fi + else + # No timestamp file exists, assume script is old and re-download + echo "No timestamp found for existing install script, re-downloading..." + should_download=true + fi + + if [[ "$should_download" == true ]]; then mkdir -p "$root" echo "Downloading '$install_script_url'" @@ -324,6 +349,9 @@ function GetDotNetInstallScript { ExitWithExitCode $exit_code } fi + + # Create timestamp file to track download time in seconds from epoch + date +%s > "$timestamp_file" fi # return value _GetDotNetInstallScript="$install_script" @@ -339,22 +367,14 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - # use override if it exists - commonly set by source-build - if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then - _InitializeBuildToolFramework="net9.0" - else - _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" - fi } -# Set RestoreNoHttpCache as a workaround for https://github.com/NuGet/Home/issues/3116 function GetNuGetPackageCachePath { if [[ -z ${NUGET_PACKAGES:-} ]]; then if [[ "$use_global_nuget_cache" == true ]]; then export NUGET_PACKAGES="$HOME/.nuget/packages/" else export NUGET_PACKAGES="$repo_root/.packages/" - export RESTORENOHTTPCACHE=true fi fi @@ -451,25 +471,13 @@ function MSBuild { fi local toolset_dir="${_InitializeToolset%/*}" - # new scripts need to work with old packages, so we need to look for the old names/versions - local selectedPath= - local possiblePaths=() - possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net7.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.ArcadeLogging.dll" ) - possiblePaths+=( "$toolset_dir/net8.0/Microsoft.DotNet.Arcade.Sdk.dll" ) - for path in "${possiblePaths[@]}"; do - if [[ -f $path ]]; then - selectedPath=$path - break - fi - done + local selectedPath="$toolset_dir/net/Microsoft.DotNet.ArcadeLogging.dll" + if [[ -z "$selectedPath" ]]; then - Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly." + Write-PipelineTelemetryError -category 'Build' "Unable to find arcade sdk logger assembly: $selectedPath" ExitWithExitCode 1 fi + args+=( "-logger:$selectedPath" ) fi @@ -506,8 +514,8 @@ function MSBuild-Core { echo "Build failed with exit code $exit_code. Check errors above." # When running on Azure Pipelines, override the returned exit code to avoid double logging. - # Skip this when the build is a child of the VMR orchestrator build. - if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$product_build" != true && "$properties" != *"DotNetBuildRepo=true"* ]]; then + # Skip this when the build is a child of the VMR build. + if [[ "$ci" == true && -n ${SYSTEM_TEAMPROJECT:-} && "$from_vmr" != true ]]; then Write-PipelineSetResult -result "Failed" -message "msbuild execution failed." # Exiting with an exit code causes the azure pipelines task to log yet another "noise" error # The above Write-PipelineSetResult will cause the task to be marked as failure without adding yet another error @@ -530,6 +538,13 @@ function GetDarc { fi "$eng_root/common/darc-init.sh" --toolpath "$darc_path" $version + darc_tool="$darc_path/darc" +} + +# Returns a full path to an Arcade SDK task project file. +function GetSdkTaskProject { + taskName=$1 + echo "$(dirname $_InitializeToolset)/SdkTasks/$taskName.proj" } ResolvePath "${BASH_SOURCE[0]}" diff --git a/eng/common/vmr-sync.ps1 b/eng/common/vmr-sync.ps1 new file mode 100755 index 000000000000..97302f3205be --- /dev/null +++ b/eng/common/vmr-sync.ps1 @@ -0,0 +1,138 @@ +<# +.SYNOPSIS + +This script is used for synchronizing the current repository into a local VMR. +It pulls the current repository's code into the specified VMR directory for local testing or +Source-Build validation. + +.DESCRIPTION + +The tooling used for synchronization will clone the VMR repository into a temporary folder if +it does not already exist. These clones can be reused in future synchronizations, so it is +recommended to dedicate a folder for this to speed up re-runs. + +.EXAMPLE + Synchronize current repository into a local VMR: + ./vmr-sync.ps1 -vmrDir "$HOME/repos/dotnet" -tmpDir "$HOME/repos/tmp" + +.PARAMETER tmpDir +Required. Path to the temporary folder where repositories will be cloned + +.PARAMETER vmrBranch +Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch + +.PARAMETER azdevPat +Optional. Azure DevOps PAT to use for cloning private repositories. + +.PARAMETER vmrDir +Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder + +.PARAMETER debugOutput +Optional. Enables debug logging in the darc vmr command. + +.PARAMETER ci +Optional. Denotes that the script is running in a CI environment. +#> +param ( + [Parameter(Mandatory=$true, HelpMessage="Path to the temporary folder where repositories will be cloned")] + [string][Alias('t', 'tmp')]$tmpDir, + [string][Alias('b', 'branch')]$vmrBranch, + [string]$remote, + [string]$azdevPat, + [string][Alias('v', 'vmr')]$vmrDir, + [switch]$ci, + [switch]$debugOutput +) + +function Fail { + Write-Host "> $($args[0])" -ForegroundColor 'Red' +} + +function Highlight { + Write-Host "> $($args[0])" -ForegroundColor 'Cyan' +} + +$verbosity = 'verbose' +if ($debugOutput) { + $verbosity = 'debug' +} +# Validation + +if (-not $tmpDir) { + Fail "Missing -tmpDir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +} + +# Sanitize the input + +if (-not $vmrDir) { + $vmrDir = Join-Path $tmpDir 'dotnet' +} + +if (-not (Test-Path -Path $tmpDir -PathType Container)) { + New-Item -ItemType Directory -Path $tmpDir | Out-Null +} + +# Prepare the VMR + +if (-not (Test-Path -Path $vmrDir -PathType Container)) { + Highlight "Cloning 'dotnet/dotnet' into $vmrDir.." + git clone https://github.com/dotnet/dotnet $vmrDir + + if ($vmrBranch) { + git -C $vmrDir switch -c $vmrBranch + } +} +else { + if ((git -C $vmrDir diff --quiet) -eq $false) { + Fail "There are changes in the working tree of $vmrDir. Please commit or stash your changes" + exit 1 + } + + if ($vmrBranch) { + Highlight "Preparing $vmrDir" + git -C $vmrDir checkout $vmrBranch + git -C $vmrDir pull + } +} + +Set-StrictMode -Version Latest + +# Prepare darc + +Highlight 'Installing .NET, preparing the tooling..' +. .\eng\common\tools.ps1 +$dotnetRoot = InitializeDotNetCli -install:$true +$darc = Get-Darc +$dotnet = "$dotnetRoot\dotnet.exe" + +Highlight "Starting the synchronization of VMR.." + +# Synchronize the VMR +$darcArgs = ( + "vmr", "forwardflow", + "--tmp", $tmpDir, + "--$verbosity", + $vmrDir +) + +if ($ci) { + $darcArgs += ("--ci") +} + +if ($azdevPat) { + $darcArgs += ("--azdev-pat", $azdevPat) +} + +& "$darc" $darcArgs + +if ($LASTEXITCODE -eq 0) { + Highlight "Synchronization succeeded" +} +else { + Fail "Synchronization of repo to VMR failed!" + Fail "'$vmrDir' is left in its last state (re-run of this script will reset it)." + Fail "Please inspect the logs which contain path to the failing patch file (use -debugOutput to get all the details)." + Fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +} diff --git a/eng/common/vmr-sync.sh b/eng/common/vmr-sync.sh new file mode 100755 index 000000000000..44239e331c0c --- /dev/null +++ b/eng/common/vmr-sync.sh @@ -0,0 +1,207 @@ +#!/bin/bash + +### This script is used for synchronizing the current repository into a local VMR. +### It pulls the current repository's code into the specified VMR directory for local testing or +### Source-Build validation. +### +### The tooling used for synchronization will clone the VMR repository into a temporary folder if +### it does not already exist. These clones can be reused in future synchronizations, so it is +### recommended to dedicate a folder for this to speed up re-runs. +### +### USAGE: +### Synchronize current repository into a local VMR: +### ./vmr-sync.sh --tmp "$HOME/repos/tmp" "$HOME/repos/dotnet" +### +### Options: +### -t, --tmp, --tmp-dir PATH +### Required. Path to the temporary folder where repositories will be cloned +### +### -b, --branch, --vmr-branch BRANCH_NAME +### Optional. Branch of the 'dotnet/dotnet' repo to synchronize. The VMR will be checked out to this branch +### +### --debug +### Optional. Turns on the most verbose logging for the VMR tooling +### +### --remote name:URI +### Optional. Additional remote to use during the synchronization +### This can be used to synchronize to a commit from a fork of the repository +### Example: 'runtime:https://github.com/yourfork/runtime' +### +### --azdev-pat +### Optional. Azure DevOps PAT to use for cloning private repositories. +### +### -v, --vmr, --vmr-dir PATH +### Optional. Path to the dotnet/dotnet repository. When null, gets cloned to the temporary folder + +source="${BASH_SOURCE[0]}" + +# resolve $source until the file is no longer a symlink +while [[ -h "$source" ]]; do + scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + source="$(readlink "$source")" + # if $source was a relative symlink, we need to resolve it relative to the path where the + # symlink file was located + [[ $source != /* ]] && source="$scriptroot/$source" +done +scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" + +function print_help () { + sed -n '/^### /,/^$/p' "$source" | cut -b 5- +} + +COLOR_RED=$(tput setaf 1 2>/dev/null || true) +COLOR_CYAN=$(tput setaf 6 2>/dev/null || true) +COLOR_CLEAR=$(tput sgr0 2>/dev/null || true) +COLOR_RESET=uniquesearchablestring +FAILURE_PREFIX='> ' + +function fail () { + echo "${COLOR_RED}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_RED}}${COLOR_CLEAR}" >&2 +} + +function highlight () { + echo "${COLOR_CYAN}$FAILURE_PREFIX${1//${COLOR_RESET}/${COLOR_CYAN}}${COLOR_CLEAR}" +} + +tmp_dir='' +vmr_dir='' +vmr_branch='' +additional_remotes='' +verbosity=verbose +azdev_pat='' +ci=false + +while [[ $# -gt 0 ]]; do + opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" + case "$opt" in + -t|--tmp|--tmp-dir) + tmp_dir=$2 + shift + ;; + -v|--vmr|--vmr-dir) + vmr_dir=$2 + shift + ;; + -b|--branch|--vmr-branch) + vmr_branch=$2 + shift + ;; + --remote) + additional_remotes="$additional_remotes $2" + shift + ;; + --azdev-pat) + azdev_pat=$2 + shift + ;; + --ci) + ci=true + ;; + -d|--debug) + verbosity=debug + ;; + -h|--help) + print_help + exit 0 + ;; + *) + fail "Invalid argument: $1" + print_help + exit 1 + ;; + esac + + shift +done + +# Validation + +if [[ -z "$tmp_dir" ]]; then + fail "Missing --tmp-dir argument. Please specify the path to the temporary folder where the repositories will be cloned" + exit 1 +fi + +# Sanitize the input + +if [[ -z "$vmr_dir" ]]; then + vmr_dir="$tmp_dir/dotnet" +fi + +if [[ ! -d "$tmp_dir" ]]; then + mkdir -p "$tmp_dir" +fi + +if [[ "$verbosity" == "debug" ]]; then + set -x +fi + +# Prepare the VMR + +if [[ ! -d "$vmr_dir" ]]; then + highlight "Cloning 'dotnet/dotnet' into $vmr_dir.." + git clone https://github.com/dotnet/dotnet "$vmr_dir" + + if [[ -n "$vmr_branch" ]]; then + git -C "$vmr_dir" switch -c "$vmr_branch" + fi +else + if ! git -C "$vmr_dir" diff --quiet; then + fail "There are changes in the working tree of $vmr_dir. Please commit or stash your changes" + exit 1 + fi + + if [[ -n "$vmr_branch" ]]; then + highlight "Preparing $vmr_dir" + git -C "$vmr_dir" checkout "$vmr_branch" + git -C "$vmr_dir" pull + fi +fi + +set -e + +# Prepare darc + +highlight 'Installing .NET, preparing the tooling..' +source "./eng/common/tools.sh" +InitializeDotNetCli true +GetDarc +dotnetDir=$( cd ./.dotnet/; pwd -P ) +dotnet=$dotnetDir/dotnet + +highlight "Starting the synchronization of VMR.." +set +e + +if [[ -n "$additional_remotes" ]]; then + additional_remotes="--additional-remotes $additional_remotes" +fi + +if [[ -n "$azdev_pat" ]]; then + azdev_pat="--azdev-pat $azdev_pat" +fi + +ci_arg='' +if [[ "$ci" == "true" ]]; then + ci_arg="--ci" +fi + +# Synchronize the VMR + +export DOTNET_ROOT="$dotnetDir" + +"$darc_tool" vmr forwardflow \ + --tmp "$tmp_dir" \ + $azdev_pat \ + --$verbosity \ + $ci_arg \ + $additional_remotes \ + "$vmr_dir" + +if [[ $? == 0 ]]; then + highlight "Synchronization succeeded" +else + fail "Synchronization of repo to VMR failed!" + fail "'$vmr_dir' is left in its last state (re-run of this script will reset it)." + fail "Please inspect the logs which contain path to the failing patch file (use --debug to get all the details)." + fail "Once you make changes to the conflicting VMR patch, commit it locally and re-run this script." + exit 1 +fi diff --git a/global.json b/global.json index 43b27ffea644..87ba29457b35 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,16 @@ { + "sdk": { + "paths": [ + ".dotnet", + "$host$" + ], + "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." + }, "tools": { - "dotnet": "9.0.112", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ - "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" + "$(MicrosoftNETCorePlatformsPackageVersion)" ], "aspnetcore": [ "$(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion)" @@ -13,13 +20,11 @@ "version": "16.8" } }, - "native-tools": { - "cmake": "latest" - }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26065.102", "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" + "Microsoft.Build.Traversal": "3.4.0", + "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" } } diff --git a/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch b/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch new file mode 100644 index 000000000000..395dea35c1ae --- /dev/null +++ b/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch @@ -0,0 +1,145 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aaron R Robinson +Date: Fri, 14 Nov 2025 11:01:28 -0800 +Subject: [PATCH] [release/9.0-staging] Add flags when the clang's major + version is > 20.0 (#121151) +Backport: https://github.com/dotnet/runtime/pull/121151 + +## Customer Impact + +- [x] Customer reported +- [ ] Found internally + +These issues were reported in +https://github.com/dotnet/runtime/issues/119706 as problems with +clang-21 on Fedora 43. The investigation uncovered that clang introduced +a potentially breaking change in clang-20 that we do not currently +consume. These build changes impact VMR related builds when linux +distrobutions performing source build adopt clang-21. + +clang-20 breaking change log - +https://releases.llvm.org/20.1.0/tools/clang/docs/ReleaseNotes.html#potentially-breaking-changes. + +This PR contains the minimal changes needed to fix issues from the +following PR https://github.com/dotnet/runtime/pull/120775. + +.NET 10: https://github.com/dotnet/runtime/pull/121124 +.NET 8: https://github.com/dotnet/runtime/pull/121150 + +## Regression + +- [ ] Yes +- [x] No + +Build with the new clang-21 compiler will cause the runtime to crash. + +## Testing + +This has been validated using various legs and examples to demonstrate +the usage of undefined behavior these flags convert into "defined" +behavior in C/C++. + +## Risk + +Low. This has zero impact on our production build since we specifically +target clang-18. This is only valid for those partners that are using +clang-20+. +--- + eng/native/configurecompiler.cmake | 18 +++++++++++++++--- + src/coreclr/debug/di/rspriv.h | 4 ++-- + src/coreclr/debug/di/rsthread.cpp | 12 ++++++------ + 3 files changed, 23 insertions(+), 11 deletions(-) + +diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake +index 109b947e4eb..c114c03a9a1 100644 +--- a/eng/native/configurecompiler.cmake ++++ b/eng/native/configurecompiler.cmake +@@ -526,9 +526,21 @@ if (CLR_CMAKE_HOST_UNIX) + # Disable frame pointer optimizations so profilers can get better call stacks + add_compile_options(-fno-omit-frame-pointer) + +- # Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around +- # using twos-complement representation (this is normally undefined according to the C++ spec). +- add_compile_options(-fwrapv) ++ if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0) OR ++ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0)) ++ # Make signed overflow well-defined. Implies the following flags in clang-20 and above. ++ # -fwrapv - Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around ++ # using twos-complement representation (this is normally undefined according to the C++ spec). ++ # -fwrapv-pointer - The same as -fwrapv but for pointers. ++ add_compile_options(-fno-strict-overflow) ++ ++ # Suppress C++ strict aliasing rules. This matches our use of MSVC. ++ add_compile_options(-fno-strict-aliasing) ++ else() ++ # Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around ++ # using twos-complement representation (this is normally undefined according to the C++ spec). ++ add_compile_options(-fwrapv) ++ endif() + + if(CLR_CMAKE_HOST_APPLE) + # Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from earlier Xcodes doesn't understand. +diff --git a/src/coreclr/debug/di/rspriv.h b/src/coreclr/debug/di/rspriv.h +index 7e2b49b3170..119ca6f7c08 100644 +--- a/src/coreclr/debug/di/rspriv.h ++++ b/src/coreclr/debug/di/rspriv.h +@@ -6404,8 +6404,8 @@ private: + // Lazily initialized. + EXCEPTION_RECORD * m_pExceptionRecord; + +- static const CorDebugUserState kInvalidUserState = CorDebugUserState(-1); +- CorDebugUserState m_userState; // This is the current state of the ++ static const int kInvalidUserState = -1; ++ int m_userState; // This is the current state of the + // thread, at the time that the + // left side synchronized + +diff --git a/src/coreclr/debug/di/rsthread.cpp b/src/coreclr/debug/di/rsthread.cpp +index cd7f79867a5..8c4f3317eff 100644 +--- a/src/coreclr/debug/di/rsthread.cpp ++++ b/src/coreclr/debug/di/rsthread.cpp +@@ -783,7 +783,7 @@ CorDebugUserState CordbThread::GetUserState() + m_userState = pDAC->GetUserState(m_vmThreadToken); + } + +- return m_userState; ++ return (CorDebugUserState)m_userState; + } + + +@@ -887,7 +887,7 @@ HRESULT CordbThread::CreateStepper(ICorDebugStepper ** ppStepper) + //Returns true if current user state of a thread is USER_WAIT_SLEEP_JOIN + bool CordbThread::IsThreadWaitingOrSleeping() + { +- CorDebugUserState userState = m_userState; ++ int userState = m_userState; + if (userState == kInvalidUserState) + { + //If m_userState is not ready, we'll read from DAC only part of it which +@@ -3721,14 +3721,14 @@ HRESULT CordbUnmanagedThread::SetupFirstChanceHijackForSync() + LOG((LF_CORDB, LL_INFO10000, "CUT::SFCHFS: hijackCtx started as:\n")); + LogContext(GetHijackCtx()); + +- // Save the thread's full context for all platforms except for x86 because we need the ++ // Save the thread's full context for all platforms except for x86 because we need the + // DT_CONTEXT_EXTENDED_REGISTERS to avoid getting incomplete information and corrupt the thread context + DT_CONTEXT context; +-#ifdef TARGET_X86 ++#ifdef TARGET_X86 + context.ContextFlags = DT_CONTEXT_FULL | DT_CONTEXT_EXTENDED_REGISTERS; + #else + context.ContextFlags = DT_CONTEXT_FULL; +-#endif ++#endif + + BOOL succ = DbiGetThreadContext(m_handle, &context); + _ASSERTE(succ); +@@ -3739,7 +3739,7 @@ HRESULT CordbUnmanagedThread::SetupFirstChanceHijackForSync() + LOG((LF_CORDB, LL_ERROR, "CUT::SFCHFS: DbiGetThreadContext error=0x%x\n", error)); + } + +-#ifdef TARGET_X86 ++#ifdef TARGET_X86 + GetHijackCtx()->ContextFlags = DT_CONTEXT_FULL | DT_CONTEXT_EXTENDED_REGISTERS; + #else + GetHijackCtx()->ContextFlags = DT_CONTEXT_FULL; From bf1ce4a3738f552926bc4d891cd94d8b0db892fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Tue, 20 Jan 2026 17:36:30 +0100 Subject: [PATCH 160/280] Remove SourceBuild patch from 10.0 --- ...ing-Add-flags-when-the-clang-s-major.patch | 145 ------------------ 1 file changed, 145 deletions(-) delete mode 100644 src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch diff --git a/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch b/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch deleted file mode 100644 index 395dea35c1ae..000000000000 --- a/src/SourceBuild/patches/runtime/0001-release-9.0-staging-Add-flags-when-the-clang-s-major.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Aaron R Robinson -Date: Fri, 14 Nov 2025 11:01:28 -0800 -Subject: [PATCH] [release/9.0-staging] Add flags when the clang's major - version is > 20.0 (#121151) -Backport: https://github.com/dotnet/runtime/pull/121151 - -## Customer Impact - -- [x] Customer reported -- [ ] Found internally - -These issues were reported in -https://github.com/dotnet/runtime/issues/119706 as problems with -clang-21 on Fedora 43. The investigation uncovered that clang introduced -a potentially breaking change in clang-20 that we do not currently -consume. These build changes impact VMR related builds when linux -distrobutions performing source build adopt clang-21. - -clang-20 breaking change log - -https://releases.llvm.org/20.1.0/tools/clang/docs/ReleaseNotes.html#potentially-breaking-changes. - -This PR contains the minimal changes needed to fix issues from the -following PR https://github.com/dotnet/runtime/pull/120775. - -.NET 10: https://github.com/dotnet/runtime/pull/121124 -.NET 8: https://github.com/dotnet/runtime/pull/121150 - -## Regression - -- [ ] Yes -- [x] No - -Build with the new clang-21 compiler will cause the runtime to crash. - -## Testing - -This has been validated using various legs and examples to demonstrate -the usage of undefined behavior these flags convert into "defined" -behavior in C/C++. - -## Risk - -Low. This has zero impact on our production build since we specifically -target clang-18. This is only valid for those partners that are using -clang-20+. ---- - eng/native/configurecompiler.cmake | 18 +++++++++++++++--- - src/coreclr/debug/di/rspriv.h | 4 ++-- - src/coreclr/debug/di/rsthread.cpp | 12 ++++++------ - 3 files changed, 23 insertions(+), 11 deletions(-) - -diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake -index 109b947e4eb..c114c03a9a1 100644 ---- a/eng/native/configurecompiler.cmake -+++ b/eng/native/configurecompiler.cmake -@@ -526,9 +526,21 @@ if (CLR_CMAKE_HOST_UNIX) - # Disable frame pointer optimizations so profilers can get better call stacks - add_compile_options(-fno-omit-frame-pointer) - -- # Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around -- # using twos-complement representation (this is normally undefined according to the C++ spec). -- add_compile_options(-fwrapv) -+ if((CMAKE_C_COMPILER_ID STREQUAL "Clang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0) OR -+ (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 20.0)) -+ # Make signed overflow well-defined. Implies the following flags in clang-20 and above. -+ # -fwrapv - Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around -+ # using twos-complement representation (this is normally undefined according to the C++ spec). -+ # -fwrapv-pointer - The same as -fwrapv but for pointers. -+ add_compile_options(-fno-strict-overflow) -+ -+ # Suppress C++ strict aliasing rules. This matches our use of MSVC. -+ add_compile_options(-fno-strict-aliasing) -+ else() -+ # Make signed arithmetic overflow of addition, subtraction, and multiplication wrap around -+ # using twos-complement representation (this is normally undefined according to the C++ spec). -+ add_compile_options(-fwrapv) -+ endif() - - if(CLR_CMAKE_HOST_APPLE) - # Clang will by default emit objc_msgSend stubs in Xcode 14, which ld from earlier Xcodes doesn't understand. -diff --git a/src/coreclr/debug/di/rspriv.h b/src/coreclr/debug/di/rspriv.h -index 7e2b49b3170..119ca6f7c08 100644 ---- a/src/coreclr/debug/di/rspriv.h -+++ b/src/coreclr/debug/di/rspriv.h -@@ -6404,8 +6404,8 @@ private: - // Lazily initialized. - EXCEPTION_RECORD * m_pExceptionRecord; - -- static const CorDebugUserState kInvalidUserState = CorDebugUserState(-1); -- CorDebugUserState m_userState; // This is the current state of the -+ static const int kInvalidUserState = -1; -+ int m_userState; // This is the current state of the - // thread, at the time that the - // left side synchronized - -diff --git a/src/coreclr/debug/di/rsthread.cpp b/src/coreclr/debug/di/rsthread.cpp -index cd7f79867a5..8c4f3317eff 100644 ---- a/src/coreclr/debug/di/rsthread.cpp -+++ b/src/coreclr/debug/di/rsthread.cpp -@@ -783,7 +783,7 @@ CorDebugUserState CordbThread::GetUserState() - m_userState = pDAC->GetUserState(m_vmThreadToken); - } - -- return m_userState; -+ return (CorDebugUserState)m_userState; - } - - -@@ -887,7 +887,7 @@ HRESULT CordbThread::CreateStepper(ICorDebugStepper ** ppStepper) - //Returns true if current user state of a thread is USER_WAIT_SLEEP_JOIN - bool CordbThread::IsThreadWaitingOrSleeping() - { -- CorDebugUserState userState = m_userState; -+ int userState = m_userState; - if (userState == kInvalidUserState) - { - //If m_userState is not ready, we'll read from DAC only part of it which -@@ -3721,14 +3721,14 @@ HRESULT CordbUnmanagedThread::SetupFirstChanceHijackForSync() - LOG((LF_CORDB, LL_INFO10000, "CUT::SFCHFS: hijackCtx started as:\n")); - LogContext(GetHijackCtx()); - -- // Save the thread's full context for all platforms except for x86 because we need the -+ // Save the thread's full context for all platforms except for x86 because we need the - // DT_CONTEXT_EXTENDED_REGISTERS to avoid getting incomplete information and corrupt the thread context - DT_CONTEXT context; --#ifdef TARGET_X86 -+#ifdef TARGET_X86 - context.ContextFlags = DT_CONTEXT_FULL | DT_CONTEXT_EXTENDED_REGISTERS; - #else - context.ContextFlags = DT_CONTEXT_FULL; --#endif -+#endif - - BOOL succ = DbiGetThreadContext(m_handle, &context); - _ASSERTE(succ); -@@ -3739,7 +3739,7 @@ HRESULT CordbUnmanagedThread::SetupFirstChanceHijackForSync() - LOG((LF_CORDB, LL_ERROR, "CUT::SFCHFS: DbiGetThreadContext error=0x%x\n", error)); - } - --#ifdef TARGET_X86 -+#ifdef TARGET_X86 - GetHijackCtx()->ContextFlags = DT_CONTEXT_FULL | DT_CONTEXT_EXTENDED_REGISTERS; - #else - GetHijackCtx()->ContextFlags = DT_CONTEXT_FULL; From 723b9d59239c5a83c48b93b4ce4925acd0b9e9ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Jan 2026 16:56:41 +0000 Subject: [PATCH 161/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 128 ++++++------- eng/Version.Details.xml | 394 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 265 insertions(+), 265 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47d1214ee661..9d95b7e6d9f4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8fa7ccaffb7b..0de635f6adb9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 + 10.0.3-servicing.26070.104 + 10.0.3-servicing.26070.104 + 10.0.3-servicing.26070.104 + 10.0.3-servicing.26070.104 10.0.3 - 10.0.3-servicing.26065.102 + 10.0.3-servicing.26070.104 10.0.3 10.0.3 10.0.3 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.3 10.0.3 10.0.3 - 10.0.3-servicing.26065.102 + 10.0.3-servicing.26070.104 10.0.3 10.0.3 10.0.3 10.0.3 - 10.0.3-servicing.26065.102 + 10.0.3-servicing.26070.104 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.0-preview.26065.102 + 10.0.3-servicing.26070.104 + 10.0.3-servicing.26070.104 + 10.0.0-preview.26070.104 10.0.3 10.0.3 - 18.0.10 - 18.0.10-servicing-26065-102 - 7.0.2-rc.6602 + 18.0.11 + 18.0.11-servicing-26070-104 + 7.0.2-rc.7104 10.0.103 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 10.0.0-preview.26065.102 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 2.0.0-preview.1.26065.102 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 10.0.0-preview.26070.104 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 2.0.0-preview.1.26070.104 2.2.3 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 + 10.0.0-beta.26070.104 + 10.0.0-beta.26070.104 + 10.0.0-beta.26070.104 + 10.0.0-beta.26070.104 + 10.0.0-beta.26070.104 + 10.0.0-beta.26070.104 10.0.3 10.0.3 - 10.0.3-servicing.26065.102 - 10.0.3-servicing.26065.102 - 10.0.0-beta.26065.102 - 10.0.0-beta.26065.102 + 10.0.3-servicing.26070.104 + 10.0.3-servicing.26070.104 + 10.0.0-beta.26070.104 + 10.0.0-beta.26070.104 10.0.3 10.0.3 10.0.3 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.3 10.0.3 10.0.3 - 14.0.103-servicing.26065.102 + 14.0.103-servicing.26070.104 10.0.3 - 5.0.0-2.26065.102 - 5.0.0-2.26065.102 - 10.0.3-servicing.26065.102 + 5.0.0-2.26070.104 + 5.0.0-2.26070.104 + 10.0.3-servicing.26070.104 10.0.3 10.0.3 10.0.0-preview.7.25377.103 - 10.0.0-preview.26065.102 - 10.0.3-servicing.26065.102 - 18.0.1-release-26065-102 + 10.0.0-preview.26070.104 + 10.0.3-servicing.26070.104 + 18.0.1-release-26070-104 10.0.3 - 10.0.3-servicing.26065.102 + 10.0.3-servicing.26070.104 10.0.103 10.0.103 10.0.103 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.103 10.0.103 10.0.103 - 10.0.103-servicing.26065.102 + 10.0.103-servicing.26070.104 10.0.103 - 10.0.103-servicing.26065.102 + 10.0.103-servicing.26070.104 10.0.103 10.0.103 - 10.0.103-servicing.26065.102 - 18.0.1-release-26065-102 - 18.0.1-release-26065-102 + 10.0.103-servicing.26070.104 + 18.0.1-release-26070-104 + 18.0.1-release-26070-104 3.2.3 10.0.3 - 10.0.3-servicing.26065.102 + 10.0.3-servicing.26070.104 10.0.3 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 - 7.0.2-rc.6602 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 + 7.0.2-rc.7104 10.0.3 2.0.3 10.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fabd89f18bdb..352a9cbd5806 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 99f9e99f92d73ade5453ba8edba5d72247f3cd11 + 455f1358f39b4d38fa3893c327a45027c4a81843 diff --git a/global.json b/global.json index 87ba29457b35..c19d0b073c51 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.101", + "dotnet": "10.0.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26065.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From d452413937cdb8a36ccb0e423b88905a488cd9b5 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Wed, 14 Jan 2026 16:24:38 -0800 Subject: [PATCH 162/280] Adjust expected diagnostics in DisposableObjectInErrorCode_NotDisposed_BailOut_NoDiagnosticAsync --- .../Runtime/DisposeObjectsBeforeLosingScopeTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs b/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs index c1c03c4122d5..9c89c0026e2f 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/tests/Microsoft.CodeAnalysis.NetAnalyzers.UnitTests/Microsoft.NetCore.Analyzers/Runtime/DisposeObjectsBeforeLosingScopeTests.cs @@ -8197,8 +8197,8 @@ class B : IDisposable { public void Dispose() { - A x = new A();{|CS1525:|} - = x{|CS1002:|} + A x = new A(); + {|CS1525:=|} x{|CS1002:|} } } "); From c85001ddae962e852838ad3745af9acde9f6b53d Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Thu, 15 Jan 2026 07:27:10 -0800 Subject: [PATCH 163/280] Fix another restore section in assets file --- .../GivenAResolvePackageAssetsTask.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs index 966c4eb6c66c..4cad4fcc9867 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/GivenAResolvePackageAssetsTask.cs @@ -101,6 +101,13 @@ public void It_does_not_error_on_duplicate_package_names() `net5.0`: { `targetAlias`: `net5.0` } + }, + `restore`: { + `frameworks`: { + `net5.0`: { + `targetAlias`: `net5.0` + } + } } } }".Replace('`', '"'); From a264aaaa8533abd716fbba2ea7b71177a5538ce3 Mon Sep 17 00:00:00 2001 From: "Eric St. John" Date: Thu, 15 Jan 2026 07:53:09 -0800 Subject: [PATCH 164/280] Fix path to razor source-generated files in StaticWebAssets tests --- .../ScopedCssIntegrationTests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs index 6155a3498987..39b29f46f052 100644 --- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs +++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs @@ -92,7 +92,7 @@ public void CanOverrideScopeIdentifiers() var scoped = Path.Combine(intermediateOutputPath, "scopedcss", "Styles", "Pages", "Counter.rz.scp.css"); new FileInfo(scoped).Should().Exist(); new FileInfo(scoped).Should().Contain("b-overridden"); - var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components", "Pages", "Counter_razor.g.cs"); new FileInfo(generated).Should().Exist(); new FileInfo(generated).Should().Contain("b-overridden"); new FileInfo(Path.Combine(intermediateOutputPath, "scopedcss", "Components", "Pages", "Index.razor.rz.scp.css")).Should().NotExist(); @@ -318,7 +318,7 @@ public void Build_RemovingScopedCssAndBuilding_UpdatesGeneratedCodeAndBundle() new FileInfo(generatedBundle).Should().Exist(); var generatedProjectBundle = Path.Combine(intermediateOutputPath, "scopedcss", "projectbundle", "ComponentApp.bundle.scp.css"); new FileInfo(generatedProjectBundle).Should().Exist(); - var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components", "Pages", "Counter_razor.g.cs"); new FileInfo(generatedCounter).Should().Exist(); var componentThumbprint = FileThumbPrint.Create(generatedCounter); From b6db0de18dbb23fe7c8a2e21972236a203dc049b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 10:41:55 -0800 Subject: [PATCH 165/280] Update test baselines --- ...ledPackage_LocalPackage.Linux.verified.txt | 2 +- ...alledPackage_LocalPackage.OSX.verified.txt | 2 +- ...dPackage_LocalPackage.Windows.verified.txt | 30 +++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt index 948efa0f8d7b..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt @@ -77,10 +77,10 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt index 948efa0f8d7b..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt @@ -77,10 +77,10 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt index 8f48b106823e..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt @@ -22,24 +22,24 @@ TestAssets.PostActions.AddJsonProperty.WithE... TestAssets.PostActions.AddJsonProperty.WithExistingProject.ExistingProject Test Asset TestAssets.PostActions.AddJsonProperty.WithE... TestAssets.PostActions.AddJsonProperty.WithExistingProject.MyProject Test Asset TestAssets.PostActions.AddJsonProperty.WithS... TestAssets.PostActions.AddJsonProperty.WithSourceNameChangeInJson Test Asset - TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.BasicWithFiles Test Asset TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.Basic Test Asset + TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.BasicWithFiles Test Asset TestAssets.PostActions.AddProjectReference.B... TestAssets.PostActions.AddProjectReference.Basic Test Asset - TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.ExistingWithRename Test Asset TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.Existing Test Asset + TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.ExistingWithRename Test Asset + TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.Basic Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicInSolutionRoot Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicWithFiles Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes Test Asset - TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.Basic Test Asset TestAssets.PostActions.Instructions.Basic TestAssets.PostActions.Instructions.Basic Test Asset - TestAssets.PostActions.RestoreNuGet.BasicWit... TestAssets.PostActions.RestoreNuGet.BasicWithFiles Test Asset TestAssets.PostActions.RestoreNuGet.Basic TestAssets.PostActions.RestoreNuGet.Basic Test Asset - TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.BasicWit... TestAssets.PostActions.RestoreNuGet.BasicWithFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePath Test Asset - TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePathFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPath Test Asset - TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPathFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPath Test Asset + TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPathFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Ma... TestAssets.PostActions.RestoreNuGet.Files_MatchSpecifiedFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Mi... TestAssets.PostActions.RestoreNuGet.Files_MismatchSpecifiedFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Pa... TestAssets.PostActions.RestoreNuGet.Files_PatternWithFileName Test Asset @@ -48,16 +48,16 @@ TestAssets.PostActions.RestoreNuGet.Files_Su... TestAssets.PostActions.RestoreNuGet.Files_SupportSemicolonDelimitedList Test Asset TestAssets.PostActions.RestoreNuGet.Invalid TestAssets.PostActions.RestoreNuGet.Invalid Test Asset TestAssets.PostActions.RestoreNuGet.Invalid.... TestAssets.PostActions.RestoreNuGet.Invalid.ContinueOnError Test Asset - TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRenameFiles Test Asset TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRename Test Asset + TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRenameFiles Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsFiles Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsPrimaryOutputs Test Asset - TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames2 Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames Test Asset + TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames2 Test Asset TestAssets.PostActions.RunScript.Basic TestAssets.PostActions.RunScript.Basic Test Asset TestAssets.PostActions.RunScript.DoNotRedirect TestAssets.PostActions.RunScript.DoNotRedirect Test Asset - TestAssets.PostActions.RunScript.RedirectOnE... TestAssets.PostActions.RunScript.RedirectOnError Test Asset TestAssets.PostActions.RunScript.Redirect TestAssets.PostActions.RunScript.Redirect Test Asset + TestAssets.PostActions.RunScript.RedirectOnE... TestAssets.PostActions.RunScript.RedirectOnError Test Asset TestAssets.PostActions.UnknownPostAction TestAssets.PostActions.UnknownPostAction Test Asset TemplateConditionalProcessing TestAssets.TemplateConditionalProcessing Test Asset Basic FSharp template-grouping item Test Asset C#,F# @@ -77,28 +77,28 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset + TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset - TemplateWithPreferDefaultNameButNoDefaultName TestAssets.TemplateWithPreferDefaultNameButNoDefaultName project Test Asset TemplateWithPreferDefaultName TestAssets.TemplateWithPreferDefaultName project Test Asset + TemplateWithPreferDefaultNameButNoDefaultName TestAssets.TemplateWithPreferDefaultNameButNoDefaultName project Test Asset TemplateWithRegexMatchMacro TestAssets.TemplateWithRegexMatchMacro Test Asset TemplateWithRenames TestAssets.TemplateWithRenames Test Asset TemplateWithRequiredParameters TestAssets.TemplateWithRequiredParameters Test Asset TemplateWithSourceBasedRenames TestAssets.TemplateWithSourceBasedRenames Test Asset + TemplateWithSourceName TestAssets.TemplateWithSourceName Test Asset TemplateWithSourceNameAndCustomSourceAndTarg... TestAssets.TemplateWithSourceNameAndCustomSourceAndTargetPaths Test Asset TemplateWithSourceNameAndCustomSourcePath TestAssets.TemplateWithSourceNameAndCustomSourcePath Test Asset TemplateWithSourceNameAndCustomTargetPath TestAssets.TemplateWithSourceNameAndCustomTargetPath Test Asset TemplateWithSourceNameInTargetPathGetsRenamed TestAssets.TemplateWithSourceNameInTargetPathGetsRenamed Test Asset - TemplateWithSourceName TestAssets.TemplateWithSourceName Test Asset TemplateWithSourcePathOutsideConfigRoot TestAssets.TemplateWithSourcePathOutsideConfigRoot Test Asset TemplateWithTags TestAssets.TemplateWithTags project Test Asset C# TemplateWithUnspecifiedSourceName TestAssets.TemplateWithUnspecifiedSourceName Test Asset TemplateWithValueForms TestAssets.TemplateWithValueForms Test Asset - Basic Template Without Exclude withoutexclude project Basic Template With Exclude withexclude project + Basic Template Without Exclude withoutexclude project \ No newline at end of file From 9a6cfe899cff86f392d8bf37202a75d5a45dc2ad Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 10:42:10 -0800 Subject: [PATCH 166/280] Disable watch test as it's broken by a Roslyn change --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 095822120c0d..1f1564014cf7 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Watch.UnitTests { public class ApplyDeltaTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] public async Task AddSourceFile() { Log("AddSourceFile started"); From 26247c18a195347db1cdddd960601a3ace880f19 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Tue, 20 Jan 2026 15:31:00 -0600 Subject: [PATCH 167/280] [release/10.0.2xx] Bump analysislevel constants for .NET 10 release (#52487) From 17e74d4efc57f3121057560d44356a443afda802 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 20 Jan 2026 14:32:39 -0800 Subject: [PATCH 168/280] Disable an additional watch test --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 1f1564014cf7..19a0cc235b9a 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -73,7 +73,7 @@ public static void Print() App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] public async Task ProjectChange_UpdateDirectoryBuildPropsThenUpdateSource() { var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") From 0957156bc5d93cbbf478fe9ed09d38d49894d86b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Tue, 20 Jan 2026 15:31:45 -0800 Subject: [PATCH 169/280] Workaround: Fix setting checksum algorithm when mapping projects (#52578) --- .../HotReload/IncrementalMSBuildWorkspace.cs | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs index 2fc7e54a9b34..1581a57f3c66 100644 --- a/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs +++ b/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs @@ -3,6 +3,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Reflection; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.ExternalAccess.HotReload.Api; using Microsoft.CodeAnalysis.Host.Mef; @@ -76,7 +77,7 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok continue; } - newSolution = HotReloadService.WithProjectInfo(newSolution, ProjectInfo.Create( + newSolution = HotReloadService.WithProjectInfo(newSolution, WithChecksumAlgorithm(ProjectInfo.Create( oldProjectId, newProjectInfo.Version, newProjectInfo.Name, @@ -93,7 +94,8 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok MapDocuments(oldProjectId, newProjectInfo.AdditionalDocuments), isSubmission: false, hostObjectType: null, - outputRefFilePath: newProjectInfo.OutputRefFilePath) + outputRefFilePath: newProjectInfo.OutputRefFilePath), + GetChecksumAlgorithm(newProjectInfo)) .WithAnalyzerConfigDocuments(MapDocuments(oldProjectId, newProjectInfo.AnalyzerConfigDocuments)) .WithCompilationOutputInfo(newProjectInfo.CompilationOutputInfo)); } @@ -122,6 +124,20 @@ ImmutableArray MapDocuments(ProjectId mappedProjectId, IReadOnlyLi }).ToImmutableArray(); } + // TODO: remove + // workaround for https://github.com/dotnet/roslyn/pull/82051 + + private static MethodInfo? s_withChecksumAlgorithm; + private static PropertyInfo? s_getChecksumAlgorithm; + + private static ProjectInfo WithChecksumAlgorithm(ProjectInfo info, SourceHashAlgorithm algorithm) + => (ProjectInfo)(s_withChecksumAlgorithm ??= typeof(ProjectInfo).GetMethod("WithChecksumAlgorithm", BindingFlags.NonPublic | BindingFlags.Instance)!) + .Invoke(info, [algorithm])!; + + private static SourceHashAlgorithm GetChecksumAlgorithm(ProjectInfo info) + => (SourceHashAlgorithm)(s_getChecksumAlgorithm ??= typeof(ProjectInfo).GetProperty("ChecksumAlgorithm", BindingFlags.NonPublic | BindingFlags.Instance)!) + .GetValue(info)!; + public async ValueTask UpdateFileContentAsync(IEnumerable changedFiles, CancellationToken cancellationToken) { var updatedSolution = CurrentSolution; From 37d31565e1bdb8b6589d7547830b9bef608615f5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 21 Jan 2026 00:30:45 +0000 Subject: [PATCH 170/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 6 +- eng/Version.Details.props | 400 ++++----- eng/Version.Details.xml | 793 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 19 +- global.json | 6 +- 10 files changed, 622 insertions(+), 614 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d95b7e6d9f4..7e04985571cd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,8 @@ - + + @@ -39,6 +40,9 @@ + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0de635f6adb9..39e04322c27a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,149 +5,167 @@ This file should be imported by eng/Versions.props --> - - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-preview.26070.104 - 10.0.3 - 10.0.3 - 18.0.11 - 18.0.11-servicing-26070-104 - 7.0.2-rc.7104 - 10.0.103 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.0-preview.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 2.0.0-preview.1.26070.104 - 2.2.3 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 14.0.103-servicing.26070.104 - 10.0.3 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.26070.104 - 10.0.3-servicing.26070.104 - 18.0.1-release-26070-104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 18.0.1-release-26070-104 - 18.0.1-release-26070-104 - 3.2.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 10.0.3 - 2.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 + + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + 10.0.200-preview.25569.1 + + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 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.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.0-beta.25569.105 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 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-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 10.0.0-beta.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 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 + + 10.0.0-preview.7.25377.103 + + 18.3.0-preview-25610-02 + 18.3.0-preview-25610-02 + + 15.1.200-servicing.25605.1 + + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + 5.3.0-2.25610.11 + + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + 7.1.0-preview.1.42 + + 18.3.0-preview-25609-01 + 18.3.0-preview-25609-01 + 18.3.0-preview-25609-01 + + 10.0.0-preview.25552.2 + 10.0.0-preview.25552.2 + 10.0.0-preview.25552.2 + + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 + 10.0.0-beta.25605.3 2.1.0-preview.26068.4 4.1.0-preview.26068.4 - + + $(MicrosoftTemplateEngineAbstractionsPackageVersion) + $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) + $(MicrosoftTemplateEngineEdgePackageVersion) + $(MicrosoftTemplateEngineMocksPackageVersion) + $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) + $(MicrosoftTemplateEngineTestHelperPackageVersion) + $(MicrosoftTemplateEngineUtilsPackageVersion) + $(MicrosoftTemplateSearchCommonPackageVersion) + $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) $(dotnetusersecretsPackageVersion) @@ -170,37 +188,13 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMetadataPackageVersion) $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - $(MicrosoftBuildNuGetSdkResolverPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -210,17 +204,11 @@ This file should be imported by eng/Versions.props $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) $(MicrosoftExtensionsLoggingConsolePackageVersion) $(MicrosoftExtensionsObjectPoolPackageVersion) - $(MicrosoftFSharpCompilerPackageVersion) $(MicrosoftJSInteropPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) $(MicrosoftNETHostModelPackageVersion) $(MicrosoftNETILLinkTasksPackageVersion) $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) $(MicrosoftNETSdkWindowsDesktopPackageVersion) - $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) @@ -228,37 +216,10 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkCommonPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) - $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) - $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksPackageVersion) - $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperPackageVersion) - $(MicrosoftTemplateEngineUtilsPackageVersion) - $(MicrosoftTemplateSearchCommonPackageVersion) - $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) $(MicrosoftWindowsDesktopAppRefPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) @@ -283,6 +244,61 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) + + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + + $(MicrosoftFSharpCompilerPackageVersion) + + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) + + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 352a9cbd5806..0a2a5d852001 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + 069bda6132d6ac2134cc9b26d651ccb825ff212d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/msbuild + 2960e90f194e80f8f664ac573d456058bc4f5cd9 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/msbuild + 2960e90f194e80f8f664ac573d456058bc4f5cd9 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/fsharp + 89d788641914c5d0b87fddfa11f4df0b5cfaa73d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + b5efdd1f17df11700c9383def6ece79a40218ccd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/microsoft/vstest + bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/razor + 191feab170b690f6a4923072d1b6f6e00272d8a7 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 - - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + 46a48b8c1dfce7c35da115308bedd6a5954fd78a - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 774a2ef8d2777c50d047d6776ced33260822cad6 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef https://github.com/microsoft/testfx @@ -569,9 +564,9 @@ https://github.com/microsoft/testfx 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index c282d3ae403a..92b77347d990 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index eea88e653c91..ac5c69ffcac5 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..578705ee4dbd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript + Invoke-WebRequest $uri -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,30 +556,23 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index c19d0b073c51..0daa834cedbd 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25605.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25605.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 25dfaa236462dff29ba57e46e7bb210f1e79c0cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jan 2026 02:02:08 +0000 Subject: [PATCH 171/280] Update dependencies from https://github.com/microsoft/testfx build 20260120.3 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26068.4 -> To Version 2.1.0-preview.26070.3 MSTest From Version 4.1.0-preview.26068.4 -> To Version 4.1.0-preview.26070.3 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0de635f6adb9..0e339e57535f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26068.4 - 4.1.0-preview.26068.4 + 2.1.0-preview.26070.3 + 4.1.0-preview.26070.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 352a9cbd5806..3c92d099e926 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + 2b0649af20f85043fcb656239e29ff74cc2c99f0 - + https://github.com/microsoft/testfx - 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + 2b0649af20f85043fcb656239e29ff74cc2c99f0 https://github.com/dotnet/dotnet From 51d897a8c0fad92df29be807b9d1eead5f521616 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Jan 2026 02:02:47 +0000 Subject: [PATCH 172/280] Update dependencies from https://github.com/microsoft/testfx build 20260120.3 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26068.4 -> To Version 2.1.0-preview.26070.3 MSTest From Version 4.1.0-preview.26068.4 -> To Version 4.1.0-preview.26070.3 --- NuGet.config | 2 -- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 82c3d1dd768c..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -40,7 +39,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index dcf6e8b9fd2a..148f15cafc75 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -150,8 +150,8 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25611.1 10.0.0-beta.25611.1 - 2.1.0-preview.26068.4 - 4.1.0-preview.26068.4 + 2.1.0-preview.26070.3 + 4.1.0-preview.26070.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7287fb847dd7..6edcf46e06a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -556,13 +556,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + 2b0649af20f85043fcb656239e29ff74cc2c99f0 - + https://github.com/microsoft/testfx - 6e2b81b1c868ced3468952c2ff8bb93b21b0fedd + 2b0649af20f85043fcb656239e29ff74cc2c99f0 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 6b83d8bcd1876cc697e73910c6c5793de445acf8 Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Wed, 21 Jan 2026 14:47:46 +0200 Subject: [PATCH 173/280] Set working directory of dotnet test as env variable to child MTP test apps (#52570) --- src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs index fb37be9fea9b..29ffd83eb344 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplication.cs @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Globalization; +using System.IO; using System.IO.Pipes; using System.Threading; using Microsoft.DotNet.Cli.Commands.Test.IPC; @@ -129,6 +130,7 @@ private ProcessStartInfo CreateProcessStartInfo() processStartInfo.Environment[Module.DotnetRootArchVariableName] = Path.GetDirectoryName(new Muxer().MuxerPath); } + processStartInfo.Environment["DOTNET_CLI_TEST_COMMAND_WORKING_DIRECTORY"] = Directory.GetCurrentDirectory(); return processStartInfo; } From 15117d17d25fd719f91e0326ed027699ce88e0f0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 21 Jan 2026 13:02:53 -0800 Subject: [PATCH 174/280] Trusted root was being built in the root folder with all it's dependencies leading to the zip layout to include things like xunit --- test/trustedroots.Tests/trustedroots.Tests.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/test/trustedroots.Tests/trustedroots.Tests.csproj b/test/trustedroots.Tests/trustedroots.Tests.csproj index 1d0caef20291..c4fd805c72af 100644 --- a/test/trustedroots.Tests/trustedroots.Tests.csproj +++ b/test/trustedroots.Tests/trustedroots.Tests.csproj @@ -5,7 +5,6 @@ $(ToolsetTargetFramework) Exe false - $(TestHostFolder) From 8178af4142fec39f03f68c783227cb3ce4af6dc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 02:02:03 +0000 Subject: [PATCH 175/280] Update dependencies from https://github.com/microsoft/testfx build 20260121.3 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26070.3 -> To Version 2.1.0-preview.26071.3 MSTest From Version 4.1.0-preview.26070.3 -> To Version 4.1.0-preview.26071.3 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0e339e57535f..797211a5331a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26070.3 - 4.1.0-preview.26070.3 + 2.1.0-preview.26071.3 + 4.1.0-preview.26071.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c92d099e926..1c908d227f1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 2b0649af20f85043fcb656239e29ff74cc2c99f0 + 6adab94760f7b10b6aaca1b4fd04543d9e539242 - + https://github.com/microsoft/testfx - 2b0649af20f85043fcb656239e29ff74cc2c99f0 + 6adab94760f7b10b6aaca1b4fd04543d9e539242 https://github.com/dotnet/dotnet From 0c15327c09ad779336c3013b4ca2b5d41de05928 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 02:02:34 +0000 Subject: [PATCH 176/280] Update dependencies from https://github.com/microsoft/testfx build 20260121.3 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26070.3 -> To Version 2.1.0-preview.26071.3 MSTest From Version 4.1.0-preview.26070.3 -> To Version 4.1.0-preview.26071.3 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 148f15cafc75..a988516459b3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -150,8 +150,8 @@ This file should be imported by eng/Versions.props 10.0.0-beta.25611.1 10.0.0-beta.25611.1 - 2.1.0-preview.26070.3 - 4.1.0-preview.26070.3 + 2.1.0-preview.26071.3 + 4.1.0-preview.26071.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6edcf46e06a9..fcefc28ee6c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -556,13 +556,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 2b0649af20f85043fcb656239e29ff74cc2c99f0 + 6adab94760f7b10b6aaca1b4fd04543d9e539242 - + https://github.com/microsoft/testfx - 2b0649af20f85043fcb656239e29ff74cc2c99f0 + 6adab94760f7b10b6aaca1b4fd04543d9e539242 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 31026408b905e06387dffc9a1845a7940a11c009 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 22 Jan 2026 06:20:38 +0000 Subject: [PATCH 177/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 400 ++++----- eng/Version.Details.xml | 793 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 19 +- global.json | 6 +- 10 files changed, 619 insertions(+), 614 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d95b7e6d9f4..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797211a5331a..a988516459b3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,149 +5,167 @@ This file should be imported by eng/Versions.props --> - - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-preview.26070.104 - 10.0.3 - 10.0.3 - 18.0.11 - 18.0.11-servicing-26070-104 - 7.0.2-rc.7104 - 10.0.103 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.0-preview.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 2.0.0-preview.1.26070.104 - 2.2.3 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 14.0.103-servicing.26070.104 - 10.0.3 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.0-preview.7.25377.103 - 10.0.0-preview.26070.104 - 10.0.3-servicing.26070.104 - 18.0.1-release-26070-104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 18.0.1-release-26070-104 - 18.0.1-release-26070-104 - 3.2.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 10.0.3 - 2.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 + + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + 10.0.300-preview.26065.6 + + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.102 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.102 + 10.0.102 + 10.0.102 + 10.0.102 + 10.0.102 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 + + 10.0.0-preview.7.25377.103 + + 18.3.0-preview-26062-04 + 18.3.0-preview-26062-04 + + 15.1.200-servicing.26063.5 + + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + 5.3.0-2.26062.15 + + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + 7.3.0-preview.1.50 + + 18.3.0-release-26055-04 + 18.3.0-release-26055-04 + 18.3.0-release-26055-04 + + 10.0.0-preview.26065.1 + 10.0.0-preview.26065.1 + 10.0.0-preview.26065.1 + + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 + 10.0.0-beta.25611.1 2.1.0-preview.26071.3 4.1.0-preview.26071.3 - + + $(MicrosoftTemplateEngineAbstractionsPackageVersion) + $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) + $(MicrosoftTemplateEngineEdgePackageVersion) + $(MicrosoftTemplateEngineMocksPackageVersion) + $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) + $(MicrosoftTemplateEngineTestHelperPackageVersion) + $(MicrosoftTemplateEngineUtilsPackageVersion) + $(MicrosoftTemplateSearchCommonPackageVersion) + $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) $(dotnetusersecretsPackageVersion) @@ -170,37 +188,13 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMetadataPackageVersion) $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - $(MicrosoftBuildNuGetSdkResolverPackageVersion) $(MicrosoftBuildTasksGitPackageVersion) - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -210,17 +204,11 @@ This file should be imported by eng/Versions.props $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) $(MicrosoftExtensionsLoggingConsolePackageVersion) $(MicrosoftExtensionsObjectPoolPackageVersion) - $(MicrosoftFSharpCompilerPackageVersion) $(MicrosoftJSInteropPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) $(MicrosoftNETHostModelPackageVersion) $(MicrosoftNETILLinkTasksPackageVersion) $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) $(MicrosoftNETSdkWindowsDesktopPackageVersion) - $(MicrosoftNETTestSdkPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) @@ -228,37 +216,10 @@ This file should be imported by eng/Versions.props $(MicrosoftSourceLinkCommonPackageVersion) $(MicrosoftSourceLinkGitHubPackageVersion) $(MicrosoftSourceLinkGitLabPackageVersion) - $(MicrosoftTemplateEngineAbstractionsPackageVersion) - $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) - $(MicrosoftTemplateEngineEdgePackageVersion) - $(MicrosoftTemplateEngineMocksPackageVersion) - $(MicrosoftTemplateEngineOrchestratorRunnableProjectsPackageVersion) - $(MicrosoftTemplateEngineTestHelperPackageVersion) - $(MicrosoftTemplateEngineUtilsPackageVersion) - $(MicrosoftTemplateSearchCommonPackageVersion) - $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) $(MicrosoftWindowsDesktopAppRefPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) @@ -283,6 +244,61 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) + + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + + $(MicrosoftFSharpCompilerPackageVersion) + + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) + + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c908d227f1f..fcefc28ee6c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/templating + d6f7f02c99e67973be3af508da3dde7012b370ee - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/msbuild + 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/msbuild + 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/fsharp + 5d23fef87847b07b40b1b67c9d826076d7cbaf3d - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/nuget/nuget.client + a99b70cf718ff7842466a7eaeefa99b471cad517 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/microsoft/vstest + 41f7799afd5767945acc16071ab64fa984bca274 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/microsoft/vstest + 41f7799afd5767945acc16071ab64fa984bca274 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/microsoft/vstest + 41f7799afd5767945acc16071ab64fa984bca274 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/razor + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/razor + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/razor + 43c97a1b8d5e97dd1dcc1e467079268f483ed903 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 - - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/roslyn + adb4347a172149b3ec18552da62e4da6fb2cf362 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://github.com/dotnet/arcade + 9f286ddee40065ea225611cb43ab0415e48994c2 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -569,9 +564,9 @@ https://github.com/microsoft/testfx 6adab94760f7b10b6aaca1b4fd04543d9e539242 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index c282d3ae403a..92b77347d990 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index eea88e653c91..ac5c69ffcac5 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..578705ee4dbd 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript + Invoke-WebRequest $uri -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,30 +556,23 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index c19d0b073c51..dc87e04b6c6c 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.100", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25611.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25611.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From bd4ee3c8ca0a93f6a225abb419ca3597830ccd72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 09:10:48 +0000 Subject: [PATCH 178/280] Backflow from https://github.com/dotnet/dotnet / 4f66501 build 298387 [[ commit created by automation ]] --- eng/Versions.props | 2 +- .../src/Microsoft.CodeAnalysis.NetAnalyzers.sarif | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d144776c162c..77d0530dabd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 10 0 1 - 3 + 4 $([System.String]::Copy('$(VersionSDKMinorPatch)').PadLeft(2, '0')) - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797211a5331a..9dd012b10c51 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,139 +6,139 @@ This file should be imported by eng/Versions.props - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-preview.26070.104 - 10.0.3 - 10.0.3 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.0-preview.26071.116 + 10.0.4 + 10.0.4 18.0.11 - 18.0.11-servicing-26070-104 - 7.0.2-rc.7104 - 10.0.103 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.0-preview.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 2.0.0-preview.1.26070.104 - 2.2.3 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 14.0.103-servicing.26070.104 - 10.0.3 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 + 18.0.11-servicing-26071-116 + 7.0.2-rc.7216 + 10.0.104 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 10.0.0-preview.26071.116 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 2.0.0-preview.1.26071.116 + 2.2.4 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4-servicing.26071.116 + 10.0.0-beta.26071.116 + 10.0.0-beta.26071.116 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 14.0.104-servicing.26071.116 + 10.0.4 + 5.0.0-2.26071.116 + 5.0.0-2.26071.116 + 10.0.4-servicing.26071.116 + 10.0.4 + 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26070.104 - 10.0.3-servicing.26070.104 - 18.0.1-release-26070-104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 18.0.1-release-26070-104 - 18.0.1-release-26070-104 - 3.2.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 10.0.3 - 2.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 + 10.0.0-preview.26071.116 + 10.0.4-servicing.26071.116 + 18.0.1-release-26071-116 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104 + 10.0.104-servicing.26071.116 + 10.0.104 + 10.0.104-servicing.26071.116 + 10.0.104 + 10.0.104 + 10.0.104-servicing.26071.116 + 18.0.1-release-26071-116 + 18.0.1-release-26071-116 + 3.2.4 + 10.0.4 + 10.0.4-servicing.26071.116 + 10.0.4 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 7.0.2-rc.7216 + 10.0.4 + 2.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 + 10.0.4 2.1.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c908d227f1f..b9173b569075 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 https://github.com/microsoft/testfx @@ -569,9 +569,9 @@ https://github.com/microsoft/testfx 6adab94760f7b10b6aaca1b4fd04543d9e539242 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + 4f6650138da4e12fda565f4b372155ff11378878 diff --git a/global.json b/global.json index c19d0b073c51..0ff5819c1c87 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26071.116", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26071.116", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From ba4e94fd8f753a1db8650fd4f8eca25f3434ca6e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 11:44:10 +0000 Subject: [PATCH 180/280] Backflow from https://github.com/dotnet/dotnet / a23ce1b build 298405 [[ commit created by automation ]] --- eng/Publishing.props | 11 +- src/Workloads/Manifests/Directory.Build.props | 1 + .../Manifests/manifest-packages.csproj | 7 +- src/Workloads/VSInsertion/workloads.csproj | 110 +++++++++++++++++- 4 files changed, 121 insertions(+), 8 deletions(-) diff --git a/eng/Publishing.props b/eng/Publishing.props index 802134fadee4..2369b1487145 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -43,10 +43,19 @@ - + + + + + + + + false $(IsShipping) false + $(DotNet1xxWorkloadManifestVersion) diff --git a/src/Workloads/Manifests/manifest-packages.csproj b/src/Workloads/Manifests/manifest-packages.csproj index a2d2d219dec1..d18e946f2725 100644 --- a/src/Workloads/Manifests/manifest-packages.csproj +++ b/src/Workloads/Manifests/manifest-packages.csproj @@ -5,9 +5,14 @@ + + + <_VersionOverride Condition="'$(DotNet1xxWorkloadManifestVersion)' != ''">Version=$(DotNet1xxWorkloadManifestVersion) + + + Properties="ManifestDirectory=$(ManifestDirectory);$(_VersionOverride)" /> \ No newline at end of file diff --git a/src/Workloads/VSInsertion/workloads.csproj b/src/Workloads/VSInsertion/workloads.csproj index c4d5f777d8c5..3aa6a026e718 100644 --- a/src/Workloads/VSInsertion/workloads.csproj +++ b/src/Workloads/VSInsertion/workloads.csproj @@ -80,9 +80,10 @@ - - - + + + + @@ -94,13 +95,82 @@ - + + + <_ManifestProjectFiles Include="../Manifests/**/*.proj" Exclude="../Manifests/**/*.Transport.*/*.proj" /> + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,7 +181,35 @@ UseHardlinksIfPossible="true" /> - + + + + + + + + + + + + + + + From bab968ee778cc2eeaa5b1010cb8ff124301cfc5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 11:44:11 +0000 Subject: [PATCH 181/280] Update dependencies --- eng/Version.Details.props | 254 ++++++------- eng/Version.Details.xml | 376 ++++++++++--------- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 6 +- global.json | 6 +- 6 files changed, 321 insertions(+), 325 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a988516459b3..152bf4a7708c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,16 +5,69 @@ This file should be imported by eng/Versions.props --> - - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 - 10.0.300-preview.26065.6 + + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 10.0.200-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 15.2.100-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 @@ -40,11 +93,12 @@ This file should be imported by eng/Versions.props 10.0.2-servicing.25612.105 10.0.2 10.0.2 - 10.0.102 2.0.0-preview.1.25612.105 2.2.2 10.0.2 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 10.0.2 10.0.2 10.0.2 @@ -61,11 +115,6 @@ This file should be imported by eng/Versions.props 10.0.2-servicing.25612.105 10.0.2 10.0.2-servicing.25612.105 - 10.0.102 - 10.0.102 - 10.0.102 - 10.0.102 - 10.0.102 3.2.2 10.0.2 10.0.2-servicing.25612.105 @@ -94,68 +143,48 @@ This file should be imported by eng/Versions.props 10.0.2 2.1.0 - - 10.0.0-preview.7.25377.103 - - 18.3.0-preview-26062-04 - 18.3.0-preview-26062-04 - - 15.1.200-servicing.26063.5 - - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - 5.3.0-2.26062.15 - - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - 7.3.0-preview.1.50 - - 18.3.0-release-26055-04 - 18.3.0-release-26055-04 - 18.3.0-release-26055-04 - - 10.0.0-preview.26065.1 - 10.0.0-preview.26065.1 - 10.0.0-preview.26065.1 - - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 - 10.0.0-beta.25611.1 2.1.0-preview.26071.3 4.1.0-preview.26071.3 - + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(MicrosoftBuildTasksGitPackageVersion) + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftSourceLinkAzureReposGitPackageVersion) + $(MicrosoftSourceLinkBitbucketGitPackageVersion) + $(MicrosoftSourceLinkCommonPackageVersion) + $(MicrosoftSourceLinkGitHubPackageVersion) + $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) $(MicrosoftTemplateEngineEdgePackageVersion) @@ -165,6 +194,24 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateEngineUtilsPackageVersion) $(MicrosoftTemplateSearchCommonPackageVersion) $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) @@ -190,11 +237,12 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildTasksGitPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -211,11 +259,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) - $(MicrosoftSourceLinkAzureReposGitPackageVersion) - $(MicrosoftSourceLinkBitbucketGitPackageVersion) - $(MicrosoftSourceLinkCommonPackageVersion) - $(MicrosoftSourceLinkGitHubPackageVersion) - $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) @@ -244,61 +287,6 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) - - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - - $(MicrosoftFSharpCompilerPackageVersion) - - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - - $(MicrosoftBuildNuGetSdkResolverPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) - - $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) - - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fcefc28ee6c6..86e972a9b013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/templating - d6f7f02c99e67973be3af508da3dde7012b370ee + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/msbuild - 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/msbuild - 6ef3f7b7870b0cdecd9773d4c7b3c58f206f554b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/fsharp - 5d23fef87847b07b40b1b67c9d826076d7cbaf3d + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/nuget/nuget.client - a99b70cf718ff7842466a7eaeefa99b471cad517 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/microsoft/vstest - 41f7799afd5767945acc16071ab64fa984bca274 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/microsoft/vstest - 41f7799afd5767945acc16071ab64fa984bca274 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/microsoft/vstest - 41f7799afd5767945acc16071ab64fa984bca274 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/razor - 43c97a1b8d5e97dd1dcc1e467079268f483ed903 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/razor - 43c97a1b8d5e97dd1dcc1e467079268f483ed903 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/razor - 43c97a1b8d5e97dd1dcc1e467079268f483ed903 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 @@ -514,43 +514,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/roslyn - adb4347a172149b3ec18552da62e4da6fb2cf362 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/arcade - 9f286ddee40065ea225611cb43ab0415e48994c2 + + https://github.com/dotnet/dotnet + a23ce1be2419c25ca93d10463461b1e506c15828 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index ac5c69ffcac5..eea88e653c91 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 578705ee4dbd..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -277,7 +277,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -510,7 +510,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) if (!(Test-Path $packagePath)) { @@ -556,7 +556,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index dc87e04b6c6c..79e3450feaac 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.100", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25611.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25611.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From f3177bc04a2d48616d6908b5d95607fd79925758 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 22 Jan 2026 19:44:38 +0000 Subject: [PATCH 182/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index c8804a76b1b4..31bd8d204991 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9dd012b10c51..6247effc52f3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.0-preview.26071.116 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.0-preview.26072.113 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26071-116 - 7.0.2-rc.7216 + 18.0.11-servicing-26072-113 + 7.0.2-rc.7313 10.0.104 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 10.0.0-preview.26071.116 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 2.0.0-preview.1.26071.116 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 10.0.0-preview.26072.113 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 2.0.0-preview.1.26072.113 2.2.4 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 10.0.4 10.0.4 - 10.0.4-servicing.26071.116 - 10.0.4-servicing.26071.116 - 10.0.0-beta.26071.116 - 10.0.0-beta.26071.116 + 10.0.4-servicing.26072.113 + 10.0.4-servicing.26072.113 + 10.0.0-beta.26072.113 + 10.0.0-beta.26072.113 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26071.116 + 14.0.104-servicing.26072.113 10.0.4 - 5.0.0-2.26071.116 - 5.0.0-2.26071.116 - 10.0.4-servicing.26071.116 + 5.0.0-2.26072.113 + 5.0.0-2.26072.113 + 10.0.4-servicing.26072.113 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26071.116 - 10.0.4-servicing.26071.116 - 18.0.1-release-26071-116 + 10.0.0-preview.26072.113 + 10.0.4-servicing.26072.113 + 18.0.1-release-26072-113 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26071.116 + 10.0.104-servicing.26072.113 10.0.104 - 10.0.104-servicing.26071.116 + 10.0.104-servicing.26072.113 10.0.104 10.0.104 - 10.0.104-servicing.26071.116 - 18.0.1-release-26071-116 - 18.0.1-release-26071-116 + 10.0.104-servicing.26072.113 + 18.0.1-release-26072-113 + 18.0.1-release-26072-113 3.2.4 10.0.4 - 10.0.4-servicing.26071.116 + 10.0.4-servicing.26072.113 10.0.4 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 - 7.0.2-rc.7216 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 + 7.0.2-rc.7313 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9173b569075..a79ae95e48b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 - + https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 4f6650138da4e12fda565f4b372155ff11378878 + 3633524e6b0b93b2b43f66b663b5532e32d70136 diff --git a/global.json b/global.json index 0ff5819c1c87..b593c383389d 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26071.116", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26071.116", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.113", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 871d37b6847d7d2a8662cce9650f5c4d0111ffc1 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 22 Jan 2026 13:02:46 -0800 Subject: [PATCH 183/280] Update VersionFeature80 and VersionFeature90 values to the Jan values --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2b40b0c484ac..ecef719613f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,8 +37,8 @@ 36 20 - 22 - 11 + 23 + 12 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 3ff877f2b5876049f3bf05d946edba5c6622da9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jan 2026 02:01:32 +0000 Subject: [PATCH 184/280] Update dependencies from https://github.com/microsoft/testfx build 20260121.4 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26071.4 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26071.4 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797211a5331a..17f7780eb6a6 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26071.3 - 4.1.0-preview.26071.3 + 2.1.0-preview.26071.4 + 4.1.0-preview.26071.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c908d227f1f..82c1e4d830a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 6adab94760f7b10b6aaca1b4fd04543d9e539242 + 9cc3416249265cd1284f2a00cafc7e1bacedd2ab - + https://github.com/microsoft/testfx - 6adab94760f7b10b6aaca1b4fd04543d9e539242 + 9cc3416249265cd1284f2a00cafc7e1bacedd2ab https://github.com/dotnet/dotnet From 3b8097c842895d494f65bffa2d77c40b2a1a1e79 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jan 2026 02:02:06 +0000 Subject: [PATCH 185/280] Update dependencies from https://github.com/microsoft/testfx build 20260121.4 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26071.4 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26071.4 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 152bf4a7708c..baebef30f945 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26071.3 - 4.1.0-preview.26071.3 + 2.1.0-preview.26071.4 + 4.1.0-preview.26071.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86e972a9b013..24148f971825 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 6adab94760f7b10b6aaca1b4fd04543d9e539242 + 9cc3416249265cd1284f2a00cafc7e1bacedd2ab - + https://github.com/microsoft/testfx - 6adab94760f7b10b6aaca1b4fd04543d9e539242 + 9cc3416249265cd1284f2a00cafc7e1bacedd2ab https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 6a65951b27079ac8421b638aeb5f5076485d28d8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 23 Jan 2026 07:48:04 -0800 Subject: [PATCH 186/280] [release/10.0.1xx] Ignore trailing/leading whitespace when validating sarif files (#52638) Co-authored-by: Matt Mitchell (.NET) --- .editorconfig | 3 +++ .../GenerateDocumentationAndConfigFiles/Program.cs | 10 +++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.editorconfig b/.editorconfig index bc17bbe69267..1bb23330cb90 100644 --- a/.editorconfig +++ b/.editorconfig @@ -510,6 +510,9 @@ dotnet_diagnostic.IDE0040.severity = warning [*.txt] insert_final_newline = false +[*.sarif] +insert_final_newline = false + # Verify settings [*.{received,verified}.{txt,xml,json}] charset = "utf-8-bom" diff --git a/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs b/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs index 3832124d1693..ff7104f3fd0a 100644 --- a/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs +++ b/src/Microsoft.CodeAnalysis.NetAnalyzers/tools/GenerateDocumentationAndConfigFiles/Program.cs @@ -270,7 +270,7 @@ void createPropsFiles() fileContents = $""" - @@ -292,7 +292,7 @@ string getDisableNetAnalyzersImport() { return $""" - @@ -318,7 +318,7 @@ string getCodeAnalysisTreatWarningsAsErrors() var allRuleIds = string.Join(';', allRulesById.Keys); return $""" - @@ -1153,7 +1153,7 @@ string getRuleActionCore(bool enable, bool enableAsWarning = false) private static void Validate(string fileWithPath, string fileContents, List fileNamesWithValidationFailures) { string actual = File.ReadAllText(fileWithPath); - if (actual != fileContents) + if (actual.Trim() != fileContents.Trim()) { fileNamesWithValidationFailures.Add(fileWithPath); } @@ -1560,7 +1560,7 @@ static void AddItemGroupForCompilerVisibleProperties(List compilerVisibl { builder.AppendLine($""" - + """); foreach (var compilerVisibleProperty in compilerVisibleProperties) From 27a3dd2385230a3852444d5033fedefd6f04bec6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 23 Jan 2026 15:49:02 +0000 Subject: [PATCH 187/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 368 +++++----- eng/Version.Details.xml | 677 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +- global.json | 6 +- 8 files changed, 538 insertions(+), 537 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d95b7e6d9f4..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797211a5331a..152bf4a7708c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,139 +6,141 @@ This file should be imported by eng/Versions.props - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-preview.26070.104 - 10.0.3 - 10.0.3 - 18.0.11 - 18.0.11-servicing-26070-104 - 7.0.2-rc.7104 - 10.0.103 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.0-preview.26070.104 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 2.0.0-preview.1.26070.104 - 2.2.3 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3-servicing.26070.104 - 10.0.0-beta.26070.104 - 10.0.0-beta.26070.104 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 14.0.103-servicing.26070.104 - 10.0.3 - 5.0.0-2.26070.104 - 5.0.0-2.26070.104 - 10.0.3-servicing.26070.104 - 10.0.3 - 10.0.3 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 10.0.200-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 15.2.100-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 10.0.0-preview.7.25377.103 - 10.0.0-preview.26070.104 - 10.0.3-servicing.26070.104 - 18.0.1-release-26070-104 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103-servicing.26070.104 - 10.0.103 - 10.0.103 - 10.0.103-servicing.26070.104 - 18.0.1-release-26070-104 - 18.0.1-release-26070-104 - 3.2.3 - 10.0.3 - 10.0.3-servicing.26070.104 - 10.0.3 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 7.0.2-rc.7104 - 10.0.3 - 2.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 - 10.0.3 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 @@ -148,31 +150,7 @@ This file should be imported by eng/Versions.props - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -183,46 +161,25 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) - $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -239,10 +196,6 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -259,6 +212,57 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c908d227f1f..86e972a9b013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -569,9 +572,9 @@ https://github.com/microsoft/testfx 6adab94760f7b10b6aaca1b4fd04543d9e539242 - - https://github.com/dotnet/dotnet - 455f1358f39b4d38fa3893c327a45027c4a81843 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index c19d0b073c51..79e3450feaac 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26070.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 81e7729330c0aa989125d56c5d26063ade740c57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jan 2026 18:49:50 +0000 Subject: [PATCH 188/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 152bf4a7708c..a159b5a12b21 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26072.101 - 18.3.0-release-26072-101 - 18.3.0-release-26072-101 - 7.3.0-preview.1.7301 - 10.0.200-alpha.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 10.0.0-preview.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 10.0.0-beta.26072.101 - 15.2.100-alpha.26072.101 - 5.3.0-2.26072.101 - 5.3.0-2.26072.101 + 10.0.0-preview.26073.109 + 18.3.0-release-26073-109 + 18.3.0-release-26073-109 + 7.3.0-preview.1.7409 + 10.0.200-alpha.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 10.0.0-preview.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 10.0.0-beta.26073.109 + 15.2.100-alpha.26073.109 + 5.3.0-2.26073.109 + 5.3.0-2.26073.109 10.0.0-preview.7.25377.103 - 10.0.0-preview.26072.101 - 18.3.0-release-26072-101 - 10.0.200-alpha.26072.101 - 10.0.200-alpha.26072.101 - 10.0.200-alpha.26072.101 - 10.0.200-alpha.26072.101 - 10.0.200-alpha.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 10.0.300-preview.26072.101 - 18.3.0-release-26072-101 - 18.3.0-release-26072-101 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 - 7.3.0-preview.1.7301 + 10.0.0-preview.26073.109 + 18.3.0-release-26073-109 + 10.0.200-alpha.26073.109 + 10.0.200-alpha.26073.109 + 10.0.200-alpha.26073.109 + 10.0.200-alpha.26073.109 + 10.0.200-alpha.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 10.0.300-preview.26073.109 + 18.3.0-release-26073-109 + 18.3.0-release-26073-109 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 + 7.3.0-preview.1.7409 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86e972a9b013..7a131b4c00b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 - + https://github.com/dotnet/dotnet - a23ce1be2419c25ca93d10463461b1e506c15828 + 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index 79e3450feaac..f16e51212227 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26073.109", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26073.109", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From cd44b291e15d205fd6a0bc1fe698f33ac8989e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 23 Jan 2026 11:45:21 -0800 Subject: [PATCH 189/280] Do not assume ordering between stdout and stderr in tests (#52584) --- test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 19a0cc235b9a..0601832a6340 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -516,9 +516,10 @@ public async Task AutoRestartOnRudeEditAfterRestartPrompt() // rude edit: adding virtual method UpdateSourceFile(programPath, src => src.Replace("/* member placeholder */", "public virtual void F() {}")); + // the prompt is printed into stdout while the error is printed into stderr, so they might arrive in any order: await App.AssertOutputLineStartsWith(" ❔ Do you want to restart your app? Yes (y) / No (n) / Always (a) / Never (v)", failure: _ => false); + await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains(MessageDescriptor.RestartNeededToApplyChanges); App.AssertOutputContains($"❌ {programPath}(39,11): error ENC0023: Adding an abstract method or overriding an inherited method requires restarting the application."); App.Process.ClearOutput(); @@ -1259,9 +1260,10 @@ public async Task Aspire_BuildError_ManualRestart() serviceSourcePath, serviceSource.Replace("record WeatherForecast", "record WeatherForecast2")); + // the prompt is printed into stdout while the error is printed into stderr, so they might arrive in any order: await App.WaitForOutputLineContaining(" ❔ Do you want to restart these projects? Yes (y) / No (n) / Always (a) / Never (v)"); + await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains(MessageDescriptor.RestartNeededToApplyChanges); App.AssertOutputContains($"dotnet watch ❌ {serviceSourcePath}(40,1): error ENC0020: Renaming record 'WeatherForecast' requires restarting the application."); App.AssertOutputContains("dotnet watch ⌚ Affected projects:"); App.AssertOutputContains("dotnet watch ⌚ WatchAspire.ApiService"); From 6d409af396222fdfea0a4d5185c0b9196fb6bbb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jan 2026 22:57:53 +0000 Subject: [PATCH 190/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31bd8d204991..1dcc4e434c87 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6247effc52f3..24d7f1d179f0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.0-preview.26072.113 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.0-preview.26073.110 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26072-113 - 7.0.2-rc.7313 + 18.0.11-servicing-26073-110 + 7.0.2-rc.7410 10.0.104 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 10.0.0-preview.26072.113 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 2.0.0-preview.1.26072.113 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 10.0.0-preview.26073.110 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 2.0.0-preview.1.26073.110 2.2.4 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 10.0.4 10.0.4 - 10.0.4-servicing.26072.113 - 10.0.4-servicing.26072.113 - 10.0.0-beta.26072.113 - 10.0.0-beta.26072.113 + 10.0.4-servicing.26073.110 + 10.0.4-servicing.26073.110 + 10.0.0-beta.26073.110 + 10.0.0-beta.26073.110 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26072.113 + 14.0.104-servicing.26073.110 10.0.4 - 5.0.0-2.26072.113 - 5.0.0-2.26072.113 - 10.0.4-servicing.26072.113 + 5.0.0-2.26073.110 + 5.0.0-2.26073.110 + 10.0.4-servicing.26073.110 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26072.113 - 10.0.4-servicing.26072.113 - 18.0.1-release-26072-113 + 10.0.0-preview.26073.110 + 10.0.4-servicing.26073.110 + 18.0.1-release-26073-110 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26072.113 + 10.0.104-servicing.26073.110 10.0.104 - 10.0.104-servicing.26072.113 + 10.0.104-servicing.26073.110 10.0.104 10.0.104 - 10.0.104-servicing.26072.113 - 18.0.1-release-26072-113 - 18.0.1-release-26072-113 + 10.0.104-servicing.26073.110 + 18.0.1-release-26073-110 + 18.0.1-release-26073-110 3.2.4 10.0.4 - 10.0.4-servicing.26072.113 + 10.0.4-servicing.26073.110 10.0.4 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 - 7.0.2-rc.7313 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 + 7.0.2-rc.7410 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a79ae95e48b4..34b63443b481 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 3633524e6b0b93b2b43f66b663b5532e32d70136 + 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 diff --git a/global.json b/global.json index b593c383389d..7426d5cb4a79 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26073.110", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26073.110", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From d4eb0e2cc21bd30c22982e921de8c9a318772b6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jan 2026 02:02:11 +0000 Subject: [PATCH 191/280] Update dependencies from https://github.com/microsoft/testfx build 20260123.5 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26073.5 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26073.5 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 17f7780eb6a6..67b856030290 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26071.4 - 4.1.0-preview.26071.4 + 2.1.0-preview.26073.5 + 4.1.0-preview.26073.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82c1e4d830a3..92783f99af94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 9cc3416249265cd1284f2a00cafc7e1bacedd2ab + 3c4d290391271602b2f0abdea129ba45e87acb9f - + https://github.com/microsoft/testfx - 9cc3416249265cd1284f2a00cafc7e1bacedd2ab + 3c4d290391271602b2f0abdea129ba45e87acb9f https://github.com/dotnet/dotnet From ff8abe4b9990596f272f70f1a3b634e048452f10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jan 2026 02:03:09 +0000 Subject: [PATCH 192/280] Update dependencies from https://github.com/microsoft/testfx build 20260123.5 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26073.5 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26073.5 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index baebef30f945..f750d7e04128 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26071.4 - 4.1.0-preview.26071.4 + 2.1.0-preview.26073.5 + 4.1.0-preview.26073.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24148f971825..081a21bfb828 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 9cc3416249265cd1284f2a00cafc7e1bacedd2ab + 3c4d290391271602b2f0abdea129ba45e87acb9f - + https://github.com/microsoft/testfx - 9cc3416249265cd1284f2a00cafc7e1bacedd2ab + 3c4d290391271602b2f0abdea129ba45e87acb9f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From fb6f3736d68ec3b4207d6fe85dcf1607324394e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jan 2026 02:02:00 +0000 Subject: [PATCH 193/280] Update dependencies from https://github.com/microsoft/testfx build 20260124.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26074.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26074.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 67b856030290..2a909ecd2c4e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26073.5 - 4.1.0-preview.26073.5 + 2.1.0-preview.26074.1 + 4.1.0-preview.26074.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92783f99af94..9625c1f0ffca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 3c4d290391271602b2f0abdea129ba45e87acb9f + 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 - + https://github.com/microsoft/testfx - 3c4d290391271602b2f0abdea129ba45e87acb9f + 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 https://github.com/dotnet/dotnet From dd481aa4f0c117e934e16d27e2d2c567c9788d91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jan 2026 02:02:16 +0000 Subject: [PATCH 194/280] Update dependencies from https://github.com/microsoft/testfx build 20260124.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26074.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26074.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f750d7e04128..d2ceb522846c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26073.5 - 4.1.0-preview.26073.5 + 2.1.0-preview.26074.1 + 4.1.0-preview.26074.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 081a21bfb828..4166cb862169 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 3c4d290391271602b2f0abdea129ba45e87acb9f + 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 - + https://github.com/microsoft/testfx - 3c4d290391271602b2f0abdea129ba45e87acb9f + 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 37dccbec8ce896ec0927153f4ac1cc43086a63fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jan 2026 02:01:19 +0000 Subject: [PATCH 195/280] Update dependencies from https://github.com/microsoft/testfx build 20260125.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26075.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26075.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 62d49a5c227c..f596c305b679 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26074.1 - 4.1.0-preview.26074.1 + 2.1.0-preview.26075.1 + 4.1.0-preview.26075.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 075b09600b1a..b700a64639ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/microsoft/testfx - 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 + 551933c1da7ad827635c25960c6f174ff6ca7acd - + https://github.com/microsoft/testfx - 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 + 551933c1da7ad827635c25960c6f174ff6ca7acd https://github.com/dotnet/dotnet From 9f0b155146d8d23f5fbb91fbc10361de8677d35e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jan 2026 02:01:45 +0000 Subject: [PATCH 196/280] Update dependencies from https://github.com/microsoft/testfx build 20260125.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26075.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26075.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d2ceb522846c..c2dd491d5865 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26074.1 - 4.1.0-preview.26074.1 + 2.1.0-preview.26075.1 + 4.1.0-preview.26075.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4166cb862169..dbdbdbba41da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 + 551933c1da7ad827635c25960c6f174ff6ca7acd - + https://github.com/microsoft/testfx - 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 + 551933c1da7ad827635c25960c6f174ff6ca7acd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 79564b0c66ab10512542779206ed57df241eebd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jan 2026 16:34:05 +0000 Subject: [PATCH 197/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 +++--- eng/Version.Details.xml | 392 +++++++++--------- .../core-templates/job/source-build.yml | 2 +- global.json | 4 +- 5 files changed, 263 insertions(+), 263 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1dcc4e434c87..890a7c77728b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 24d7f1d179f0..9e72640a237c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.0-preview.26073.110 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.0-preview.26076.104 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26073-110 - 7.0.2-rc.7410 + 18.0.11-servicing-26076-104 + 7.0.2-rc.7704 10.0.104 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 10.0.0-preview.26073.110 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 2.0.0-preview.1.26073.110 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 10.0.0-preview.26076.104 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 2.0.0-preview.1.26076.104 2.2.4 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 10.0.4 10.0.4 - 10.0.4-servicing.26073.110 - 10.0.4-servicing.26073.110 - 10.0.0-beta.26073.110 - 10.0.0-beta.26073.110 + 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.104 + 10.0.0-beta.26076.104 + 10.0.0-beta.26076.104 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26073.110 + 14.0.104-servicing.26076.104 10.0.4 - 5.0.0-2.26073.110 - 5.0.0-2.26073.110 - 10.0.4-servicing.26073.110 + 5.0.0-2.26076.104 + 5.0.0-2.26076.104 + 10.0.4-servicing.26076.104 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26073.110 - 10.0.4-servicing.26073.110 - 18.0.1-release-26073-110 + 10.0.0-preview.26076.104 + 10.0.4-servicing.26076.104 + 18.0.1-release-26076-104 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26073.110 + 10.0.104-servicing.26076.104 10.0.104 - 10.0.104-servicing.26073.110 + 10.0.104-servicing.26076.104 10.0.104 10.0.104 - 10.0.104-servicing.26073.110 - 18.0.1-release-26073-110 - 18.0.1-release-26073-110 + 10.0.104-servicing.26076.104 + 18.0.1-release-26076-104 + 18.0.1-release-26076-104 3.2.4 10.0.4 - 10.0.4-servicing.26073.110 + 10.0.4-servicing.26076.104 10.0.4 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 - 7.0.2-rc.7410 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 + 7.0.2-rc.7704 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34b63443b481..33ad381b5acc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e - + https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 + b808816191c4843537f70f2bb5926f92cd386a9e diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb94..c08b3ad8ad03 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: Azure-Linux-3-Amd64 os: linux ${{ else }}: pool: diff --git a/global.json b/global.json index 7426d5cb4a79..512c3e5ace79 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26073.110", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26073.110", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 3ea21daeaaf24a74411c3b6eb3e5ecb88b6233dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 00:12:53 +0000 Subject: [PATCH 198/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 890a7c77728b..e3831295c699 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9e72640a237c..290d723cfc91 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.0-preview.26076.104 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.0-preview.26076.112 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26076-104 - 7.0.2-rc.7704 + 18.0.11-servicing-26076-112 + 7.0.2-rc.7712 10.0.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 10.0.0-preview.26076.104 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 2.0.0-preview.1.26076.104 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 10.0.0-preview.26076.112 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 2.0.0-preview.1.26076.112 2.2.4 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 10.0.4 10.0.4 - 10.0.4-servicing.26076.104 - 10.0.4-servicing.26076.104 - 10.0.0-beta.26076.104 - 10.0.0-beta.26076.104 + 10.0.4-servicing.26076.112 + 10.0.4-servicing.26076.112 + 10.0.0-beta.26076.112 + 10.0.0-beta.26076.112 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26076.104 + 14.0.104-servicing.26076.112 10.0.4 - 5.0.0-2.26076.104 - 5.0.0-2.26076.104 - 10.0.4-servicing.26076.104 + 5.0.0-2.26076.112 + 5.0.0-2.26076.112 + 10.0.4-servicing.26076.112 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26076.104 - 10.0.4-servicing.26076.104 - 18.0.1-release-26076-104 + 10.0.0-preview.26076.112 + 10.0.4-servicing.26076.112 + 18.0.1-release-26076-112 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26076.104 + 10.0.104-servicing.26076.112 10.0.104 - 10.0.104-servicing.26076.104 + 10.0.104-servicing.26076.112 10.0.104 10.0.104 - 10.0.104-servicing.26076.104 - 18.0.1-release-26076-104 - 18.0.1-release-26076-104 + 10.0.104-servicing.26076.112 + 18.0.1-release-26076-112 + 18.0.1-release-26076-112 3.2.4 10.0.4 - 10.0.4-servicing.26076.104 + 10.0.4-servicing.26076.112 10.0.4 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 - 7.0.2-rc.7704 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 + 7.0.2-rc.7712 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 33ad381b5acc..2ab4f7cba418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b - + https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - b808816191c4843537f70f2bb5926f92cd386a9e + 50eb0da036c4744046e4ef9a500d918f9bdc8e0b diff --git a/global.json b/global.json index 512c3e5ace79..9d8a6306abfe 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.112", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.112", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 920f7c16b832d527fe2f3295498ac8351e9852d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 02:01:10 +0000 Subject: [PATCH 199/280] Update dependencies from https://github.com/microsoft/testfx build 20260126.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26076.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26076.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f596c305b679..40ab7f694211 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26075.1 - 4.1.0-preview.26075.1 + 2.1.0-preview.26076.1 + 4.1.0-preview.26076.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b700a64639ac..9272ef1a061e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/microsoft/testfx - 551933c1da7ad827635c25960c6f174ff6ca7acd + ad5aef4225e69edc95ff94eb6fc609d904038af0 - + https://github.com/microsoft/testfx - 551933c1da7ad827635c25960c6f174ff6ca7acd + ad5aef4225e69edc95ff94eb6fc609d904038af0 https://github.com/dotnet/dotnet From 3505301ddcd38338c1c99ed7281d819b06d56a63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 02:01:58 +0000 Subject: [PATCH 200/280] Update dependencies from https://github.com/microsoft/testfx build 20260126.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26076.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26076.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c2dd491d5865..8821df165464 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26075.1 - 4.1.0-preview.26075.1 + 2.1.0-preview.26076.1 + 4.1.0-preview.26076.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbdbdbba41da..e3283cec3945 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 551933c1da7ad827635c25960c6f174ff6ca7acd + ad5aef4225e69edc95ff94eb6fc609d904038af0 - + https://github.com/microsoft/testfx - 551933c1da7ad827635c25960c6f174ff6ca7acd + ad5aef4225e69edc95ff94eb6fc609d904038af0 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From c5df5e2e7af57c5d6b575fac92ca0f4386b4bbb2 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Tue, 20 Jan 2026 10:55:21 +0100 Subject: [PATCH 201/280] Add escape hatch for not setting a default PublishRuntimeIdentifier value. This adds an escape hatch (setting 'UseDefaultPublishRuntimeIdentifier=false') when trying to set a default PublishRuntimeIdentifier value. This is necessary when publishing with RuntimeIdentifiers (plural), but without a RuntimeIdentifier, which is valid when building universal apps for macOS and Mac Catalyst (the netX-macos and netX-maccatalyst target frameworks). When building such an app, the project file will set RuntimeIdentifiers (plural): net11.0-macos osx-x64;osx-arm and then during build/publish, the macOS SDK will run two inner builds, with RuntimeIdentifiers unset, and RuntimeIdentifier set to each of the rids (and at the end merge the result into a single app). The problem is that the outer build, where RuntimeIdentifiers is set, but RuntimeIdentifier isn't, PublishRuntimeIdentifier will now get a default value (after PR #51765), and that will set RuntimeIdentifier, which will confuse our outer build. Also note that we can't set PublishRuntimeIdentifier to the desired runtime identifiers (plural), because PublishRuntimeIdentifier is only valid for a single runtime identifier. --- .../Microsoft.NET.RuntimeIdentifierInference.targets | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets index 67edae3e3c3b..27ec11b2412d 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.RuntimeIdentifierInference.targets @@ -127,7 +127,8 @@ Copyright (c) .NET Foundation. All rights reserved. then set a default value for PublishRuntimeIdentifier if RuntimeIdentifier isn't set. However, don't do this if we are packing a PackAsTool project, as the "outer" build should still be without a RuntimeIdentifier --> - + true + + $(NETCoreSdkPortableRuntimeIdentifier) From 8af133d64173cc4c3af5905f6eecac22008ebbc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 17:10:48 +0000 Subject: [PATCH 202/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3831295c699..d7ab59db215a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 290d723cfc91..fb5a4dc8b4b1 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.0-preview.26076.112 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.0-preview.26077.101 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26076-112 - 7.0.2-rc.7712 + 18.0.11-servicing-26077-101 + 7.0.2-rc.7801 10.0.104 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 10.0.0-preview.26076.112 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 2.0.0-preview.1.26076.112 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 10.0.0-preview.26077.101 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 2.0.0-preview.1.26077.101 2.2.4 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 10.0.4 10.0.4 - 10.0.4-servicing.26076.112 - 10.0.4-servicing.26076.112 - 10.0.0-beta.26076.112 - 10.0.0-beta.26076.112 + 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.101 + 10.0.0-beta.26077.101 + 10.0.0-beta.26077.101 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26076.112 + 14.0.104-servicing.26077.101 10.0.4 - 5.0.0-2.26076.112 - 5.0.0-2.26076.112 - 10.0.4-servicing.26076.112 + 5.0.0-2.26077.101 + 5.0.0-2.26077.101 + 10.0.4-servicing.26077.101 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26076.112 - 10.0.4-servicing.26076.112 - 18.0.1-release-26076-112 + 10.0.0-preview.26077.101 + 10.0.4-servicing.26077.101 + 18.0.1-release-26077-101 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26076.112 + 10.0.104-servicing.26077.101 10.0.104 - 10.0.104-servicing.26076.112 + 10.0.104-servicing.26077.101 10.0.104 10.0.104 - 10.0.104-servicing.26076.112 - 18.0.1-release-26076-112 - 18.0.1-release-26076-112 + 10.0.104-servicing.26077.101 + 18.0.1-release-26077-101 + 18.0.1-release-26077-101 3.2.4 10.0.4 - 10.0.4-servicing.26076.112 + 10.0.4-servicing.26077.101 10.0.4 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 - 7.0.2-rc.7712 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 + 7.0.2-rc.7801 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ab4f7cba418..99effa0a3a8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 - + https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 50eb0da036c4744046e4ef9a500d918f9bdc8e0b + dba294732355bec25d827f6dc0b473dea45164d4 diff --git a/global.json b/global.json index 9d8a6306abfe..aebbf7f47142 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.112", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.112", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 918016bd6536642a5424400b5b1584c7731197e2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 27 Jan 2026 20:02:48 +0000 Subject: [PATCH 203/280] [release/10.0.2xx] ProcessFrameworkReferences: use portable ILCompiler when RuntimeIdentifier is null. (#52486) Co-authored-by: Tom Deseyn Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com> Co-authored-by: DonnaChen888 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marc Paine --- .../ProcessFrameworkReferencesTests.cs | 72 +++++++++++++++++++ .../ProcessFrameworkReferences.cs | 9 ++- 2 files changed, 78 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs index 34286cbb468a..cabcd3734b17 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs @@ -82,6 +82,30 @@ public class ProcessFrameworkReferencesTests } """; + private const string NonPortableRid = "fedora.42-x64"; + + private static readonly string NonPortableRuntimeGraph = $$""" + { + "runtimes": { + "base": { + "#import": [] + }, + "any": { + "#import": ["base"] + }, + "linux": { + "#import": ["any"] + }, + "linux-x64": { + "#import": ["linux"] + }, + "{{NonPortableRid}}": { + "#import": ["linux-x64"] + } + } + } + """; + // Shared known framework references private readonly MockTaskItem _validWindowsSDKKnownFrameworkReference = CreateKnownFrameworkReference( "Microsoft.Windows.SDK.NET.Ref", "net5.0-windows10.0.18362", "10.0.18362.1-preview", @@ -493,6 +517,7 @@ public void It_handles_real_world_ridless_scenario_with_aot_and_trimming() ["TargetFramework"] = "net10.0", ["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler", ["ILCompilerPackVersion"] = "10.0.0-rc.2.25457.102", + ["ILCompilerPortableRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64", ["ILCompilerRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64" }); @@ -967,5 +992,52 @@ public void It_handles_complex_cross_compilation_RuntimeIdentifiers() $"Should include runtime pack for supported RID: {rid}"); } } + + [Theory] + [InlineData(null, "linux-x64")] + [InlineData("linux-x64", "linux-x64")] + [InlineData(NonPortableRid, NonPortableRid)] + public void It_selects_correct_ILCompiler_based_on_RuntimeIdentifier(string? runtimeIdentifier, string expectedILCompilerRid) + { + var netCoreAppRef = CreateKnownFrameworkReference("Microsoft.NETCore.App", "net10.0", "10.0.1", + "Microsoft.NETCore.App.Runtime.**RID**", + "linux-x64;" + NonPortableRid); + + var ilCompilerPack = new MockTaskItem("Microsoft.DotNet.ILCompiler", new Dictionary + { + ["TargetFramework"] = "net10.0", + ["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler", + ["ILCompilerPackVersion"] = "10.0.1", + ["ILCompilerPortableRuntimeIdentifiers"] = "linux-x64", + ["ILCompilerRuntimeIdentifiers"] = "linux-x64;" + NonPortableRid + }); + + var config = new TaskConfiguration + { + TargetFrameworkVersion = "10.0", + EnableRuntimePackDownload = true, + PublishAot = true, + NETCoreSdkRuntimeIdentifier = NonPortableRid, + NETCoreSdkPortableRuntimeIdentifier = "linux-x64", + RuntimeIdentifier = runtimeIdentifier, + RuntimeGraphPath = CreateRuntimeGraphFile(NonPortableRuntimeGraph), + FrameworkReferences = new[] { new MockTaskItem("Microsoft.NETCore.App", new Dictionary()) }, + KnownFrameworkReferences = new[] { netCoreAppRef }, + KnownILCompilerPacks = new[] { ilCompilerPack } + }; + + var task = CreateTask(config); + task.Execute().Should().BeTrue("Task should succeed"); + + // Validate that the expected ILCompiler pack is used + task.PackagesToDownload.Should().NotBeNull(); + task.PackagesToDownload.Should().Contain(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler"), + "Should include ILCompiler pack when PublishAot is true"); + + var ilCompilerPackage = task.PackagesToDownload.FirstOrDefault(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler")); + ilCompilerPackage.Should().NotBeNull(); + ilCompilerPackage!.ItemSpec.Should().Contain(expectedILCompilerRid, + $"Should use {expectedILCompilerRid} ILCompiler pack"); + } } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs index 8f3d55dcde4b..e11fc4ebc73f 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs @@ -838,8 +838,10 @@ private ToolPackSupport AddToolPack( if (toolPackType is ToolPackType.Crossgen2 or ToolPackType.ILCompiler) { var packNamePattern = knownPack.GetMetadata(packName + "PackNamePattern"); - var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(';'); - var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(';'); + var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + // Use the non-portable RIDs if there are no portable RIDs defined. + packSupportedPortableRuntimeIdentifiers = packSupportedPortableRuntimeIdentifiers.Length > 0 ? packSupportedPortableRuntimeIdentifiers : packSupportedRuntimeIdentifiers; // When publishing for a non-portable RID, prefer NETCoreSdkRuntimeIdentifier for the host. // Otherwise prefer the NETCoreSdkPortableRuntimeIdentifier. @@ -853,15 +855,16 @@ private ToolPackSupport AddToolPack( // This also ensures that targeting common RIDs doesn't require any non-portable assets that aren't packaged in the SDK by default. // Due to size concerns, the non-portable ILCompiler and Crossgen2 aren't included by default in non-portable SDK distributions. var runtimeIdentifier = RuntimeIdentifier ?? RuntimeIdentifierForPlatformAgnosticComponents; + string? supportedTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedRuntimeIdentifiers, out _); string? supportedPortableTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _); bool usePortable = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier) - && supportedTargetRid is not null && supportedPortableTargetRid is not null && supportedTargetRid == supportedPortableTargetRid; // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture Log.LogMessage(MessageImportance.Low, $"Determining best RID for '{knownPack.ItemSpec}@{packVersion}' from among '{knownPack.GetMetadata(packName + "RuntimeIdentifiers")}'"); + string? hostRuntimeIdentifier = usePortable ? NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkPortableRuntimeIdentifier!, packSupportedPortableRuntimeIdentifiers, out _) : NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkRuntimeIdentifier!, packSupportedRuntimeIdentifiers, out _); From 27df5c71bc86e7e50f049bcdf7ceb918fe074164 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Tue, 27 Jan 2026 12:59:00 -0800 Subject: [PATCH 204/280] `workload repair` can recover from corrupt workload sets (#52434) Co-authored-by: Marc Paine --- .../dotnet/Commands/CliCommandStrings.resx | 58 +++++---- .../Workload/Install/FileBasedInstaller.cs | 3 +- .../Install/WorkloadInstallerFactory.cs | 22 +++- .../Workload/Repair/WorkloadRepairCommand.cs | 6 +- .../Workload/WorkloadHistoryRecorder.cs | 4 + .../WorkloadManifestCorruptionRepairer.cs | 121 ++++++++++++++++++ .../Commands/xlf/CliCommandStrings.cs.xlf | 5 + .../Commands/xlf/CliCommandStrings.de.xlf | 5 + .../Commands/xlf/CliCommandStrings.es.xlf | 5 + .../Commands/xlf/CliCommandStrings.fr.xlf | 5 + .../Commands/xlf/CliCommandStrings.it.xlf | 5 + .../Commands/xlf/CliCommandStrings.ja.xlf | 5 + .../Commands/xlf/CliCommandStrings.ko.xlf | 5 + .../Commands/xlf/CliCommandStrings.pl.xlf | 5 + .../Commands/xlf/CliCommandStrings.pt-BR.xlf | 5 + .../Commands/xlf/CliCommandStrings.ru.xlf | 5 + .../Commands/xlf/CliCommandStrings.tr.xlf | 5 + .../xlf/CliCommandStrings.zh-Hans.xlf | 5 + .../xlf/CliCommandStrings.zh-Hant.xlf | 5 + .../IWorkloadManifestCorruptionRepairer.cs | 18 +++ .../IWorkloadManifestProvider.cs | 24 ++++ .../SdkDirectoryWorkloadManifestProvider.cs | 71 +++++++++- .../Strings.resx | 58 +++++---- .../xlf/Strings.cs.xlf | 5 + .../xlf/Strings.de.xlf | 5 + .../xlf/Strings.es.xlf | 5 + .../xlf/Strings.fr.xlf | 5 + .../xlf/Strings.it.xlf | 5 + .../xlf/Strings.ja.xlf | 5 + .../xlf/Strings.ko.xlf | 5 + .../xlf/Strings.pl.xlf | 5 + .../xlf/Strings.pt-BR.xlf | 5 + .../xlf/Strings.ru.xlf | 5 + .../xlf/Strings.tr.xlf | 5 + .../xlf/Strings.zh-Hans.xlf | 5 + .../xlf/Strings.zh-Hant.xlf | 5 + ...kDirectoryWorkloadManifestProviderTests.cs | 6 +- .../Install/CorruptWorkloadSetTestHelper.cs | 114 +++++++++++++++++ .../Install/MockPackWorkloadInstaller.cs | 28 +++- .../Repair/GivenDotnetWorkloadRepair.cs | 45 ++++++- .../Restore/GivenDotnetWorkloadRestore.cs | 4 +- .../Workload/Search/MockWorkloadResolver.cs | 8 +- .../Update/GivenDotnetWorkloadUpdate.cs | 62 ++++++++- 43 files changed, 709 insertions(+), 73 deletions(-) create mode 100644 src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs create mode 100644 src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs create mode 100644 test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx index 74001a13dfe9..d34d4f76f184 100644 --- a/src/Cli/dotnet/Commands/CliCommandStrings.resx +++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx @@ -1,17 +1,17 @@  - @@ -2724,4 +2724,8 @@ Proceed? duration: + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + diff --git a/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs b/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs index 99681825c16f..9328fd2f9f32 100644 --- a/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs +++ b/src/Cli/dotnet/Commands/Workload/Install/FileBasedInstaller.cs @@ -5,6 +5,7 @@ using System.Collections.Concurrent; using System.Text.Json; +using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.DotNet.Cli.Commands.Workload.Config; using Microsoft.DotNet.Cli.Commands.Workload.Install.WorkloadInstallRecords; using Microsoft.DotNet.Cli.Extensions; @@ -642,7 +643,7 @@ public IEnumerable GetWorkloadHistoryRecords(string sdkFe public void Shutdown() { // Perform any additional cleanup here that's intended to run at the end of the command, regardless - // of success or failure. For file based installs, there shouldn't be any additional work to + // of success or failure. For file based installs, there shouldn't be any additional work to // perform. } diff --git a/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs b/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs index 6ad1553257f2..e260bfa90fa7 100644 --- a/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs +++ b/src/Cli/dotnet/Commands/Workload/Install/WorkloadInstallerFactory.cs @@ -3,6 +3,7 @@ #nullable disable +using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.DotNet.Cli.NuGetPackageDownloader; using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Configurer; @@ -48,7 +49,7 @@ public static IInstaller GetWorkloadInstaller( userProfileDir ??= CliFolderPathCalculator.DotnetUserProfileFolderPath; - return new FileBasedInstaller( + var installer = new FileBasedInstaller( reporter, sdkFeatureBand, workloadResolver, @@ -59,6 +60,25 @@ public static IInstaller GetWorkloadInstaller( verbosity: verbosity, packageSourceLocation: packageSourceLocation, restoreActionConfig: restoreActionConfig); + + // Attach corruption repairer to recover from corrupt workload sets + if (nugetPackageDownloader is not null && + workloadResolver?.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider sdkProvider && + sdkProvider.CorruptionRepairer is null) + { + sdkProvider.CorruptionRepairer = new WorkloadManifestCorruptionRepairer( + reporter, + installer, + workloadResolver, + sdkFeatureBand, + dotnetDir, + userProfileDir, + nugetPackageDownloader, + packageSourceLocation, + verbosity); + } + + return installer; } private static bool CanWriteToDotnetRoot(string dotnetDir = null) diff --git a/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs b/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs index 46fee7742ebb..7712399f3eee 100644 --- a/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs +++ b/src/Cli/dotnet/Commands/Workload/Repair/WorkloadRepairCommand.cs @@ -69,7 +69,8 @@ public override int Execute() { Reporter.WriteLine(); - var workloadIds = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(new SdkFeatureBand(_sdkVersion)); + var sdkFeatureBand = new SdkFeatureBand(_sdkVersion); + var workloadIds = _workloadInstaller.GetWorkloadInstallationRecordRepository().GetInstalledWorkloads(sdkFeatureBand); if (!workloadIds.Any()) { @@ -79,7 +80,7 @@ public override int Execute() Reporter.WriteLine(string.Format(CliCommandStrings.RepairingWorkloads, string.Join(" ", workloadIds))); - ReinstallWorkloadsBasedOnCurrentManifests(workloadIds, new SdkFeatureBand(_sdkVersion)); + ReinstallWorkloadsBasedOnCurrentManifests(workloadIds, sdkFeatureBand); WorkloadInstallCommand.TryRunGarbageCollection(_workloadInstaller, Reporter, Verbosity, workloadSetVersion => _workloadResolverFactory.CreateForWorkloadSet(_dotnetPath, _sdkVersion.ToString(), _userProfileDir, workloadSetVersion)); @@ -105,4 +106,5 @@ private void ReinstallWorkloadsBasedOnCurrentManifests(IEnumerable w { _workloadInstaller.RepairWorkloads(workloadIds, sdkFeatureBand); } + } diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs b/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs index ab64b7539912..0690f5e12347 100644 --- a/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs +++ b/src/Cli/dotnet/Commands/Workload/WorkloadHistoryRecorder.cs @@ -54,6 +54,10 @@ public void Run(Action workloadAction) private WorkloadHistoryState GetWorkloadState() { var resolver = _workloadResolverFunc(); + if (resolver.GetWorkloadManifestProvider() is SdkDirectoryWorkloadManifestProvider sdkProvider) + { + sdkProvider.CorruptionFailureMode = ManifestCorruptionFailureMode.Ignore; + } var currentWorkloadVersion = resolver.GetWorkloadVersion().Version; return new WorkloadHistoryState() { diff --git a/src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs b/src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs new file mode 100644 index 000000000000..28bfe766a5f0 --- /dev/null +++ b/src/Cli/dotnet/Commands/Workload/WorkloadManifestCorruptionRepairer.cs @@ -0,0 +1,121 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Diagnostics.CodeAnalysis; +using Microsoft.DotNet.Cli; +using Microsoft.DotNet.Cli.Commands.Workload.Install; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.NET.Sdk.WorkloadManifestReader; + +namespace Microsoft.DotNet.Cli.Commands.Workload; + +internal sealed class WorkloadManifestCorruptionRepairer : IWorkloadManifestCorruptionRepairer +{ + private readonly IReporter _reporter; + private readonly IInstaller _workloadInstaller; + private readonly IWorkloadResolver _workloadResolver; + private readonly SdkFeatureBand _sdkFeatureBand; + private readonly string _dotnetPath; + private readonly string _userProfileDir; + private readonly INuGetPackageDownloader? _packageDownloader; + private readonly PackageSourceLocation? _packageSourceLocation; + private readonly VerbosityOptions _verbosity; + + private bool _checked; + + public WorkloadManifestCorruptionRepairer( + IReporter reporter, + IInstaller workloadInstaller, + IWorkloadResolver workloadResolver, + SdkFeatureBand sdkFeatureBand, + string dotnetPath, + string userProfileDir, + INuGetPackageDownloader? packageDownloader, + PackageSourceLocation? packageSourceLocation, + VerbosityOptions verbosity) + { + _reporter = reporter ?? NullReporter.Instance; + _workloadInstaller = workloadInstaller; + _workloadResolver = workloadResolver; + _sdkFeatureBand = sdkFeatureBand; + _dotnetPath = dotnetPath; + _userProfileDir = userProfileDir; + _packageDownloader = packageDownloader; + _packageSourceLocation = packageSourceLocation; + _verbosity = verbosity; + } + + public void EnsureManifestsHealthy(ManifestCorruptionFailureMode failureMode) + { + if (_checked) + { + return; + } + + _checked = true; + + if (failureMode == ManifestCorruptionFailureMode.Ignore) + { + return; + } + + // Get the workload set directly from the provider - it was already resolved during construction + // and doesn't require reading the install state file again + var provider = _workloadResolver.GetWorkloadManifestProvider() as SdkDirectoryWorkloadManifestProvider; + var workloadSet = provider?.ResolvedWorkloadSet; + + if (workloadSet is null) + { + // No workload set is being used + return; + } + + if (!provider?.HasMissingManifests(workloadSet) ?? true) + { + return; + } + + if (failureMode == ManifestCorruptionFailureMode.Throw) + { + throw new InvalidOperationException(string.Format(CliCommandStrings.WorkloadSetHasMissingManifests, workloadSet.Version)); + } + + _reporter.WriteLine($"Repairing workload set {workloadSet.Version}..."); + CliTransaction.RunNew(context => RepairCorruptWorkloadSet(context, workloadSet)); + } + + + + private void RepairCorruptWorkloadSet(ITransactionContext context, WorkloadSet workloadSet) + { + var manifestUpdates = CreateManifestUpdatesFromWorkloadSet(workloadSet); + + foreach (var manifestUpdate in manifestUpdates) + { + _workloadInstaller.InstallWorkloadManifest(manifestUpdate, context); + } + + } + + [MemberNotNull(nameof(_packageDownloader))] + private IEnumerable CreateManifestUpdatesFromWorkloadSet(WorkloadSet workloadSet) + { + if (_packageDownloader is null) + { + throw new InvalidOperationException("Package downloader is required to repair workload manifests."); + } + + var manifestUpdater = new WorkloadManifestUpdater( + _reporter, + _workloadResolver, + _packageDownloader, + _userProfileDir, + _workloadInstaller.GetWorkloadInstallationRecordRepository(), + _workloadInstaller, + _packageSourceLocation, + displayManifestUpdates: _verbosity >= VerbosityOptions.detailed); + + return manifestUpdater.CalculateManifestUpdatesForWorkloadSet(workloadSet); + } +} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index 69f0ea0788e1..1512b9be7de3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -4074,6 +4074,11 @@ Pokud chcete zobrazit hodnotu, zadejte odpovídající volbu příkazového řá Verze {0} úlohy, která byla zadána v {1}, nebyla nalezena. Spuštěním příkazu dotnet workload restore nainstalujte tuto verzi úlohy. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Verze úlohy, která se má zobrazit, nebo jedna nebo více úloh a jejich verze spojené znakem @. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index e3a05f3c7545..6648f17aedbe 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -4074,6 +4074,11 @@ Um einen Wert anzuzeigen, geben Sie die entsprechende Befehlszeilenoption an, oh Die Arbeitsauslastungsversion {0}, die in {1} angegeben wurde, wurde nicht gefunden. Führen Sie „dotnet workload restore“ aus, um diese Workloadversion zu installieren. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Eine Workloadversion zum Anzeigen oder mindestens eine Workload und deren Versionen, die mit dem Zeichen "@" verknüpft sind. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index 82aa42c23b79..93d84a383f4e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -4074,6 +4074,11 @@ Para mostrar un valor, especifique la opción de línea de comandos correspondie No se encontró la versión de carga de trabajo {0}, que se especificó en {1}. Ejecuta "dotnet workload restore" para instalar esta versión de carga de trabajo. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Una versión de carga de trabajo para mostrar o una o varias cargas de trabajo y sus versiones unidas por el carácter "@". diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index b6da938fbb90..b2524264859d 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -4074,6 +4074,11 @@ Pour afficher une valeur, spécifiez l’option de ligne de commande corresponda La version de charge de travail {0}, qui a été spécifiée dans {1}, est introuvable. Exécutez « dotnet workload restore » pour installer cette version de charge de travail. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Version de charge de travail à afficher ou une ou plusieurs charges de travail et leurs versions jointes par le caractère « @ ». diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index d8ded9eb3783..512bf4612264 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -4074,6 +4074,11 @@ Per visualizzare un valore, specifica l'opzione della riga di comando corrispond La versione del carico di lavoro {0}, specificata in {1}, non è stata trovata. Eseguire "dotnet workload restore" per installare questa versione del carico di lavoro. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Una versione del carico di lavoro da visualizzare oppure uno o più carichi di lavoro e le relative versioni unite dal carattere '@'. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index 373d63a6721b..aa044bf2b8c3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid {1} で指定されたワークロード バージョン {0} が見つかりませんでした。"dotnet workload restore" を実行して、このワークロード バージョンをインストールします。 {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 表示するワークロードのバージョン、または '@' 文字で結合された 1 つ以上のワークロードとそのバージョン。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index 6935ae03eb40..7290a2610e18 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid {1}에 지정된 워크로드 버전 {0}을(를) 찾을 수 없습니다. "dotnet workload restore"을 실행하여 이 워크로드 버전을 설치합니다. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 표시할 워크로드 버전 또는 '@' 문자로 결합된 하나 이상의 워크로드와 해당 버전입니다. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 952dc2ec304c..5ef1ec80a17e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -4074,6 +4074,11 @@ Aby wyświetlić wartość, należy podać odpowiednią opcję wiersza poleceń Nie znaleziono wersji obciążenia {0} określonej w kontenerze {1}. Uruchom polecenie „dotnet workload restore”, aby zainstalować tę wersję obciążenia. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Wersja obciążenia do wyświetlenia lub jedno lub więcej obciążeń i ich wersji połączonych znakiem „@”. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index c0d1afd99daf..0e7a0f908f2b 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -4074,6 +4074,11 @@ Para exibir um valor, especifique a opção de linha de comando correspondente s A versão da carga de trabalho {0}, especificada em {1}, não foi localizada. Execute "dotnet workload restore" para instalar esta versão da carga de trabalho. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Uma versão de carga de trabalho para exibir ou uma ou mais cargas de trabalho e suas versões unidas pelo caractere ''@''. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index e0611a0d0423..cfb075bb07df 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -4075,6 +4075,11 @@ To display a value, specify the corresponding command-line option without provid Версия рабочей нагрузки {0}, указанная в {1}, не найдена. Запустите команду "dotnet workload restore", чтобы установить эту версию рабочей нагрузки. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Версия рабочей нагрузки для отображения или одной или нескольких рабочих нагрузок и их версий, соединенных символом "@". diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf index 24d365bdb0e0..195553f39fa9 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf @@ -4074,6 +4074,11 @@ Bir değeri görüntülemek için, bir değer sağlamadan ilgili komut satırı {1} konumunda belirtilen {0} iş yükü sürümü bulunamadı. Bu iş yükü sürümünü yüklemek için "dotnet workload restore" komutunu çalıştırın. {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. Görüntülenecek bir iş yükü sürümü veya bir veya daha fazla iş yükü ve bunların '@' karakteriyle birleştirilen sürümleri. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index f5d749e1d50d..a9bf482bb05e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid 找不到在 {1} 中指定的工作负载版本 {0}。运行“dotnet workload restore”以安装此工作负载版本。 {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 要显示的工作负载版本，或一个或多个工作负载，并且其版本由 ‘@’ 字符联接。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index 93e2b84eaee7..39969f14662e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -4074,6 +4074,11 @@ To display a value, specify the corresponding command-line option without provid 找不到 {1} 中指定的工作負載版本 {0}。執行 "dotnet workload restore" 以安裝此工作負載版本。 {Locked="dotnet workload restore"} + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {0} is the workload set version. {Locked="dotnet workload repair"} + A workload version to display or one or more workloads and their versions joined by the '@' character. 要顯示的工作負載版本，或是一或多個工作負載及其由 '@' 字元連接的版本。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs new file mode 100644 index 000000000000..4c3a9e907ba9 --- /dev/null +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestCorruptionRepairer.cs @@ -0,0 +1,18 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.NET.Sdk.WorkloadManifestReader +{ + /// + /// Provides a hook for the CLI layer to detect and repair corrupt workload manifest installations + /// before the manifests are loaded by the resolver. + /// + public interface IWorkloadManifestCorruptionRepairer + { + /// + /// Ensures that the manifests required by the current resolver are present and healthy. + /// + /// How to handle corruption if detected. + void EnsureManifestsHealthy(ManifestCorruptionFailureMode failureMode); + } +} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs index 4a2df9d5ecaa..887b170fcd04 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/IWorkloadManifestProvider.cs @@ -3,6 +3,30 @@ namespace Microsoft.NET.Sdk.WorkloadManifestReader { + /// + /// Specifies how the manifest provider should handle corrupt or missing workload manifests. + /// + public enum ManifestCorruptionFailureMode + { + /// + /// Attempt to repair using the CorruptionRepairer if available, otherwise throw. + /// This is the default mode for commands that modify workloads. + /// + Repair, + + /// + /// Throw a helpful error message suggesting how to fix the issue. + /// Use this for read-only/info commands. + /// + Throw, + + /// + /// Silently ignore missing manifests and continue. + /// Use this for history recording or other scenarios where missing manifests are acceptable. + /// + Ignore + } + /// /// This abstracts out the process of locating and loading a set of manifests to be loaded into a /// workload manifest resolver and resolved into a single coherent model. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs index c3da2743abc3..7329564dd6bf 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/SdkDirectoryWorkloadManifestProvider.cs @@ -6,6 +6,7 @@ using Microsoft.DotNet.Cli; using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.NET.Sdk.Localization; +using Microsoft.DotNet.Cli.Commands; using static Microsoft.NET.Sdk.WorkloadManifestReader.IWorkloadManifestProvider; namespace Microsoft.NET.Sdk.WorkloadManifestReader @@ -31,6 +32,24 @@ public partial class SdkDirectoryWorkloadManifestProvider : IWorkloadManifestPro private bool _useManifestsFromInstallState = true; private bool? _globalJsonSpecifiedWorkloadSets = null; + /// + /// Optional hook that allows the CLI to ensure workload manifests are available (and repaired if necessary) + /// before this provider attempts to enumerate them. + /// + public IWorkloadManifestCorruptionRepairer? CorruptionRepairer { get; set; } + + /// + /// Specifies how this provider should handle corrupt or missing workload manifests. + /// Default is . + /// + public ManifestCorruptionFailureMode CorruptionFailureMode { get; set; } = ManifestCorruptionFailureMode.Repair; + + /// + /// Gets the resolved workload set, if any. This is populated during construction/refresh + /// and does not trigger corruption checking. + /// + public WorkloadSet? ResolvedWorkloadSet => _workloadSet; + // This will be non-null if there is an error loading manifests that should be thrown when they need to be accessed. // We delay throwing the error so that in the case where global.json specifies a workload set that isn't installed, // we can successfully construct a resolver and install that workload set @@ -247,6 +266,19 @@ void ThrowExceptionIfManifestsNotAvailable() public WorkloadVersionInfo GetWorkloadVersion() { + if (CorruptionRepairer != null) + { + CorruptionRepairer.EnsureManifestsHealthy(CorruptionFailureMode); + } + else if (_workloadSet != null && CorruptionFailureMode != ManifestCorruptionFailureMode.Ignore) + { + // No repairer attached - check for missing manifests and throw a helpful error + if (HasMissingManifests(_workloadSet)) + { + throw new InvalidOperationException(string.Format(Strings.WorkloadSetHasMissingManifests, _workloadSet.Version)); + } + } + if (_globalJsonWorkloadSetVersion != null) { // _exceptionToThrow is set to null here if and only if the workload set is not installed. @@ -290,6 +322,18 @@ public WorkloadVersionInfo GetWorkloadVersion() public IEnumerable GetManifests() { + if (CorruptionRepairer != null) + { + CorruptionRepairer.EnsureManifestsHealthy(CorruptionFailureMode); + } + else if (_workloadSet != null && CorruptionFailureMode != ManifestCorruptionFailureMode.Ignore) + { + // No repairer attached - check for missing manifests and throw a helpful error + if (HasMissingManifests(_workloadSet)) + { + throw new InvalidOperationException(string.Format(Strings.WorkloadSetHasMissingManifests, _workloadSet.Version)); + } + } ThrowExceptionIfManifestsNotAvailable(); // Scan manifest directories @@ -363,6 +407,10 @@ void ProbeDirectory(string manifestDirectory, string featureBand) var manifestDirectory = GetManifestDirectoryFromSpecifier(manifestSpecifier); if (manifestDirectory == null) { + if (CorruptionFailureMode == ManifestCorruptionFailureMode.Ignore) + { + continue; + } throw new FileNotFoundException(string.Format(Strings.ManifestFromWorkloadSetNotFound, manifestSpecifier.ToString(), _workloadSet.Version)); } AddManifest(manifestSpecifier.Id.ToString(), manifestDirectory, manifestSpecifier.FeatureBand.ToString(), kvp.Value.Version.ToString()); @@ -380,6 +428,10 @@ void ProbeDirectory(string manifestDirectory, string featureBand) var manifestDirectory = GetManifestDirectoryFromSpecifier(manifestSpecifier); if (manifestDirectory == null) { + if (CorruptionFailureMode == ManifestCorruptionFailureMode.Ignore) + { + continue; + } throw new FileNotFoundException(string.Format(Strings.ManifestFromInstallStateNotFound, manifestSpecifier.ToString(), _installStateFilePath)); } AddManifest(manifestSpecifier.Id.ToString(), manifestDirectory, manifestSpecifier.FeatureBand.ToString(), kvp.Value.Version.ToString()); @@ -510,6 +562,23 @@ void ProbeDirectory(string manifestDirectory, string featureBand) return null; } + /// + /// Checks if the workload set has any manifests that are missing from disk. + /// This checks all manifest roots (including user-local installs). + /// + public bool HasMissingManifests(WorkloadSet workloadSet) + { + foreach (var manifestEntry in workloadSet.ManifestVersions) + { + var manifestSpecifier = new ManifestSpecifier(manifestEntry.Key, manifestEntry.Value.Version, manifestEntry.Value.FeatureBand); + if (GetManifestDirectoryFromSpecifier(manifestSpecifier) == null) + { + return true; + } + } + return false; + } + /// /// Returns installed workload sets that are available for this SDK (ie are in the same feature band) /// @@ -538,7 +607,7 @@ Dictionary GetAvailableWorkloadSetsInternal(SdkFeatureBand? } else { - // Get workload sets for all feature bands + // Get workload sets for all feature bands foreach (var featureBandDirectory in Directory.GetDirectories(manifestRoot)) { AddWorkloadSetsForFeatureBand(availableWorkloadSets, featureBandDirectory); diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx index cf418daa75cb..e583daad115c 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/Strings.resx @@ -1,17 +1,17 @@  - @@ -213,5 +213,9 @@ No manifest with ID {0} exists. + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf index 1891cc4ff30b..e52c35088d8a 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf @@ -142,6 +142,11 @@ Nevyřešený cíl {0} pro přesměrování úlohy {1} v manifestu {2} [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Verze {0} úlohy, která byla zadána v {1}, nebyla nalezena. Spuštěním příkazu dotnet workload restore nainstalujte tuto verzi úlohy. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf index aa35c3838c22..c1b3de9e9b04 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf @@ -142,6 +142,11 @@ Nicht aufgelöstes Ziel „{0}“ für die Workloadumleitung „{1}“ im Manifest „{2}“ [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Die Arbeitsauslastungsversion {0}, die in {1} angegeben wurde, wurde nicht gefunden. Führen Sie „dotnet workload restore“ aus, um diese Workloadversion zu installieren. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf index 485e6e0a0cf8..91127d3307bf 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf @@ -142,6 +142,11 @@ Destino sin resolver '{0}' para redirección de carga de trabajo '{1}' en el manifiesto '{2}' [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. No se encontró la versión de carga de trabajo {0}, que se especificó en {1}. Ejecuta "dotnet workload restore" para instalar esta versión de carga de trabajo. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf index 0ae7f6800bd3..550221d36e00 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf @@ -142,6 +142,11 @@ Cible non résolue « {0} » pour la redirection de charge de travail « {1} » dans le manifeste « {2} » [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. La version de charge de travail {0}, qui a été spécifiée dans {1}, est introuvable. Exécutez « dotnet workload restore » pour installer cette version de charge de travail. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf index 7c666799e412..b2124effaba4 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf @@ -142,6 +142,11 @@ Destinazione non risolta '{0}' per il reindirizzamento del carico di lavoro '{1}' nel manifesto '{2}' [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. La versione del carico di lavoro {0}, specificata in {1}, non è stata trovata. Eseguire "dotnet workload restore" per installare questa versione del carico di lavoro. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf index cc172807eaa9..5254999963fa 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf @@ -142,6 +142,11 @@ マニフェスト '{2}' [{3}] 内のワークロード リダイレクト '{1}' に対する未解決のターゲット '{0}' + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. {1} で指定されたワークロード バージョン {0} が見つかりませんでした。"dotnet workload restore" を実行して、このワークロード バージョンをインストールします。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf index 385531b1c48b..06a3d8b1e20b 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf @@ -142,6 +142,11 @@ 매니페스트 '{2}' [{3}]의 워크로드 리디렉션 '{1}'에 대한 확인되지 않는 대상 '{0}' + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. {1}에 지정된 워크로드 버전 {0}을(를) 찾을 수 없습니다. "dotnet workload restore"을 실행하여 이 워크로드 버전을 설치합니다. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf index 2f5dc549ddf0..2fb7cda88a37 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf @@ -142,6 +142,11 @@ Nierozpoznany element docelowy „{0}” przekierowania obciążenia „{1}” w manifeście „{2}” [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Nie znaleziono wersji obciążenia {0} określonej w kontenerze {1}. Uruchom polecenie „dotnet workload restore”, aby zainstalować tę wersję obciążenia. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf index f5f0331a25ec..19aa8c2b6001 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf @@ -142,6 +142,11 @@ Destino '{0}' não resolvido para o redirecionamento de carga de trabalho '{1}' no manifesto '{2}' [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. A versão da carga de trabalho {0}, especificada em {1}, não foi localizada. Execute "dotnet workload restore" para instalar esta versão da carga de trabalho. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf index bf88a6af7bbe..01bf7048e135 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf @@ -142,6 +142,11 @@ Неразрешенный целевой объект "{0}" для перенаправления рабочей нагрузки "{1}" в манифесте "{2}" [{3}] + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. Версия рабочей нагрузки {0}, указанная в {1}, не найдена. Запустите команду "dotnet workload restore", чтобы установить эту версию рабочей нагрузки. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf index 786f001a3435..15e1e6425967 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf @@ -142,6 +142,11 @@ '{2}' [{3}] bildirimindeki '{1}' iş akışı yeniden yönlendirmesi için '{0}' hedefi çözümlenemedi + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. {1} konumunda belirtilen {0} iş yükü sürümü bulunamadı. Bu iş yükü sürümünü yüklemek için "dotnet workload restore" komutunu çalıştırın. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf index 911a2731d284..5770b450720b 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf @@ -142,6 +142,11 @@ 工作负载未解析的目标“{0}”重定向到清单“{2}”[{3}] 中的“{1}” + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. 找不到在 {1} 中指定的工作负载版本 {0}。运行“dotnet workload restore”以安装此工作负载版本。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf index 423e6216ecca..2435cecf1b39 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf @@ -142,6 +142,11 @@ 資訊清單 '{2}' [{3}] 中工作負載重新導向 '{1}' 的未解析目標 '{0}' + + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + {Locked="dotnet workload repair"} + Workload version {0}, which was specified in {1}, was not found. Run "dotnet workload restore" to install this workload version. 找不到 {1} 中指定的工作負載版本 {0}。執行 "dotnet workload restore" 以安裝此工作負載版本。 diff --git a/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs b/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs index cbb52e8040c1..7ad32c244356 100644 --- a/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs +++ b/test/Microsoft.NET.Sdk.WorkloadManifestReader.Tests/SdkDirectoryWorkloadManifestProviderTests.cs @@ -436,7 +436,7 @@ public void ItThrowsIfManifestFromWorkloadSetIsNotFound() var sdkDirectoryWorkloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(sdkRootPath: _fakeDotnetRootDirectory, sdkVersion: "8.0.200", userProfileDir: null, globalJsonPath: null); - Assert.Throws(() => GetManifestContents(sdkDirectoryWorkloadManifestProvider).ToList()); + Assert.Throws(() => GetManifestContents(sdkDirectoryWorkloadManifestProvider).ToList()); } [Fact] @@ -710,9 +710,9 @@ public void ItFailsIfManifestFromWorkloadSetFromInstallStateIsNotInstalled() var sdkDirectoryWorkloadManifestProvider = new SdkDirectoryWorkloadManifestProvider(sdkRootPath: _fakeDotnetRootDirectory, sdkVersion: "8.0.200", userProfileDir: null, globalJsonPath: null); - var ex = Assert.Throws(() => sdkDirectoryWorkloadManifestProvider.GetManifests().ToList()); + var ex = Assert.Throws(() => sdkDirectoryWorkloadManifestProvider.GetManifests().ToList()); - ex.Message.Should().Be(string.Format(Strings.ManifestFromWorkloadSetNotFound, "ios: 11.0.2/8.0.100", "8.0.201")); + ex.Message.Should().Be(string.Format(Strings.WorkloadSetHasMissingManifests, "8.0.201")); } [Fact] diff --git a/test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs b/test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs new file mode 100644 index 000000000000..e42c4ea223cd --- /dev/null +++ b/test/dotnet.Tests/CommandTests/Workload/Install/CorruptWorkloadSetTestHelper.cs @@ -0,0 +1,114 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using ManifestReaderTests; +using Microsoft.DotNet.Cli.Commands.Workload; +using Microsoft.DotNet.Cli.Commands.Workload.Install; +using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; +using Microsoft.NET.Sdk.WorkloadManifestReader; + +namespace Microsoft.DotNet.Cli.Workload.Install.Tests +{ + /// + /// Test helper for setting up corrupt workload set scenarios. + /// + internal static class CorruptWorkloadSetTestHelper + { + /// + /// Sets up a corrupt workload set scenario where manifests are missing but workload set is configured. + /// This simulates package managers deleting manifests during SDK updates. + /// Returns a real SdkDirectoryWorkloadManifestProvider so the corruption repairer can be attached. + /// + public static (string dotnetRoot, string userProfileDir, MockPackWorkloadInstaller mockInstaller, IWorkloadResolver workloadResolver, SdkDirectoryWorkloadManifestProvider manifestProvider) + SetupCorruptWorkloadSet( + TestAssetsManager testAssetsManager, + bool userLocal, + out string sdkFeatureVersion) + { + var testDirectory = testAssetsManager.CreateTestDirectory(identifier: userLocal ? "userlocal" : "default").Path; + var dotnetRoot = Path.Combine(testDirectory, "dotnet"); + var userProfileDir = Path.Combine(testDirectory, "user-profile"); + sdkFeatureVersion = "6.0.100"; + var workloadSetVersion = "6.0.100"; + + // Create workload set contents JSON for the current (corrupt) version + var workloadSetJson = """ +{ + "xamarin-android-build": "8.4.7/6.0.100", + "xamarin-ios-sdk": "10.0.1/6.0.100" +} +"""; + + // Create workload set contents for the updated version + var workloadSetJsonUpdated = """ +{ + "xamarin-android-build": "8.4.8/6.0.100", + "xamarin-ios-sdk": "10.0.2/6.0.100" +} +"""; + + // Create workload set contents for the mock installer + var workloadSetContents = new Dictionary + { + [workloadSetVersion] = workloadSetJson, + ["6.0.101"] = workloadSetJsonUpdated + }; + + // Set up mock installer with workload set support + // Note: Don't pre-populate installedWorkloads - the test focuses on manifest repair, not workload installation + var mockInstaller = new MockPackWorkloadInstaller( + dotnetDir: dotnetRoot, + installedWorkloads: new List(), + workloadSetContents: workloadSetContents); + + string installRoot = userLocal ? userProfileDir : dotnetRoot; + if (userLocal) + { + WorkloadFileBasedInstall.SetUserLocal(dotnetRoot, sdkFeatureVersion); + } + + // Create install state with workload set version + var installStateDir = Path.Combine(installRoot, "metadata", "workloads", RuntimeInformation.ProcessArchitecture.ToString(), sdkFeatureVersion, "InstallState"); + Directory.CreateDirectory(installStateDir); + var installStatePath = Path.Combine(installStateDir, "default.json"); + var installState = new InstallStateContents + { + UseWorkloadSets = true, + WorkloadVersion = workloadSetVersion, + Manifests = new Dictionary + { + ["xamarin-android-build"] = "8.4.7", + ["xamarin-ios-sdk"] = "10.0.1" + } + }; + File.WriteAllText(installStatePath, installState.ToString()); + + // Create workload set folder so the real provider can find it + var workloadSetsRoot = Path.Combine(dotnetRoot, "sdk-manifests", sdkFeatureVersion, "workloadsets", workloadSetVersion); + Directory.CreateDirectory(workloadSetsRoot); + File.WriteAllText(Path.Combine(workloadSetsRoot, "workloadset.workloadset.json"), workloadSetJson); + + // Create mock manifest directories but WITHOUT manifest files to simulate ruined install + var manifestRoot = Path.Combine(dotnetRoot, "sdk-manifests", sdkFeatureVersion); + var androidManifestDir = Path.Combine(manifestRoot, "xamarin-android-build", "8.4.7"); + var iosManifestDir = Path.Combine(manifestRoot, "xamarin-ios-sdk", "10.0.1"); + Directory.CreateDirectory(androidManifestDir); + Directory.CreateDirectory(iosManifestDir); + + // Verify manifests don't exist (simulating the ruined install) + if (File.Exists(Path.Combine(androidManifestDir, "WorkloadManifest.json")) || + File.Exists(Path.Combine(iosManifestDir, "WorkloadManifest.json"))) + { + throw new InvalidOperationException("Test setup failed: manifest files should not exist"); + } + + // Create a real SdkDirectoryWorkloadManifestProvider + var manifestProvider = new SdkDirectoryWorkloadManifestProvider(dotnetRoot, sdkFeatureVersion, userProfileDir, globalJsonPath: null); + var workloadResolver = WorkloadResolver.Create(manifestProvider, dotnetRoot, sdkFeatureVersion, userProfileDir); + mockInstaller.WorkloadResolver = workloadResolver; + + return (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider); + } + } +} diff --git a/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs b/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs index c1e7354d9d21..9c7bed6b7e9a 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Install/MockPackWorkloadInstaller.cs @@ -139,7 +139,11 @@ public IEnumerable GetWorkloadHistoryRecords(string sdkFe return HistoryRecords; } - public void RepairWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, DirectoryPath? offlineCache = null) => throw new NotImplementedException(); + public void RepairWorkloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, DirectoryPath? offlineCache = null) + { + // Repair is essentially a reinstall of existing workloads + CliTransaction.RunNew(context => InstallWorkloads(workloadIds, sdkFeatureBand, context, offlineCache)); + } public void GarbageCollect(Func getResolverForWorkloadSet, DirectoryPath? offlineCache = null, bool cleanAllPacks = false) { @@ -160,6 +164,28 @@ public IWorkloadInstallationRecordRepository GetWorkloadInstallationRecordReposi public void InstallWorkloadManifest(ManifestVersionUpdate manifestUpdate, ITransactionContext transactionContext, DirectoryPath? offlineCache = null) { InstalledManifests.Add((manifestUpdate, offlineCache)); + + // Also create the actual manifest file on disk so that SdkDirectoryWorkloadManifestProvider can find it + if (_dotnetDir != null) + { + var manifestDir = Path.Combine(_dotnetDir, "sdk-manifests", manifestUpdate.NewFeatureBand, + manifestUpdate.ManifestId.ToString(), manifestUpdate.NewVersion.ToString()); + Directory.CreateDirectory(manifestDir); + + var manifestPath = Path.Combine(manifestDir, "WorkloadManifest.json"); + if (!File.Exists(manifestPath)) + { + // Write a minimal manifest file + string manifestContents = $$""" +{ + "version": "{{manifestUpdate.NewVersion}}", + "workloads": {}, + "packs": {} +} +"""; + File.WriteAllText(manifestPath, manifestContents); + } + } } public IEnumerable GetDownloads(IEnumerable workloadIds, SdkFeatureBand sdkFeatureBand, bool includeInstalledItems) diff --git a/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs b/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs index 4dc46351eae2..6d6d89fb7149 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs @@ -1,17 +1,18 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -#nullable disable - using System.CommandLine; using System.Text.Json; using ManifestReaderTests; using Microsoft.DotNet.Cli.Commands; +using Microsoft.DotNet.Cli.Commands.Workload; using Microsoft.DotNet.Cli.Commands.Workload.Install; using Microsoft.DotNet.Cli.Commands.Workload.Repair; using Microsoft.DotNet.Cli.NuGetPackageDownloader; +using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Workload.Install.Tests; using Microsoft.NET.Sdk.WorkloadManifestReader; +using static Microsoft.NET.Sdk.WorkloadManifestReader.IWorkloadManifestProvider; namespace Microsoft.DotNet.Cli.Workload.Repair.Tests { @@ -85,7 +86,7 @@ public void GivenExtraPacksInstalledRepairGarbageCollects(bool userLocal) // Add extra pack dirs and records var extraPackRecordPath = Path.Combine(installRoot, "metadata", "workloads", "InstalledPacks", "v1", "Test.Pack.A", "1.0.0", sdkFeatureVersion); - Directory.CreateDirectory(Path.GetDirectoryName(extraPackRecordPath)); + Directory.CreateDirectory(Path.GetDirectoryName(extraPackRecordPath)!); var extraPackPath = Path.Combine(installRoot, "packs", "Test.Pack.A", "1.0.0"); Directory.CreateDirectory(extraPackPath); var packRecordContents = JsonSerializer.Serialize(new(new WorkloadPackId("Test.Pack.A"), "1.0.0", WorkloadPackKind.Sdk, extraPackPath, "Test.Pack.A")); @@ -151,5 +152,43 @@ public void GivenMissingPacksRepairFixesInstall(bool userLocal) Directory.GetDirectories(Path.Combine(installRoot, "packs")).Length.Should().Be(7); Directory.GetDirectories(Path.Combine(installRoot, "metadata", "workloads", "InstalledPacks", "v1")).Length.Should().Be(8); } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public void GivenMissingManifestsInWorkloadSetModeRepairReinstallsManifests(bool userLocal) + { + var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) = + CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(_testAssetsManager, userLocal, out string sdkFeatureVersion); + + mockInstaller.InstalledManifests.Should().HaveCount(0); + + var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, sdkFeatureVersion, workloadResolver, userProfileDir); + + // Attach the corruption repairer to the manifest provider + var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot, manifestDownload: true); + var corruptionRepairer = new WorkloadManifestCorruptionRepairer( + _reporter, + mockInstaller, + workloadResolver, + new SdkFeatureBand(sdkFeatureVersion), + dotnetRoot, + userProfileDir, + nugetDownloader, + packageSourceLocation: null, + VerbosityOptions.detailed); + manifestProvider.CorruptionRepairer = corruptionRepairer; + + // Directly trigger the manifest health check and repair + corruptionRepairer.EnsureManifestsHealthy(ManifestCorruptionFailureMode.Repair); + + // Verify that manifests were installed by the corruption repairer + mockInstaller.InstalledManifests.Should().HaveCount(2, "Manifests should be installed after EnsureManifestsHealthy call"); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-android-build"); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-ios-sdk"); + + // Verify the repair process was triggered (the corruption repairer shows this message) + _reporter.Lines.Should().Contain(line => line.Contains("Repairing workload set")); + } } } diff --git a/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs b/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs index 301293b0141f..76b0c8453e00 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Restore/GivenDotnetWorkloadRestore.cs @@ -15,7 +15,7 @@ public GivenDotnetWorkloadRestore(ITestOutputHelper log) : base(log) [Fact] public void ProjectsThatDoNotSupportWorkloadsAreNotInspected() { - if(IsRunningInContainer()) + if (IsRunningInContainer()) { // Skipping test in a Helix container environment due to read-only DOTNET_ROOT, which causes workload restore to fail when writing workload metadata. return; @@ -38,7 +38,7 @@ public void ProjectsThatDoNotSupportWorkloadsAreNotInspected() [Fact] public void ProjectsThatDoNotSupportWorkloadsAndAreTransitivelyReferencedDoNotBreakTheBuild() { - if(IsRunningInContainer()) + if (IsRunningInContainer()) { // Skipping test in a Helix container environment due to read-only DOTNET_ROOT, which causes workload restore to fail when writing workload metadata. return; diff --git a/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs b/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs index ca5c48b55f71..52f0dc4f56cd 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Search/MockWorkloadResolver.cs @@ -3,6 +3,7 @@ #nullable disable +using System.Reflection.Metadata.Ecma335; using Microsoft.NET.Sdk.WorkloadManifestReader; namespace Microsoft.DotNet.Cli.Workload.Search.Tests @@ -14,19 +15,22 @@ public class MockWorkloadResolver : IWorkloadResolver private readonly Func> _getPacksInWorkload; private readonly Func _getPackInfo; private readonly Func _getManifest; + private readonly IWorkloadManifestProvider _manifestProvider; public MockWorkloadResolver( IEnumerable availableWorkloads, IEnumerable installedManifests = null, Func> getPacks = null, Func getPackInfo = null, - Func getManifest = null) + Func getManifest = null, + IWorkloadManifestProvider manifestProvider = null) { _availableWorkloads = availableWorkloads; _installedManifests = installedManifests; _getPacksInWorkload = getPacks; _getPackInfo = getPackInfo; _getManifest = getManifest; + _manifestProvider = manifestProvider; } public IEnumerable GetAvailableWorkloads() => _availableWorkloads; @@ -48,6 +52,6 @@ public void RefreshWorkloadManifests() { /* noop */ } public IEnumerable GetUpdatedWorkloads(WorkloadResolver advertisingManifestResolver, IEnumerable installedWorkloads) => throw new NotImplementedException(); WorkloadResolver IWorkloadResolver.CreateOverlayResolver(IWorkloadManifestProvider overlayManifestProvider) => throw new NotImplementedException(); WorkloadManifest IWorkloadResolver.GetManifestFromWorkload(WorkloadId workloadId) => _getManifest?.Invoke(workloadId) ?? throw new NotImplementedException(); - public IWorkloadManifestProvider GetWorkloadManifestProvider() => throw new NotImplementedException(); + public IWorkloadManifestProvider GetWorkloadManifestProvider() => _manifestProvider ?? throw new NotImplementedException(); } } diff --git a/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs b/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs index 3f0a820e801d..ad9d1f77b290 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs @@ -67,13 +67,15 @@ public void GivenWorkloadUpdateFromHistory() IEnumerable installedManifests = new List() { new WorkloadManifestInfo("microsoft.net.sdk.android", "34.0.0-rc.1", "androidDirectory", "8.0.100-rc.1"), new WorkloadManifestInfo("microsoft.net.sdk.ios", "16.4.8825", "iosDirectory", "8.0.100-rc.1") }; + var manifestProvider = new MockManifestProvider(Array.Empty()) { SdkFeatureBand = new SdkFeatureBand("8.0.100-rc.1") }; var workloadResolver = new MockWorkloadResolver( new string[] { "maui-android", "maui-ios" }.Select(s => new WorkloadInfo(new WorkloadId(s), null)), installedManifests, id => new List() { new WorkloadPackId(id.ToString() + "-pack") }, id => id.ToString().Contains("android") ? mauiAndroidPack : - id.ToString().Contains("ios") ? mauiIosPack : null); + id.ToString().Contains("ios") ? mauiIosPack : null, + manifestProvider: manifestProvider); IWorkloadResolverFactory mockResolverFactory = new MockWorkloadResolverFactory( Path.Combine(Path.GetTempPath(), "dotnetTestPath"), @@ -304,7 +306,8 @@ public void UpdateViaWorkloadSet(bool upgrade, bool? installStateUseWorkloadSet, } "; var nugetPackageDownloader = new MockNuGetPackageDownloader(); - var workloadResolver = new MockWorkloadResolver([new WorkloadInfo(new WorkloadId("android"), string.Empty)], getPacks: id => [], installedManifests: []); + var manifestProvider = new MockManifestProvider(Array.Empty()) { SdkFeatureBand = new SdkFeatureBand(sdkVersion) }; + var workloadResolver = new MockWorkloadResolver([new WorkloadInfo(new WorkloadId("android"), string.Empty)], getPacks: id => [], installedManifests: [], manifestProvider: manifestProvider); var workloadInstaller = new MockPackWorkloadInstaller( dotnetDir, installedWorkloads: [new WorkloadId("android")], @@ -375,13 +378,16 @@ public void GivenWorkloadUpdateItFindsGreatestWorkloadSetWithSpecifiedComponents WorkloadManifest iosManifest = WorkloadManifest.CreateForTests("Microsoft.NET.Sdk.iOS"); WorkloadManifest macosManifest = WorkloadManifest.CreateForTests("Microsoft.NET.Sdk.macOS"); WorkloadManifest mauiManifest = WorkloadManifest.CreateForTests("Microsoft.NET.Sdk.Maui"); + var manifestProvider = new MockManifestProvider(Array.Empty()) { SdkFeatureBand = new SdkFeatureBand("9.0.100") }; + MockWorkloadResolver resolver = new([new WorkloadInfo(new WorkloadId("ios"), ""), new WorkloadInfo(new WorkloadId("macos"), ""), new WorkloadInfo(new WorkloadId("maui"), "")], installedManifests: [ new WorkloadManifestInfo("Microsoft.NET.Sdk.iOS", "17.4.3", Path.Combine(testDirectory, "iosManifest"), "9.0.100"), new WorkloadManifestInfo("Microsoft.NET.Sdk.macOS", "14.4.3", Path.Combine(testDirectory, "macosManifest"), "9.0.100"), new WorkloadManifestInfo("Microsoft.NET.Sdk.Maui", "14.4.3", Path.Combine(testDirectory, "mauiManifest"), "9.0.100") ], - getManifest: id => id.ToString().Equals("ios") ? iosManifest : id.ToString().Equals("macos") ? macosManifest : mauiManifest); + getManifest: id => id.ToString().Equals("ios") ? iosManifest : id.ToString().Equals("macos") ? macosManifest : mauiManifest, + manifestProvider: manifestProvider); MockNuGetPackageDownloader nugetPackageDownloader = new(packageVersions: [new NuGetVersion("9.103.0"), new NuGetVersion("9.102.0"), new NuGetVersion("9.101.0"), new NuGetVersion("9.100.0")]); WorkloadUpdateCommand command = new( parseResult, @@ -654,5 +660,55 @@ public void GivenInvalidVersionInRollbackFileItErrors() return (dotnetRoot, installManager, installer, workloadResolver, manifestUpdater, nugetDownloader, workloadResolverFactory); } + + [Theory] + [InlineData(true)] + [InlineData(false)] + public void GivenMissingManifestsInWorkloadSetModeUpdateReinstallsManifests(bool userLocal) + { + var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) = + CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(_testAssetsManager, userLocal, out string sdkFeatureVersion); + + mockInstaller.InstalledManifests.Should().HaveCount(0); + + var workloadResolverFactory = new MockWorkloadResolverFactory(dotnetRoot, sdkFeatureVersion, workloadResolver, userProfileDir); + + // Attach the corruption repairer to the manifest provider + var nugetDownloader = new MockNuGetPackageDownloader(dotnetRoot, manifestDownload: true); + manifestProvider.CorruptionRepairer = new WorkloadManifestCorruptionRepairer( + _reporter, + mockInstaller, + workloadResolver, + new SdkFeatureBand(sdkFeatureVersion), + dotnetRoot, + userProfileDir, + nugetDownloader, + packageSourceLocation: null, + VerbosityOptions.detailed); + + // Advertise a NEWER workload set version than what's currently installed (6.0.100) + // so that the update command proceeds with manifest installation + var workloadManifestUpdater = new MockWorkloadManifestUpdater( + manifestUpdates: [ + new ManifestUpdateWithWorkloads(new ManifestVersionUpdate(new ManifestId("xamarin-android-build"), new ManifestVersion("8.4.8"), "6.0.100"), Enumerable.Empty>().ToDictionary()), + new ManifestUpdateWithWorkloads(new ManifestVersionUpdate(new ManifestId("xamarin-ios-sdk"), new ManifestVersion("10.0.2"), "6.0.100"), Enumerable.Empty>().ToDictionary()) + ], + fromWorkloadSet: true, workloadSetVersion: "6.0.101"); + + var parseResult = Parser.Parse(new string[] { "dotnet", "workload", "update" }); + + // Run update command + var updateCommand = new WorkloadUpdateCommand(parseResult, reporter: _reporter, workloadResolverFactory, + workloadInstaller: mockInstaller, workloadManifestUpdater: workloadManifestUpdater); + updateCommand.Execute(); + + // Verify that manifests were reinstalled + mockInstaller.InstalledManifests.Should().HaveCount(2); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-android-build"); + mockInstaller.InstalledManifests.Should().Contain(m => m.manifestUpdate.ManifestId.ToString() == "xamarin-ios-sdk"); + + // Verify command succeeded + _reporter.Lines.Should().NotContain(line => line.Contains("failed", StringComparison.OrdinalIgnoreCase)); + } } } From 977b709cec8294e331e2cbc77c94ab7b1c2bf3f7 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 27 Jan 2026 14:27:06 -0800 Subject: [PATCH 205/280] Add back the stable feed for now to get the build while we figure out where these should get published to --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index f3f728c95515..ff0d29fb990d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -39,6 +40,7 @@ + From 0ce4bc8790c65d93a2762837850b9a6f35935fa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jan 2026 00:35:01 +0000 Subject: [PATCH 206/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7ab59db215a..cc20a9a3c554 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fb5a4dc8b4b1..ac849c3fa358 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.0-preview.26077.101 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.0-preview.26077.113 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26077-101 - 7.0.2-rc.7801 + 18.0.11-servicing-26077-113 + 7.0.2-rc.7813 10.0.104 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 10.0.0-preview.26077.101 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 2.0.0-preview.1.26077.101 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 10.0.0-preview.26077.113 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 2.0.0-preview.1.26077.113 2.2.4 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 10.0.4 10.0.4 - 10.0.4-servicing.26077.101 - 10.0.4-servicing.26077.101 - 10.0.0-beta.26077.101 - 10.0.0-beta.26077.101 + 10.0.4-servicing.26077.113 + 10.0.4-servicing.26077.113 + 10.0.0-beta.26077.113 + 10.0.0-beta.26077.113 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26077.101 + 14.0.104-servicing.26077.113 10.0.4 - 5.0.0-2.26077.101 - 5.0.0-2.26077.101 - 10.0.4-servicing.26077.101 + 5.0.0-2.26077.113 + 5.0.0-2.26077.113 + 10.0.4-servicing.26077.113 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.101 - 10.0.4-servicing.26077.101 - 18.0.1-release-26077-101 + 10.0.0-preview.26077.113 + 10.0.4-servicing.26077.113 + 18.0.1-release-26077-113 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26077.101 + 10.0.104-servicing.26077.113 10.0.104 - 10.0.104-servicing.26077.101 + 10.0.104-servicing.26077.113 10.0.104 10.0.104 - 10.0.104-servicing.26077.101 - 18.0.1-release-26077-101 - 18.0.1-release-26077-101 + 10.0.104-servicing.26077.113 + 18.0.1-release-26077-113 + 18.0.1-release-26077-113 3.2.4 10.0.4 - 10.0.4-servicing.26077.101 + 10.0.4-servicing.26077.113 10.0.4 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 - 7.0.2-rc.7801 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 + 7.0.2-rc.7813 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99effa0a3a8a..02c43a3ebdf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - dba294732355bec25d827f6dc0b473dea45164d4 + 74dc6e4ed64cc0255a6be520761a857dda273863 diff --git a/global.json b/global.json index aebbf7f47142..b3a77f359c1d 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 67f18be05c0db60c831a2ea80adb77d7224e4dcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jan 2026 02:01:46 +0000 Subject: [PATCH 207/280] Update dependencies from https://github.com/microsoft/testfx build 20260127.6 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26077.6 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26077.6 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 40ab7f694211..ac420200acbc 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26076.1 - 4.1.0-preview.26076.1 + 2.1.0-preview.26077.6 + 4.1.0-preview.26077.6 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9272ef1a061e..9781da92254e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/microsoft/testfx - ad5aef4225e69edc95ff94eb6fc609d904038af0 + ccdb0ee122177251ae18655264e94312d63c4d45 - + https://github.com/microsoft/testfx - ad5aef4225e69edc95ff94eb6fc609d904038af0 + ccdb0ee122177251ae18655264e94312d63c4d45 https://github.com/dotnet/dotnet From 118c83a98238d1761f871a75464f70e3f37129f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jan 2026 02:02:36 +0000 Subject: [PATCH 208/280] Update dependencies from https://github.com/microsoft/testfx build 20260127.6 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26077.6 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26077.6 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8821df165464..465193f5ce6d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26076.1 - 4.1.0-preview.26076.1 + 2.1.0-preview.26077.6 + 4.1.0-preview.26077.6 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3283cec3945..dfeaa5760da4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - ad5aef4225e69edc95ff94eb6fc609d904038af0 + ccdb0ee122177251ae18655264e94312d63c4d45 - + https://github.com/microsoft/testfx - ad5aef4225e69edc95ff94eb6fc609d904038af0 + ccdb0ee122177251ae18655264e94312d63c4d45 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 61d729a1933212c1ce05b50d8211445823bf822a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 05:41:49 +0000 Subject: [PATCH 209/280] [release/10.0.1xx] ProcessFrameworkReferences: use portable ILCompiler when RuntimeIdentifier is null. (#52485) Co-authored-by: Tom Deseyn Co-authored-by: SimonZhao888 <133954995+SimonZhao888@users.noreply.github.com> Co-authored-by: DonnaChen888 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Marc Paine --- .../ProcessFrameworkReferencesTests.cs | 72 +++++++++++++++++++ .../ProcessFrameworkReferences.cs | 8 ++- 2 files changed, 77 insertions(+), 3 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs index 50b1b9c8df00..e4f298db6844 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks.UnitTests/ProcessFrameworkReferencesTests.cs @@ -76,6 +76,30 @@ public class ProcessFrameworkReferencesTests } """; + private const string NonPortableRid = "fedora.42-x64"; + + private static readonly string NonPortableRuntimeGraph = $$""" + { + "runtimes": { + "base": { + "#import": [] + }, + "any": { + "#import": ["base"] + }, + "linux": { + "#import": ["any"] + }, + "linux-x64": { + "#import": ["linux"] + }, + "{{NonPortableRid}}": { + "#import": ["linux-x64"] + } + } + } + """; + // Shared known framework references private readonly MockTaskItem _validWindowsSDKKnownFrameworkReference = CreateKnownFrameworkReference( "Microsoft.Windows.SDK.NET.Ref", "net5.0-windows10.0.18362", "10.0.18362.1-preview", @@ -491,6 +515,7 @@ public void It_handles_real_world_ridless_scenario_with_aot_and_trimming() ["TargetFramework"] = "net10.0", ["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler", ["ILCompilerPackVersion"] = "10.0.0-rc.2.25457.102", + ["ILCompilerPortableRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64", ["ILCompilerRuntimeIdentifiers"] = "osx-x64;osx-arm64;win-x64;linux-x64" }); @@ -766,5 +791,52 @@ public void It_handles_complex_cross_compilation_RuntimeIdentifiers() $"Should include runtime pack for supported RID: {rid}"); } } + + [Theory] + [InlineData(null, "linux-x64")] + [InlineData("linux-x64", "linux-x64")] + [InlineData(NonPortableRid, NonPortableRid)] + public void It_selects_correct_ILCompiler_based_on_RuntimeIdentifier(string? runtimeIdentifier, string expectedILCompilerRid) + { + var netCoreAppRef = CreateKnownFrameworkReference("Microsoft.NETCore.App", "net10.0", "10.0.1", + "Microsoft.NETCore.App.Runtime.**RID**", + "linux-x64;" + NonPortableRid); + + var ilCompilerPack = new MockTaskItem("Microsoft.DotNet.ILCompiler", new Dictionary + { + ["TargetFramework"] = "net10.0", + ["ILCompilerPackNamePattern"] = "runtime.**RID**.Microsoft.DotNet.ILCompiler", + ["ILCompilerPackVersion"] = "10.0.1", + ["ILCompilerPortableRuntimeIdentifiers"] = "linux-x64", + ["ILCompilerRuntimeIdentifiers"] = "linux-x64;" + NonPortableRid + }); + + var config = new TaskConfiguration + { + TargetFrameworkVersion = "10.0", + EnableRuntimePackDownload = true, + PublishAot = true, + NETCoreSdkRuntimeIdentifier = NonPortableRid, + NETCoreSdkPortableRuntimeIdentifier = "linux-x64", + RuntimeIdentifier = runtimeIdentifier, + RuntimeGraphPath = CreateRuntimeGraphFile(NonPortableRuntimeGraph), + FrameworkReferences = new[] { new MockTaskItem("Microsoft.NETCore.App", new Dictionary()) }, + KnownFrameworkReferences = new[] { netCoreAppRef }, + KnownILCompilerPacks = new[] { ilCompilerPack } + }; + + var task = CreateTask(config); + task.Execute().Should().BeTrue("Task should succeed"); + + // Validate that the expected ILCompiler pack is used + task.PackagesToDownload.Should().NotBeNull(); + task.PackagesToDownload.Should().Contain(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler"), + "Should include ILCompiler pack when PublishAot is true"); + + var ilCompilerPackage = task.PackagesToDownload.FirstOrDefault(p => p.ItemSpec.Contains("Microsoft.DotNet.ILCompiler")); + ilCompilerPackage.Should().NotBeNull(); + ilCompilerPackage!.ItemSpec.Should().Contain(expectedILCompilerRid, + $"Should use {expectedILCompilerRid} ILCompiler pack"); + } } } diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs index 7b5b7bc0da15..fcc306fd454c 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs +++ b/src/Tasks/Microsoft.NET.Build.Tasks/ProcessFrameworkReferences.cs @@ -816,8 +816,10 @@ private ToolPackSupport AddToolPack( if (toolPackType is ToolPackType.Crossgen2 or ToolPackType.ILCompiler) { var packNamePattern = knownPack.GetMetadata(packName + "PackNamePattern"); - var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(';'); - var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(';'); + var packSupportedRuntimeIdentifiers = knownPack.GetMetadata(packName + "RuntimeIdentifiers").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + var packSupportedPortableRuntimeIdentifiers = knownPack.GetMetadata(packName + "PortableRuntimeIdentifiers").Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries); + // Use the non-portable RIDs if there are no portable RIDs defined. + packSupportedPortableRuntimeIdentifiers = packSupportedPortableRuntimeIdentifiers.Length > 0 ? packSupportedPortableRuntimeIdentifiers : packSupportedRuntimeIdentifiers; // When publishing for a non-portable RID, prefer NETCoreSdkRuntimeIdentifier for the host. // Otherwise prefer the NETCoreSdkPortableRuntimeIdentifier. @@ -835,11 +837,11 @@ private ToolPackSupport AddToolPack( string? supportedPortableTargetRid = NuGetUtils.GetBestMatchingRid(runtimeGraph, runtimeIdentifier, packSupportedPortableRuntimeIdentifiers, out _); bool usePortable = !string.IsNullOrEmpty(NETCoreSdkPortableRuntimeIdentifier) - && supportedTargetRid is not null && supportedPortableTargetRid is not null && supportedTargetRid == supportedPortableTargetRid; // Get the best RID for the host machine, which will be used to validate that we can run crossgen for the target platform and architecture Log.LogMessage(MessageImportance.Low, $"Determining best RID for '{knownPack.ItemSpec}@{packVersion}' from among '{knownPack.GetMetadata(packName + "RuntimeIdentifiers")}'"); + string? hostRuntimeIdentifier = usePortable ? NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkPortableRuntimeIdentifier!, packSupportedPortableRuntimeIdentifiers, out _) : NuGetUtils.GetBestMatchingRid(runtimeGraph, NETCoreSdkRuntimeIdentifier!, packSupportedRuntimeIdentifiers, out _); From 0f87898a33e582e73946cc3faa6b01087f107534 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:35:53 +0000 Subject: [PATCH 210/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 368 +++++----- eng/Version.Details.xml | 677 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +- global.json | 6 +- 9 files changed, 539 insertions(+), 538 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc20a9a3c554..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ac849c3fa358..152bf4a7708c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,139 +6,141 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-preview.26077.113 - 10.0.4 - 10.0.4 - 18.0.11 - 18.0.11-servicing-26077-113 - 7.0.2-rc.7813 - 10.0.104 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.0-preview.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 2.0.0-preview.1.26077.113 - 2.2.4 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 14.0.104-servicing.26077.113 - 10.0.4 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 10.0.200-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-preview.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 10.0.0-beta.26072.101 + 15.2.100-alpha.26072.101 + 5.3.0-2.26072.101 + 5.3.0-2.26072.101 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.113 - 10.0.4-servicing.26077.113 - 18.0.1-release-26077-113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 18.0.1-release-26077-113 - 18.0.1-release-26077-113 - 3.2.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 10.0.4 - 2.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 + 10.0.0-preview.26072.101 + 18.3.0-release-26072-101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.200-alpha.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 10.0.300-preview.26072.101 + 18.3.0-release-26072-101 + 18.3.0-release-26072-101 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + 7.3.0-preview.1.7301 + + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 @@ -148,31 +150,7 @@ This file should be imported by eng/Versions.props - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -183,46 +161,25 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) - $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -239,10 +196,6 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -259,6 +212,57 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02c43a3ebdf6..86e972a9b013 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + a23ce1be2419c25ca93d10463461b1e506c15828 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -569,9 +572,9 @@ https://github.com/microsoft/testfx 6adab94760f7b10b6aaca1b4fd04543d9e539242 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad03..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: Azure-Linux-3-Amd64 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index b3a77f359c1d..79e3450feaac 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26072.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26072.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 92f957cb164b14018793729a5304f0ab8fe9b563 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:46:51 +0000 Subject: [PATCH 211/280] [release/10.0.1xx] Fix -extra container variant check to support .NET 9+ (#52597) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> Co-authored-by: mthalman <15789599+mthalman@users.noreply.github.com> Co-authored-by: DonnaChen888 --- .../Tasks/ComputeDotnetBaseImageAndTag.cs | 4 +- .../TargetsTests.cs | 47 ++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs index 92cd3f5a5c85..69ced08eae1e 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs @@ -130,7 +130,7 @@ private bool TargetRuntimeIdentiriersAreValid() { if (muslRidsCount == TargetRuntimeIdentifiers.Length) { - IsMuslRid = true; + IsMuslRid = true; } else { @@ -191,7 +191,7 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, && !UsesInvariantGlobalization && versionAllowsUsingAOTAndExtrasImages // the extras only became available on the stable tags of the FirstVersionWithNewTaggingScheme - && (!parsedVersion.IsPrerelease && parsedVersion.Major == FirstVersionWithNewTaggingScheme)) + && (!parsedVersion.IsPrerelease && parsedVersion.Major >= FirstVersionWithNewTaggingScheme)) { Log.LogMessage("Using extra variant because the application needs globalization"); tag += "-extra"; diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index d0cb12539451..2c6b80ace493 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -26,7 +26,7 @@ public void CanDeferContainerAppCommand( }, projectName: $"{nameof(CanDeferContainerAppCommand)}_{prop}_{value}_{string.Join("_", expectedAppCommandArgs)}"); using var _ = d; var instance = project.CreateProjectInstance(ProjectInstanceSettings.None); - instance.Build([ ComputeContainerConfig ], []); + instance.Build([ComputeContainerConfig], []); var computedAppCommand = instance.GetItems(ContainerAppCommand).Select(i => i.EvaluatedInclude); // The test was not testing anything previously, as the list returned was zero length, @@ -614,6 +614,51 @@ public void AOTAppsLessThan8WithCulturesDoNotGetExtraImages(string rid, string e computedBaseImageTag.Should().BeEquivalentTo(expectedImage); } + [InlineData("8.0.100", "v8.0", "jammy-chiseled", "mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled-extra")] + [InlineData("9.0.100", "v9.0", "noble-chiseled", "mcr.microsoft.com/dotnet/runtime:9.0-noble-chiseled-extra")] + [InlineData("10.0.100", "v10.0", "noble-chiseled", "mcr.microsoft.com/dotnet/runtime:10.0-noble-chiseled-extra")] + [Theory] + public void FDDConsoleAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater(string sdkVersion, string tfm, string containerFamily, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = sdkVersion, + ["TargetFrameworkVersion"] = tfm, + [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64", + [KnownStrings.Properties.ContainerFamily] = containerFamily, + [KnownStrings.Properties.InvariantGlobalization] = false.ToString(), + }, projectName: $"{nameof(FDDConsoleAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater)}_{sdkVersion}_{tfm}_{containerFamily}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + [InlineData("8.0.100", "v8.0", "jammy-chiseled", "mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-extra")] + [InlineData("9.0.100", "v9.0", "noble-chiseled", "mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled-extra")] + [InlineData("10.0.100", "v10.0", "noble-chiseled", "mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-extra")] + [Theory] + public void FDDAspNetAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater(string sdkVersion, string tfm, string containerFamily, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = sdkVersion, + ["TargetFrameworkVersion"] = tfm, + [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64", + [KnownStrings.Properties.ContainerFamily] = containerFamily, + [KnownStrings.Properties.InvariantGlobalization] = false.ToString(), + }, bonusItems: new() + { + [KnownStrings.Items.FrameworkReference] = KnownFrameworkReferences.WebApp + }, projectName: $"{nameof(FDDAspNetAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater)}_{sdkVersion}_{tfm}_{containerFamily}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + [Fact] public void AspNetFDDAppsGetAspNetBaseImage() { From 5afb212053f385d34652db71fa1fbdef8b32ec8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jan 2026 08:38:28 +0000 Subject: [PATCH 212/280] Update dependencies --- NuGet.config | 2 - eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 187 insertions(+), 189 deletions(-) diff --git a/NuGet.config b/NuGet.config index ff0d29fb990d..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -40,7 +39,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a159b5a12b21..e23ffeeeac55 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26073.109 - 18.3.0-release-26073-109 - 18.3.0-release-26073-109 - 7.3.0-preview.1.7409 - 10.0.200-alpha.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 10.0.0-preview.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 10.0.0-beta.26073.109 - 15.2.100-alpha.26073.109 - 5.3.0-2.26073.109 - 5.3.0-2.26073.109 + 10.0.0-preview.26077.126 + 18.3.0-release-26077-126 + 18.3.0-release-26077-126 + 7.3.0-preview.1.7826 + 10.0.200-alpha.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 10.0.0-preview.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 15.2.200-servicing.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 10.0.0-preview.7.25377.103 - 10.0.0-preview.26073.109 - 18.3.0-release-26073-109 - 10.0.200-alpha.26073.109 - 10.0.200-alpha.26073.109 - 10.0.200-alpha.26073.109 - 10.0.200-alpha.26073.109 - 10.0.200-alpha.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 10.0.300-preview.26073.109 - 18.3.0-release-26073-109 - 18.3.0-release-26073-109 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 - 7.3.0-preview.1.7409 + 10.0.0-preview.26077.126 + 18.3.0-release-26077-126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 18.3.0-release-26077-126 + 18.3.0-release-26077-126 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a131b4c00b2..39df5740189d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 1966e459956c1e4fb9a3714e3c5a7b5e42c15585 + 2047768c55865642b1b930bbc6e1260825ace624 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index f16e51212227..4ab2f787b6d0 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.101", + "dotnet": "10.0.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26073.109", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26073.109", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.126", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.126", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From e22ccd47a117e6928eaf956d12c49e624fef0c59 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 28 Jan 2026 22:04:19 +0000 Subject: [PATCH 213/280] Initial plan From 8d942c24e2885e8cf077e71a3ab13d408f8b6f98 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 28 Jan 2026 22:10:13 +0000 Subject: [PATCH 214/280] Update locBranch to release/10.0.3xx Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5520cb455b24..68fae266e887 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -104,7 +104,7 @@ extends: publishTaskPrefix: 1ES. populateInternalRuntimeVariables: true runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) - locBranch: release/10.0.2xx + locBranch: release/10.0.3xx # WORKAROUND: BinSkim requires the folder exist prior to scanning. preSteps: - powershell: New-Item -ItemType Directory -Path $(Build.SourcesDirectory)/artifacts/bin -Force From 687cc8f7ad0859837bdc216b616512e4af31f85c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 02:01:59 +0000 Subject: [PATCH 215/280] Update dependencies from https://github.com/microsoft/testfx build 20260128.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26077.6 -> To Version 2.1.0-preview.26078.2 MSTest From Version 4.1.0-preview.26077.6 -> To Version 4.1.0-preview.26078.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b5b02eaee1cd..907a95db55d0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26077.6 - 4.1.0-preview.26077.6 + 2.1.0-preview.26078.2 + 4.1.0-preview.26078.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff0968dbea1a..844c4cc1f366 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/microsoft/testfx - ccdb0ee122177251ae18655264e94312d63c4d45 + 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 - + https://github.com/microsoft/testfx - ccdb0ee122177251ae18655264e94312d63c4d45 + 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 https://github.com/dotnet/dotnet From 5c04de6f87dd8f4f4dcf32777af8066e1d9f2e1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 02:02:49 +0000 Subject: [PATCH 216/280] Update dependencies from https://github.com/microsoft/testfx build 20260128.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26077.6 -> To Version 2.1.0-preview.26078.2 MSTest From Version 4.1.0-preview.26077.6 -> To Version 4.1.0-preview.26078.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f7ff07db3842..c3681c8de855 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26077.6 - 4.1.0-preview.26077.6 + 2.1.0-preview.26078.2 + 4.1.0-preview.26078.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d03b1d0e642..4a962fb10997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - ccdb0ee122177251ae18655264e94312d63c4d45 + 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 - + https://github.com/microsoft/testfx - ccdb0ee122177251ae18655264e94312d63c4d45 + 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 66fc07e6227014b14c9840f1f05eeb3532164a8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 03:20:38 +0000 Subject: [PATCH 217/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc20a9a3c554..846b58bc758f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b5b02eaee1cd..f9410b37c55a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 + 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.101 10.0.4 - 10.0.4-servicing.26077.113 + 10.0.4-servicing.26078.101 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26077.113 + 10.0.4-servicing.26078.101 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26077.113 + 10.0.4-servicing.26078.101 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-preview.26077.113 + 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.101 + 10.0.0-preview.26078.101 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26077-113 - 7.0.2-rc.7813 + 18.0.11-servicing-26078-101 + 7.0.2-rc.7901 10.0.104 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.0-preview.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 2.0.0-preview.1.26077.113 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 10.0.0-preview.26078.101 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 2.0.0-preview.1.26078.101 2.2.4 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 + 10.0.0-beta.26078.101 + 10.0.0-beta.26078.101 + 10.0.0-beta.26078.101 + 10.0.0-beta.26078.101 + 10.0.0-beta.26078.101 + 10.0.0-beta.26078.101 10.0.4 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 + 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.101 + 10.0.0-beta.26078.101 + 10.0.0-beta.26078.101 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26077.113 + 14.0.104-servicing.26078.101 10.0.4 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.4-servicing.26077.113 + 5.0.0-2.26078.101 + 5.0.0-2.26078.101 + 10.0.4-servicing.26078.101 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.113 - 10.0.4-servicing.26077.113 - 18.0.1-release-26077-113 + 10.0.0-preview.26078.101 + 10.0.4-servicing.26078.101 + 18.0.1-release-26078-101 10.0.4 - 10.0.4-servicing.26077.113 + 10.0.4-servicing.26078.101 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26077.113 + 10.0.104-servicing.26078.101 10.0.104 - 10.0.104-servicing.26077.113 + 10.0.104-servicing.26078.101 10.0.104 10.0.104 - 10.0.104-servicing.26077.113 - 18.0.1-release-26077-113 - 18.0.1-release-26077-113 + 10.0.104-servicing.26078.101 + 18.0.1-release-26078-101 + 18.0.1-release-26078-101 3.2.4 10.0.4 - 10.0.4-servicing.26077.113 + 10.0.4-servicing.26078.101 10.0.4 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 + 7.0.2-rc.7901 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff0968dbea1a..0613a2b5b765 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 diff --git a/global.json b/global.json index b3a77f359c1d..e0f58f14f476 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26078.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26078.101", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 08de9f0335a7dffeeb5a268bf37372155d38f5e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 04:09:48 +0000 Subject: [PATCH 218/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f7ff07db3842..e50a77a4d9ff 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26077.126 - 18.3.0-release-26077-126 - 18.3.0-release-26077-126 - 7.3.0-preview.1.7826 - 10.0.200-alpha.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 10.0.0-preview.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 10.0.0-beta.26077.126 - 15.2.200-servicing.26077.126 - 5.3.0-2.26077.126 - 5.3.0-2.26077.126 + 10.0.0-preview.26078.115 + 18.3.0-release-26078-115 + 18.3.0-release-26078-115 + 7.3.0-preview.1.7915 + 10.0.200-alpha.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 10.0.0-preview.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 10.0.0-beta.26078.115 + 15.2.200-servicing.26078.115 + 5.3.0-2.26078.115 + 5.3.0-2.26078.115 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.126 - 18.3.0-release-26077-126 - 10.0.200-alpha.26077.126 - 10.0.200-alpha.26077.126 - 10.0.200-alpha.26077.126 - 10.0.200-alpha.26077.126 - 10.0.200-alpha.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 10.0.200-preview.26077.126 - 18.3.0-release-26077-126 - 18.3.0-release-26077-126 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 - 7.3.0-preview.1.7826 + 10.0.0-preview.26078.115 + 18.3.0-release-26078-115 + 10.0.200-alpha.26078.115 + 10.0.200-alpha.26078.115 + 10.0.200-alpha.26078.115 + 10.0.200-alpha.26078.115 + 10.0.200-alpha.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 10.0.200-preview.26078.115 + 18.3.0-release-26078-115 + 18.3.0-release-26078-115 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 + 7.3.0-preview.1.7915 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d03b1d0e642..f12e84c8e561 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e - + https://github.com/dotnet/dotnet - 2047768c55865642b1b930bbc6e1260825ace624 + 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index 4ab2f787b6d0..4c5350cccdbb 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.126", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.126", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26078.115", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26078.115", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From b1b002a49b32111c330aa4a55f9c3559366cfa49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 05:40:25 +0000 Subject: [PATCH 219/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 372 +++++----- eng/Version.Details.xml | 685 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +- global.json | 4 +- 9 files changed, 544 insertions(+), 543 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc20a9a3c554..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 907a95db55d0..f7ff07db3842 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,173 +6,151 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-preview.26077.113 - 10.0.4 - 10.0.4 - 18.0.11 - 18.0.11-servicing-26077-113 - 7.0.2-rc.7813 - 10.0.104 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.0-preview.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 2.0.0-preview.1.26077.113 - 2.2.4 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 14.0.104-servicing.26077.113 - 10.0.4 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 + 10.0.0-preview.26077.126 + 18.3.0-release-26077-126 + 18.3.0-release-26077-126 + 7.3.0-preview.1.7826 + 10.0.200-alpha.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 10.0.0-preview.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 15.2.200-servicing.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.113 - 10.0.4-servicing.26077.113 - 18.0.1-release-26077-113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 18.0.1-release-26077-113 - 18.0.1-release-26077-113 - 3.2.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 10.0.4 - 2.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 + 10.0.0-preview.26077.126 + 18.3.0-release-26077-126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 18.3.0-release-26077-126 + 18.3.0-release-26077-126 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 - 2.1.0-preview.26078.2 - 4.1.0-preview.26078.2 + 2.1.0-preview.26077.6 + 4.1.0-preview.26077.6 - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -183,46 +161,25 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) - $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -239,10 +196,6 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -259,6 +212,57 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 844c4cc1f366..4d03b1d0e642 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + ccdb0ee122177251ae18655264e94312d63c4d45 - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + ccdb0ee122177251ae18655264e94312d63c4d45 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad03..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: Azure-Linux-3-Amd64 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index b3a77f359c1d..4ab2f787b6d0 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.126", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.126", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From ce196b1c87764c601863983e9bd182fd6dc79a5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 10:36:04 +0000 Subject: [PATCH 220/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 846b58bc758f..55cdf2b54600 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 70ccfa00d87f..2d46a1f1682d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26078.101 - 10.0.4-servicing.26078.101 - 10.0.4-servicing.26078.101 - 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.119 + 10.0.4-servicing.26078.119 + 10.0.4-servicing.26078.119 + 10.0.4-servicing.26078.119 10.0.4 - 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.119 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.119 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.119 10.0.4 - 10.0.4-servicing.26078.101 - 10.0.4-servicing.26078.101 - 10.0.0-preview.26078.101 + 10.0.4-servicing.26078.119 + 10.0.4-servicing.26078.119 + 10.0.0-preview.26078.119 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26078-101 - 7.0.2-rc.7901 + 18.0.11-servicing-26078-119 + 7.0.2-rc.7919 10.0.104 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 10.0.0-preview.26078.101 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 2.0.0-preview.1.26078.101 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 10.0.0-preview.26078.119 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 2.0.0-preview.1.26078.119 2.2.4 - 10.0.0-beta.26078.101 - 10.0.0-beta.26078.101 - 10.0.0-beta.26078.101 - 10.0.0-beta.26078.101 - 10.0.0-beta.26078.101 - 10.0.0-beta.26078.101 + 10.0.0-beta.26078.119 + 10.0.0-beta.26078.119 + 10.0.0-beta.26078.119 + 10.0.0-beta.26078.119 + 10.0.0-beta.26078.119 + 10.0.0-beta.26078.119 10.0.4 10.0.4 - 10.0.4-servicing.26078.101 - 10.0.4-servicing.26078.101 - 10.0.0-beta.26078.101 - 10.0.0-beta.26078.101 + 10.0.4-servicing.26078.119 + 10.0.4-servicing.26078.119 + 10.0.0-beta.26078.119 + 10.0.0-beta.26078.119 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26078.101 + 14.0.104-servicing.26078.119 10.0.4 - 5.0.0-2.26078.101 - 5.0.0-2.26078.101 - 10.0.4-servicing.26078.101 + 5.0.0-2.26078.119 + 5.0.0-2.26078.119 + 10.0.4-servicing.26078.119 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26078.101 - 10.0.4-servicing.26078.101 - 18.0.1-release-26078-101 + 10.0.0-preview.26078.119 + 10.0.4-servicing.26078.119 + 18.0.1-release-26078-119 10.0.4 - 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.119 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26078.101 + 10.0.104-servicing.26078.119 10.0.104 - 10.0.104-servicing.26078.101 + 10.0.104-servicing.26078.119 10.0.104 10.0.104 - 10.0.104-servicing.26078.101 - 18.0.1-release-26078-101 - 18.0.1-release-26078-101 + 10.0.104-servicing.26078.119 + 18.0.1-release-26078-119 + 18.0.1-release-26078-119 3.2.4 10.0.4 - 10.0.4-servicing.26078.101 + 10.0.4-servicing.26078.119 10.0.4 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 - 7.0.2-rc.7901 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 + 7.0.2-rc.7919 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4522c216970c..3abbe8e9837b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 - + https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 0eedb2cfb72dff01600e3ac09e2db1a713b73c91 + b57f2667e138c31d3f3efc39aa84e71337365ad3 diff --git a/global.json b/global.json index e0f58f14f476..cb7c6b6e219f 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26078.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26078.101", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26078.119", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26078.119", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From ce01a80a0ed4b2cd6b00e3d37d6b4b000ef682ba Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 29 Jan 2026 11:46:38 +0100 Subject: [PATCH 221/280] Fix content publish path calculation --- .../targets/Microsoft.NET.Publish.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets index e38b16fe46b3..eef7ac8c0b80 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @@ -847,8 +847,8 @@ Copyright (c) .NET Foundation. All rights reserved. %(Content.TargetPath) %(Content.Link) - $([MSBuild]::MakeRelative(%(Content.DefiningProjectDirectory), %(Content.FullPath))) - $([MSBuild]::MakeRelative($(MSBuildProjectDirectory), %(Content.FullPath))) + + $([MSBuild]::MakeRelative($(MSBuildProjectDirectory), %(Content.FullPath))) From 6830219e4d39e5fb0d47fa065e3c413a2370f498 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 29 Jan 2026 12:26:18 +0100 Subject: [PATCH 222/280] Add targeted unit test (different DefiningProjectDirectory and MSBuildProjectDirectory) --- ...GivenThatWeWantToPublishWithIfDifferent.cs | 74 +++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs index 9ebb72c1b982..5ec0962b5ce2 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs @@ -381,5 +381,79 @@ public void It_handles_IfDifferent_with_self_contained_publish() publishDirectory.Should().HaveFile("appdata.txt"); File.ReadAllText(Path.Combine(publishDirectory.FullName, "appdata.txt")).Should().Be("Application data"); } + + [Fact] + public void It_publishes_content_from_imported_targets_with_correct_path() + { + // This test verifies that Content items introduced from imported .targets files + // (where DefiningProjectDirectory differs from MSBuildProjectDirectory) are + // published with the correct project-relative path and do not escape the publish directory. + + var testProject = new TestProject() + { + Name = "PublishImportedContent", + TargetFrameworks = ToolsetInfo.CurrentTargetFramework, + IsExe = true + }; + + testProject.SourceFiles["Program.cs"] = "class Program { static void Main() { } }"; + + var testAsset = _testAssetsManager.CreateTestProject(testProject); + + var projectDirectory = Path.Combine(testAsset.Path, testProject.Name); + + // Create a subdirectory for the imported targets file + var importsDir = Path.Combine(projectDirectory, "imports"); + Directory.CreateDirectory(importsDir); + + // Create the content file in the imports directory + var contentFile = Path.Combine(importsDir, "imported-content.txt"); + File.WriteAllText(contentFile, "Content from imported targets"); + + // Create an imported .targets file that adds Content items with IfDifferent metadata + // This simulates the scenario where DefiningProjectDirectory differs from MSBuildProjectDirectory + var importedTargetsFile = Path.Combine(importsDir, "ImportedContent.targets"); + File.WriteAllText(importedTargetsFile, @" + + + +"); + + // Update the main project file to import the targets + var projectFile = Path.Combine(projectDirectory, $"{testProject.Name}.csproj"); + var projectContent = File.ReadAllText(projectFile); + projectContent = projectContent.Replace("", @" + +"); + File.WriteAllText(projectFile, projectContent); + + var publishCommand = new PublishCommand(testAsset); + var publishResult = publishCommand.Execute(); + + publishResult.Should().Pass(); + + var publishDirectory = publishCommand.GetOutputDirectory(testProject.TargetFrameworks); + + // The content file should be published with a simple filename, not with path segments + // that could escape the publish directory + publishDirectory.Should().HaveFile("imported-content.txt"); + + // Verify the content is correct + var publishedContentPath = Path.Combine(publishDirectory.FullName, "imported-content.txt"); + File.ReadAllText(publishedContentPath).Should().Be("Content from imported targets"); + + // Ensure no files with '..' in path were created (would indicate path escape) + var allFiles = Directory.GetFiles(publishDirectory.FullName, "*", SearchOption.AllDirectories); + foreach (var file in allFiles) + { + var relativePath = Path.GetRelativePath(publishDirectory.FullName, file); + relativePath.Should().NotContain("..", $"File '{file}' appears to escape the publish directory"); + } + + // Ensure the file is not published to a parent directory + var parentDir = Directory.GetParent(publishDirectory.FullName); + var escapedPath = Path.Combine(parentDir.FullName, "imported-content.txt"); + File.Exists(escapedPath).Should().BeFalse("Content file should not escape to parent directory"); + } } } From 56b783a161697217b0199a5f364feda005f5df21 Mon Sep 17 00:00:00 2001 From: Jan Krivanek Date: Thu, 29 Jan 2026 13:18:57 +0100 Subject: [PATCH 223/280] Improve tests to ensure they fail on unfixed payload --- ...GivenThatWeWantToPublishWithIfDifferent.cs | 56 +++++++++---------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs index 5ec0962b5ce2..d234ec586284 100644 --- a/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs +++ b/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishWithIfDifferent.cs @@ -388,6 +388,10 @@ public void It_publishes_content_from_imported_targets_with_correct_path() // This test verifies that Content items introduced from imported .targets files // (where DefiningProjectDirectory differs from MSBuildProjectDirectory) are // published with the correct project-relative path and do not escape the publish directory. + // + // The bug scenario: when a .targets file OUTSIDE the project directory adds a Content item, + // using DefiningProjectDirectory to compute the relative path can result in paths with '..' + // segments that escape the publish directory. var testProject = new TestProject() { @@ -402,28 +406,31 @@ public void It_publishes_content_from_imported_targets_with_correct_path() var projectDirectory = Path.Combine(testAsset.Path, testProject.Name); - // Create a subdirectory for the imported targets file - var importsDir = Path.Combine(projectDirectory, "imports"); - Directory.CreateDirectory(importsDir); + // Create the imported targets file OUTSIDE the project directory (sibling folder) + // This is the key difference - DefiningProjectDirectory will be different from MSBuildProjectDirectory + var externalImportsDir = Path.Combine(testAsset.Path, "ExternalImports"); + Directory.CreateDirectory(externalImportsDir); - // Create the content file in the imports directory - var contentFile = Path.Combine(importsDir, "imported-content.txt"); - File.WriteAllText(contentFile, "Content from imported targets"); + // Create the content file in the project directory (where we want it to be published from) + var contentFile = Path.Combine(projectDirectory, "project-content.txt"); + File.WriteAllText(contentFile, "Content defined by external targets"); - // Create an imported .targets file that adds Content items with IfDifferent metadata - // This simulates the scenario where DefiningProjectDirectory differs from MSBuildProjectDirectory - var importedTargetsFile = Path.Combine(importsDir, "ImportedContent.targets"); - File.WriteAllText(importedTargetsFile, @" + // Create an imported .targets file OUTSIDE the project that adds a Content item + // pointing to a file in the project directory. The issue is that DefiningProjectDirectory + // will be ExternalImports/, not the project directory. + var importedTargetsFile = Path.Combine(externalImportsDir, "ImportedContent.targets"); + File.WriteAllText(importedTargetsFile, $@" - + + "); - // Update the main project file to import the targets + // Update the main project file to import the external targets var projectFile = Path.Combine(projectDirectory, $"{testProject.Name}.csproj"); var projectContent = File.ReadAllText(projectFile); projectContent = projectContent.Replace("", @" - + "); File.WriteAllText(projectFile, projectContent); @@ -435,25 +442,18 @@ public void It_publishes_content_from_imported_targets_with_correct_path() var publishDirectory = publishCommand.GetOutputDirectory(testProject.TargetFrameworks); // The content file should be published with a simple filename, not with path segments - // that could escape the publish directory - publishDirectory.Should().HaveFile("imported-content.txt"); + // that could escape the publish directory (e.g., "..\PublishImportedContent\project-content.txt") + publishDirectory.Should().HaveFile("project-content.txt"); // Verify the content is correct - var publishedContentPath = Path.Combine(publishDirectory.FullName, "imported-content.txt"); - File.ReadAllText(publishedContentPath).Should().Be("Content from imported targets"); + var publishedContentPath = Path.Combine(publishDirectory.FullName, "project-content.txt"); + File.ReadAllText(publishedContentPath).Should().Be("Content defined by external targets"); - // Ensure no files with '..' in path were created (would indicate path escape) - var allFiles = Directory.GetFiles(publishDirectory.FullName, "*", SearchOption.AllDirectories); - foreach (var file in allFiles) - { - var relativePath = Path.GetRelativePath(publishDirectory.FullName, file); - relativePath.Should().NotContain("..", $"File '{file}' appears to escape the publish directory"); - } - - // Ensure the file is not published to a parent directory + // Ensure no files escaped to parent directories var parentDir = Directory.GetParent(publishDirectory.FullName); - var escapedPath = Path.Combine(parentDir.FullName, "imported-content.txt"); - File.Exists(escapedPath).Should().BeFalse("Content file should not escape to parent directory"); + var potentialEscapedFiles = Directory.GetFiles(parentDir.FullName, "project-content.txt", SearchOption.AllDirectories) + .Where(f => !f.StartsWith(publishDirectory.FullName)); + potentialEscapedFiles.Should().BeEmpty("Content file should not escape to directories outside publish folder"); } } } From 28580caa6ffcfd1e0df947589f262bc436beabbb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 11:40:19 -0500 Subject: [PATCH 224/280] [release/10.0.2xx] Fix -extra container variant check to support .NET 9+ (#52598) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> Co-authored-by: mthalman <15789599+mthalman@users.noreply.github.com> Co-authored-by: DonnaChen888 From af702217e5d1fefe7ca1242de3ed9ce09a1691a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Thu, 29 Jan 2026 09:29:14 -0800 Subject: [PATCH 225/280] [dotnet watch] Make application of changes always async (#52469) --- .../HotReloadClient/ApplyStatus.cs | 29 ---- .../HotReloadClient/DefaultHotReloadClient.cs | 136 ++++++------------ .../HotReloadClient/HotReloadClient.cs | 58 +++++--- .../HotReloadClient/HotReloadClients.cs | 108 ++++---------- .../HotReloadClient/Logging/LogEvents.cs | 10 +- .../{ResponseAction.cs => ResponseFunc.cs} | 4 +- .../Web/AbstractBrowserRefreshServer.cs | 15 +- .../HotReloadClient/Web/BrowserConnection.cs | 10 +- .../Web/WebAssemblyHotReloadClient.cs | 69 ++++----- .../Watch.Aspire/DotNetWatchLauncher.cs | 2 +- .../Watch/Context/EnvironmentOptions.cs | 2 +- .../Watch/HotReload/CompilationHandler.cs | 73 +++++++--- .../Watch/HotReload/HotReloadDotNetWatcher.cs | 6 +- .../Watch/Process/ProcessRunner.cs | 27 +++- .../Watch/Process/RunningProject.cs | 19 +++ src/BuiltInTools/Watch/UI/IReporter.cs | 15 +- src/BuiltInTools/dotnet-watch/Program.cs | 5 +- .../dotnet-watch/Watch/StaticFileHandler.cs | 4 +- .../HotReloadClientTests.cs | 52 +------ .../ParserTests/InstallTests.cs | 1 - .../Browser/BrowserTests.cs | 2 +- .../HotReload/ApplyDeltaTests.cs | 50 +++---- .../HotReload/RuntimeProcessLauncherTests.cs | 33 ++--- .../TestUtilities/TestOptions.cs | 2 +- 24 files changed, 319 insertions(+), 413 deletions(-) delete mode 100644 src/BuiltInTools/HotReloadClient/ApplyStatus.cs rename src/BuiltInTools/HotReloadClient/Utilities/{ResponseAction.cs => ResponseFunc.cs} (70%) diff --git a/src/BuiltInTools/HotReloadClient/ApplyStatus.cs b/src/BuiltInTools/HotReloadClient/ApplyStatus.cs deleted file mode 100644 index 1131aeaabef5..000000000000 --- a/src/BuiltInTools/HotReloadClient/ApplyStatus.cs +++ /dev/null @@ -1,29 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -#nullable enable - -namespace Microsoft.DotNet.HotReload; - -internal enum ApplyStatus -{ - /// - /// Failed to apply updates. - /// - Failed = 0, - - /// - /// All requested updates have been applied successfully. - /// - AllChangesApplied = 1, - - /// - /// Succeeded aplying changes, but some updates were not applicable to the target process because of required capabilities. - /// - SomeChangesApplied = 2, - - /// - /// No updates were applicable to the target process because of required capabilities. - /// - NoChangesApplied = 3, -} diff --git a/src/BuiltInTools/HotReloadClient/DefaultHotReloadClient.cs b/src/BuiltInTools/HotReloadClient/DefaultHotReloadClient.cs index 3cacff6b82c2..1642f63f8b82 100644 --- a/src/BuiltInTools/HotReloadClient/DefaultHotReloadClient.cs +++ b/src/BuiltInTools/HotReloadClient/DefaultHotReloadClient.cs @@ -12,6 +12,7 @@ using System.IO; using System.IO.Pipes; using System.Linq; +using System.Net.Sockets; using System.Runtime.InteropServices; using System.Threading; using System.Threading.Tasks; @@ -99,12 +100,13 @@ private void ReportPipeReadException(Exception e, string responseType, Cancellat { // Don't report a warning when cancelled or the pipe has been disposed. The process has terminated or the host is shutting down in that case. // Best effort: There is an inherent race condition due to time between the process exiting and the cancellation token triggering. - if (e is ObjectDisposedException or EndOfStreamException || cancellationToken.IsCancellationRequested) + // On Unix named pipes can also throw SocketException with ErrorCode 125 (Operation canceled) when disposed. + if (e is ObjectDisposedException or EndOfStreamException or SocketException { ErrorCode: 125 } || cancellationToken.IsCancellationRequested) { return; } - Logger.LogError("Failed to read {ResponseType} from the pipe: {Message}", responseType, e.Message); + Logger.LogError("Failed to read {ResponseType} from the pipe: {Exception}", responseType, e.ToString()); } private async Task ListenForResponsesAsync(CancellationToken cancellationToken) @@ -175,54 +177,43 @@ public override Task> GetUpdateCapabilitiesAsync(Cancella private ResponseLoggingLevel ResponseLoggingLevel => Logger.IsEnabled(LogLevel.Debug) ? ResponseLoggingLevel.Verbose : ResponseLoggingLevel.WarningsAndErrors; - public override async Task ApplyManagedCodeUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken) + public async override Task> ApplyManagedCodeUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken) { RequireReadyForUpdates(); if (_managedCodeUpdateFailedOrCancelled) { Logger.LogDebug("Previous changes failed to apply. Further changes are not applied to this process."); - return ApplyStatus.Failed; + return Task.FromResult(false); } var applicableUpdates = await FilterApplicableUpdatesAsync(updates, cancellationToken); if (applicableUpdates.Count == 0) { Logger.LogDebug("No updates applicable to this process"); - return ApplyStatus.NoChangesApplied; + return Task.FromResult(true); } var request = new ManagedCodeUpdateRequest(ToRuntimeUpdates(applicableUpdates), ResponseLoggingLevel); - var success = false; - try - { - success = await SendAndReceiveUpdateAsync(request, isProcessSuspended, cancellationToken); - } - finally + // Only cancel apply operation when the process exits: + var updateCompletionTask = QueueUpdateBatchRequest(request, applyOperationCancellationToken); + + return CompleteApplyOperationAsync(); + + async Task CompleteApplyOperationAsync() { - if (!success) + if (await updateCompletionTask) { - // Don't report a warning when cancelled. The process has terminated or the host is shutting down in that case. - // Best effort: There is an inherent race condition due to time between the process exiting and the cancellation token triggering. - if (!cancellationToken.IsCancellationRequested) - { - Logger.LogWarning("Further changes won't be applied to this process."); - } - - _managedCodeUpdateFailedOrCancelled = true; - DisposePipe(); + return true; } - } - if (success) - { - Logger.Log(LogEvents.UpdatesApplied, applicableUpdates.Count, updates.Length); - } + Logger.LogWarning("Further changes won't be applied to this process."); + _managedCodeUpdateFailedOrCancelled = true; + DisposePipe(); - return - !success ? ApplyStatus.Failed : - (applicableUpdates.Count < updates.Length) ? ApplyStatus.SomeChangesApplied : ApplyStatus.AllChangesApplied; + return false; + } static ImmutableArray ToRuntimeUpdates(IEnumerable updates) => [.. updates.Select(static update => new RuntimeManagedCodeUpdate(update.ModuleId, @@ -232,19 +223,17 @@ static ImmutableArray ToRuntimeUpdates(IEnumerable ApplyStaticAssetUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken) + public override async Task> ApplyStaticAssetUpdatesAsync(ImmutableArray updates, CancellationToken processExitedCancellationToken, CancellationToken cancellationToken) { if (!enableStaticAssetUpdates) { // The client has no concept of static assets. - return ApplyStatus.AllChangesApplied; + return Task.FromResult(true); } RequireReadyForUpdates(); - var appliedUpdateCount = 0; - - foreach (var update in updates) + var completionTasks = updates.Select(update => { var request = new StaticAssetUpdateRequest( new RuntimeStaticAssetUpdate( @@ -256,72 +245,37 @@ public async override Task ApplyStaticAssetUpdatesAsync(ImmutableAr Logger.LogDebug("Sending static file update request for asset '{Url}'.", update.RelativePath); - var success = await SendAndReceiveUpdateAsync(request, isProcessSuspended, cancellationToken); - if (success) - { - appliedUpdateCount++; - } - } + // Only cancel apply operation when the process exits: + return QueueUpdateBatchRequest(request, processExitedCancellationToken); + }); - Logger.Log(LogEvents.UpdatesApplied, appliedUpdateCount, updates.Length); + return CompleteApplyOperationAsync(); - return - (appliedUpdateCount == 0) ? ApplyStatus.Failed : - (appliedUpdateCount < updates.Length) ? ApplyStatus.SomeChangesApplied : ApplyStatus.AllChangesApplied; + async Task CompleteApplyOperationAsync() + { + var results = await Task.WhenAll(completionTasks); + return results.All(isSuccess => isSuccess); + } } - private ValueTask SendAndReceiveUpdateAsync(TRequest request, bool isProcessSuspended, CancellationToken cancellationToken) + private Task QueueUpdateBatchRequest(TRequest request, CancellationToken applyOperationCancellationToken) where TRequest : IUpdateRequest { - // Should not initialized: + // Not initialized: Debug.Assert(_pipe != null); - return SendAndReceiveUpdateAsync( - send: SendAndReceiveAsync, - isProcessSuspended, - suspendedResult: true, - cancellationToken); - - async ValueTask SendAndReceiveAsync(int batchId, CancellationToken cancellationToken) - { - Logger.LogDebug("Sending update batch #{UpdateId}", batchId); - - try - { - await WriteRequestAsync(cancellationToken); - - if (await ReceiveUpdateResponseAsync(cancellationToken)) - { - Logger.LogDebug("Update batch #{UpdateId} completed.", batchId); - return true; - } - - Logger.LogDebug("Update batch #{UpdateId} failed.", batchId); - } - catch (Exception e) + return QueueUpdateBatch( + sendAndReceive: async batchId => { - // Don't report an error when cancelled. The process has terminated or the host is shutting down in that case. - // Best effort: There is an inherent race condition due to time between the process exiting and the cancellation token triggering. - if (cancellationToken.IsCancellationRequested) - { - Logger.LogDebug("Update batch #{UpdateId} canceled.", batchId); - } - else - { - Logger.LogError("Update batch #{UpdateId} failed with error: {Message}", batchId, e.Message); - Logger.LogDebug("Update batch #{UpdateId} exception stack trace: {StackTrace}", batchId, e.StackTrace); - } - } - - return false; - } - - async ValueTask WriteRequestAsync(CancellationToken cancellationToken) - { - await _pipe.WriteAsync((byte)request.Type, cancellationToken); - await request.WriteAsync(_pipe, cancellationToken); - await _pipe.FlushAsync(cancellationToken); - } + await _pipe.WriteAsync((byte)request.Type, applyOperationCancellationToken); + await request.WriteAsync(_pipe, applyOperationCancellationToken); + await _pipe.FlushAsync(applyOperationCancellationToken); + + var success = await ReceiveUpdateResponseAsync(applyOperationCancellationToken); + Logger.Log(success ? LogEvents.UpdateBatchCompleted : LogEvents.UpdateBatchFailed, batchId); + return success; + }, + applyOperationCancellationToken); } private async ValueTask ReceiveUpdateResponseAsync(CancellationToken cancellationToken) diff --git a/src/BuiltInTools/HotReloadClient/HotReloadClient.cs b/src/BuiltInTools/HotReloadClient/HotReloadClient.cs index e8bccc3ee90e..6e45c8c76d78 100644 --- a/src/BuiltInTools/HotReloadClient/HotReloadClient.cs +++ b/src/BuiltInTools/HotReloadClient/HotReloadClient.cs @@ -69,16 +69,18 @@ protected static ImmutableArray AddImplicitCapabilities(IEnumerable> GetUpdateCapabilitiesAsync(CancellationToken cancellationToken); /// - /// Applies managed code updates to the target process. + /// Returns a task that applies managed code updates to the target process. /// - /// Cancellation token. The cancellation should trigger on process terminatation. - public abstract Task ApplyManagedCodeUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken); + /// The token used to cancel creation of the apply task. + /// The token to be used to cancel the apply operation. Should trigger on process terminatation. + public abstract Task> ApplyManagedCodeUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken); /// - /// Applies static asset updates to the target process. + /// Returns a task that applies static asset updates to the target process. /// - /// Cancellation token. The cancellation should trigger on process terminatation. - public abstract Task ApplyStaticAssetUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken); + /// The token used to cancel creation of the apply task. + /// The token to be used to cancel the apply operation. Should trigger on process terminatation. + public abstract Task> ApplyStaticAssetUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken); /// /// Notifies the agent that the initial set of updates has been applied and the user code in the process can start executing. @@ -133,13 +135,13 @@ protected async Task> FilterApplicable return applicableUpdates; } - protected async ValueTask SendAndReceiveUpdateAsync( - Func> send, - bool isProcessSuspended, - TResult suspendedResult, - CancellationToken cancellationToken) - where TResult : struct + /// + /// Queues a batch of updates to be applied in the target process. + /// + protected Task QueueUpdateBatch(Func> sendAndReceive, CancellationToken applyOperationCancellationToken) { + var completionSource = new TaskCompletionSource(); + var batchId = _updateBatchId++; Task previous; @@ -147,19 +149,31 @@ protected async ValueTask SendAndReceiveUpdateAsync( { previous = _pendingUpdates; - if (isProcessSuspended) + _pendingUpdates = Task.Run(async () => { - _pendingUpdates = Task.Run(async () => - { - await previous; - _ = await send(batchId, cancellationToken); - }, cancellationToken); + await previous; - return suspendedResult; - } + try + { + Logger.Log(LogEvents.SendingUpdateBatch, batchId); + completionSource.SetResult(await sendAndReceive(batchId)); + } + catch (OperationCanceledException) + { + // Don't report an error when cancelled. The process has terminated or the host is shutting down in that case. + // Best effort: There is an inherent race condition due to time between the process exiting and the cancellation token triggering. + Logger.Log(LogEvents.UpdateBatchCanceled, batchId); + completionSource.SetCanceled(); + } + catch (Exception e) + { + Logger.Log(LogEvents.UpdateBatchFailedWithError, batchId, e.Message); + Logger.Log(LogEvents.UpdateBatchExceptionStackTrace, batchId, e.StackTrace ?? ""); + completionSource.SetResult(false); + } + }, applyOperationCancellationToken); } - await previous; - return await send(batchId, cancellationToken); + return completionSource.Task; } } diff --git a/src/BuiltInTools/HotReloadClient/HotReloadClients.cs b/src/BuiltInTools/HotReloadClient/HotReloadClients.cs index 35b99dc1e437..1b02eac9de48 100644 --- a/src/BuiltInTools/HotReloadClient/HotReloadClients.cs +++ b/src/BuiltInTools/HotReloadClient/HotReloadClients.cs @@ -112,61 +112,22 @@ public async ValueTask> GetUpdateCapabilitiesAsync(Cancel } /// Cancellation token. The cancellation should trigger on process terminatation. - /// True if the updates are initial updates applied automatically when a process starts. - public async ValueTask ApplyManagedCodeUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, bool isInitial, CancellationToken cancellationToken) + public async Task ApplyManagedCodeUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken) { - var anyFailure = false; + // Apply to all processes. + // The module the change is for does not need to be loaded to any of the processes, yet we still consider it successful if the application does not fail. + // In each process we store the deltas for application when/if the module is loaded to the process later. + // An error is only reported if the delta application fails, which would be a bug either in the runtime (applying valid delta incorrectly), + // the compiler (producing wrong delta), or rude edit detection (the change shouldn't have been allowed). - if (clients is [var (singleClient, _)]) - { - anyFailure = await singleClient.ApplyManagedCodeUpdatesAsync(updates, isProcessSuspended, cancellationToken) == ApplyStatus.Failed; - } - else - { - // Apply to all processes. - // The module the change is for does not need to be loaded to any of the processes, yet we still consider it successful if the application does not fail. - // In each process we store the deltas for application when/if the module is loaded to the process later. - // An error is only reported if the delta application fails, which would be a bug either in the runtime (applying valid delta incorrectly), - // the compiler (producing wrong delta), or rude edit detection (the change shouldn't have been allowed). - - var results = await Task.WhenAll(clients.Select(c => c.client.ApplyManagedCodeUpdatesAsync(updates, isProcessSuspended, cancellationToken))); - - var index = 0; - foreach (var status in results) - { - var (client, name) = clients[index++]; + var applyTasks = await Task.WhenAll(clients.Select(c => c.client.ApplyManagedCodeUpdatesAsync(updates, applyOperationCancellationToken, cancellationToken))); - switch (status) - { - case ApplyStatus.Failed: - anyFailure = true; - break; + return CompleteApplyOperationAsync(); - case ApplyStatus.AllChangesApplied: - break; - - case ApplyStatus.SomeChangesApplied: - client.Logger.LogWarning("Some changes not applied to {Name} because they are not supported by the runtime.", name); - break; - - case ApplyStatus.NoChangesApplied: - client.Logger.LogWarning("No changes applied to {Name} because they are not supported by the runtime.", name); - break; - } - } - } - - if (!anyFailure) + async Task CompleteApplyOperationAsync() { - // Only report status for updates made directly by the user, not for initial updates. - if (!isInitial) - { - // all clients share the same loggers, pick any: - var logger = clients[0].client.Logger; - logger.Log(LogEvents.HotReloadSucceeded); - } - - if (browserRefreshServer != null) + var results = await Task.WhenAll(applyTasks); + if (browserRefreshServer != null && results.All(isSuccess => isSuccess)) { await browserRefreshServer.RefreshBrowserAsync(cancellationToken); } @@ -187,45 +148,38 @@ public async ValueTask InitialUpdatesAppliedAsync(CancellationToken cancellation } /// Cancellation token. The cancellation should trigger on process terminatation. - public async Task ApplyStaticAssetUpdatesAsync(IEnumerable assets, CancellationToken cancellationToken) + public async Task ApplyStaticAssetUpdatesAsync(IEnumerable assets, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken) { if (browserRefreshServer != null) { - await browserRefreshServer.UpdateStaticAssetsAsync(assets.Select(static a => a.RelativeUrl), cancellationToken); + return browserRefreshServer.UpdateStaticAssetsAsync(assets.Select(static a => a.RelativeUrl), applyOperationCancellationToken).AsTask(); } - else - { - var updates = new List(); - foreach (var asset in assets) + var updates = new List(); + + foreach (var asset in assets) + { + try { - try - { - ClientLogger.LogDebug("Loading asset '{Url}' from '{Path}'.", asset.RelativeUrl, asset.FilePath); - updates.Add(await HotReloadStaticAssetUpdate.CreateAsync(asset, cancellationToken)); - } - catch (Exception e) when (e is not OperationCanceledException) - { - ClientLogger.LogError("Failed to read file {FilePath}: {Message}", asset.FilePath, e.Message); - continue; - } + ClientLogger.LogDebug("Loading asset '{Url}' from '{Path}'.", asset.RelativeUrl, asset.FilePath); + updates.Add(await HotReloadStaticAssetUpdate.CreateAsync(asset, cancellationToken)); + } + catch (Exception e) when (e is not OperationCanceledException) + { + ClientLogger.LogError("Failed to read file {FilePath}: {Message}", asset.FilePath, e.Message); + continue; } - - await ApplyStaticAssetUpdatesAsync([.. updates], isProcessSuspended: false, cancellationToken); } + + return await ApplyStaticAssetUpdatesAsync([.. updates], applyOperationCancellationToken, cancellationToken); } /// Cancellation token. The cancellation should trigger on process terminatation. - public async ValueTask ApplyStaticAssetUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken) + public async ValueTask ApplyStaticAssetUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken) { - if (clients is [var (singleClient, _)]) - { - await singleClient.ApplyStaticAssetUpdatesAsync(updates, isProcessSuspended, cancellationToken); - } - else - { - await Task.WhenAll(clients.Select(c => c.client.ApplyStaticAssetUpdatesAsync(updates, isProcessSuspended, cancellationToken))); - } + var applyTasks = await Task.WhenAll(clients.Select(c => c.client.ApplyStaticAssetUpdatesAsync(updates, applyOperationCancellationToken, cancellationToken))); + + return Task.WhenAll(applyTasks); } /// Cancellation token. The cancellation should trigger on process terminatation. diff --git a/src/BuiltInTools/HotReloadClient/Logging/LogEvents.cs b/src/BuiltInTools/HotReloadClient/Logging/LogEvents.cs index 7be92781e01c..8b43cb4bad29 100644 --- a/src/BuiltInTools/HotReloadClient/Logging/LogEvents.cs +++ b/src/BuiltInTools/HotReloadClient/Logging/LogEvents.cs @@ -20,9 +20,13 @@ private static LogEvent Create(LogLevel level, string message) public static void Log(this ILogger logger, LogEvent logEvent, params object[] args) => logger.Log(logEvent.Level, logEvent.Id, logEvent.Message, args); - public static readonly LogEvent UpdatesApplied = Create(LogLevel.Debug, "Updates applied: {0} out of {1}."); - public static readonly LogEvent Capabilities = Create(LogLevel.Debug, "Capabilities: '{1}'."); - public static readonly LogEvent HotReloadSucceeded = Create(LogLevel.Information, "Hot reload succeeded."); + public static readonly LogEvent SendingUpdateBatch = Create(LogLevel.Debug, "Sending update batch #{0}"); + public static readonly LogEvent UpdateBatchCompleted = Create(LogLevel.Debug, "Update batch #{0} completed."); + public static readonly LogEvent UpdateBatchFailed = Create(LogLevel.Debug, "Update batch #{0} failed."); + public static readonly LogEvent UpdateBatchCanceled = Create(LogLevel.Debug, "Update batch #{0} canceled."); + public static readonly LogEvent UpdateBatchFailedWithError = Create(LogLevel.Debug, "Update batch #{0} failed with error: {1}"); + public static readonly LogEvent UpdateBatchExceptionStackTrace = Create(LogLevel.Debug, "Update batch #{0} exception stack trace: {1}"); + public static readonly LogEvent Capabilities = Create(LogLevel.Debug, "Capabilities: '{0}'."); public static readonly LogEvent RefreshingBrowser = Create(LogLevel.Debug, "Refreshing browser."); public static readonly LogEvent ReloadingBrowser = Create(LogLevel.Debug, "Reloading browser."); public static readonly LogEvent SendingWaitMessage = Create(LogLevel.Debug, "Sending wait message."); diff --git a/src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs b/src/BuiltInTools/HotReloadClient/Utilities/ResponseFunc.cs similarity index 70% rename from src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs rename to src/BuiltInTools/HotReloadClient/Utilities/ResponseFunc.cs index 64a2cbcb7183..160bce801a6e 100644 --- a/src/BuiltInTools/HotReloadClient/Utilities/ResponseAction.cs +++ b/src/BuiltInTools/HotReloadClient/Utilities/ResponseFunc.cs @@ -4,9 +4,11 @@ #nullable enable using System; +using System.Threading; +using System.Threading.Tasks; using Microsoft.Extensions.Logging; namespace Microsoft.DotNet.HotReload; // Workaround for ReadOnlySpan not working as a generic parameter on .NET Framework -public delegate void ResponseAction(ReadOnlySpan data, ILogger logger); +public delegate TResult ResponseFunc(ReadOnlySpan data, ILogger logger); diff --git a/src/BuiltInTools/HotReloadClient/Web/AbstractBrowserRefreshServer.cs b/src/BuiltInTools/HotReloadClient/Web/AbstractBrowserRefreshServer.cs index d39ea6c0f519..79c5d957265b 100644 --- a/src/BuiltInTools/HotReloadClient/Web/AbstractBrowserRefreshServer.cs +++ b/src/BuiltInTools/HotReloadClient/Web/AbstractBrowserRefreshServer.cs @@ -239,16 +239,20 @@ public ValueTask SendWaitMessageAsync(CancellationToken cancellationToken) return SendAsync(JsonWaitRequest.Message, cancellationToken); } - private ValueTask SendAsync(ReadOnlyMemory messageBytes, CancellationToken cancellationToken) - => SendAndReceiveAsync(request: _ => messageBytes, response: null, cancellationToken); + private async ValueTask SendAsync(ReadOnlyMemory messageBytes, CancellationToken cancellationToken) + { + await SendAndReceiveAsync, VoidResult>(request: _ => messageBytes, response: null, cancellationToken); + } - public async ValueTask SendAndReceiveAsync( + public async ValueTask SendAndReceiveAsync( Func? request, - ResponseAction? response, + ResponseFunc? response, CancellationToken cancellationToken) + where TResult : struct { var responded = false; var openConnections = GetOpenBrowserConnections(); + var result = default(TResult?); foreach (var connection in openConnections) { @@ -263,7 +267,7 @@ public async ValueTask SendAndReceiveAsync( } } - if (response != null && !await connection.TryReceiveMessageAsync(response, cancellationToken)) + if (response != null && (result = await connection.TryReceiveMessageAsync(response, cancellationToken)) == null) { continue; } @@ -281,6 +285,7 @@ public async ValueTask SendAndReceiveAsync( } DisposeClosedBrowserConnections(); + return result; } public ValueTask RefreshBrowserAsync(CancellationToken cancellationToken) diff --git a/src/BuiltInTools/HotReloadClient/Web/BrowserConnection.cs b/src/BuiltInTools/HotReloadClient/Web/BrowserConnection.cs index 498c26110089..74bfabc268d9 100644 --- a/src/BuiltInTools/HotReloadClient/Web/BrowserConnection.cs +++ b/src/BuiltInTools/HotReloadClient/Web/BrowserConnection.cs @@ -68,7 +68,8 @@ internal async ValueTask TrySendMessageAsync(ReadOnlyMemory messageB return true; } - internal async ValueTask TryReceiveMessageAsync(ResponseAction receiver, CancellationToken cancellationToken) + internal async ValueTask TryReceiveMessageAsync(ResponseFunc receiver, CancellationToken cancellationToken) + where TResponseResult : struct { var writer = new ArrayBufferWriter(initialCapacity: 1024); @@ -88,12 +89,12 @@ internal async ValueTask TryReceiveMessageAsync(ResponseAction receiver, C catch (Exception e) when (e is not OperationCanceledException) { ServerLogger.LogDebug("Failed to receive response: {Message}", e.Message); - return false; + return null; } if (result.MessageType == WebSocketMessageType.Close) { - return false; + return null; } writer.Advance(result.Count); @@ -103,7 +104,6 @@ internal async ValueTask TryReceiveMessageAsync(ResponseAction receiver, C } } - receiver(writer.WrittenSpan, AgentLogger); - return true; + return receiver(writer.WrittenSpan, AgentLogger); } } diff --git a/src/BuiltInTools/HotReloadClient/Web/WebAssemblyHotReloadClient.cs b/src/BuiltInTools/HotReloadClient/Web/WebAssemblyHotReloadClient.cs index d4a165e0793a..dee0f34ed354 100644 --- a/src/BuiltInTools/HotReloadClient/Web/WebAssemblyHotReloadClient.cs +++ b/src/BuiltInTools/HotReloadClient/Web/WebAssemblyHotReloadClient.cs @@ -91,18 +91,18 @@ public override async Task WaitForConnectionEstablishedAsync(CancellationToken c public override Task> GetUpdateCapabilitiesAsync(CancellationToken cancellationToken) => Task.FromResult(_capabilities); - public override async Task ApplyManagedCodeUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken) + public override async Task> ApplyManagedCodeUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken) { var applicableUpdates = await FilterApplicableUpdatesAsync(updates, cancellationToken); if (applicableUpdates.Count == 0) { - return ApplyStatus.NoChangesApplied; + return Task.FromResult(true); } // When testing abstract away the browser and pretend all changes have been applied: if (suppressBrowserRequestsForTesting) { - return ApplyStatus.AllChangesApplied; + return Task.FromResult(true); } // Make sure to send the same update to all browsers, the only difference is the shared secret. @@ -117,59 +117,42 @@ public override async Task ApplyManagedCodeUpdatesAsync(ImmutableAr var loggingLevel = Logger.IsEnabled(LogLevel.Debug) ? ResponseLoggingLevel.Verbose : ResponseLoggingLevel.WarningsAndErrors; - var (anySuccess, anyFailure) = await SendAndReceiveUpdateAsync( - send: SendAndReceiveAsync, - isProcessSuspended, - suspendedResult: (anySuccess: true, anyFailure: false), - cancellationToken); - // If no browser is connected we assume the changes have been applied. // If at least one browser suceeds we consider the changes successfully applied. // TODO: // The refresh server should remember the deltas and apply them to browsers connected in future. // Currently the changes are remembered on the dev server and sent over there from the browser. // If no browser is connected the changes are not sent though. - return (!anySuccess && anyFailure) ? ApplyStatus.Failed : (applicableUpdates.Count < updates.Length) ? ApplyStatus.SomeChangesApplied : ApplyStatus.AllChangesApplied; - async ValueTask<(bool anySuccess, bool anyFailure)> SendAndReceiveAsync(int batchId, CancellationToken cancellationToken) - { - Logger.LogDebug("Sending update batch #{UpdateId}", batchId); - - var anySuccess = false; - var anyFailure = false; - - await browserRefreshServer.SendAndReceiveAsync( - request: sharedSecret => new JsonApplyManagedCodeUpdatesRequest - { - SharedSecret = sharedSecret, - UpdateId = batchId, - Deltas = deltas, - ResponseLoggingLevel = (int)loggingLevel - }, - response: new ResponseAction((value, logger) => - { - if (ReceiveUpdateResponseAsync(value, logger)) + return QueueUpdateBatch( + sendAndReceive: async batchId => + { + var result = await browserRefreshServer.SendAndReceiveAsync( + request: sharedSecret => new JsonApplyManagedCodeUpdatesRequest { - Logger.LogDebug("Update batch #{UpdateId} completed.", batchId); - anySuccess = true; - } - else + SharedSecret = sharedSecret, + UpdateId = batchId, + Deltas = deltas, + ResponseLoggingLevel = (int)loggingLevel + }, + response: new ResponseFunc((value, logger) => { - Logger.LogDebug("Update batch #{UpdateId} failed.", batchId); - anyFailure = true; - } - }), - cancellationToken); - - return (anySuccess, anyFailure); - } + var success = ReceiveUpdateResponse(value, logger); + Logger.Log(success ? LogEvents.UpdateBatchCompleted : LogEvents.UpdateBatchFailed, batchId); + return success; + }), + applyOperationCancellationToken); + + return result ?? false; + }, + applyOperationCancellationToken); } - public override Task ApplyStaticAssetUpdatesAsync(ImmutableArray updates, bool isProcessSuspended, CancellationToken cancellationToken) + public override Task> ApplyStaticAssetUpdatesAsync(ImmutableArray updates, CancellationToken applyOperationCancellationToken, CancellationToken cancellationToken) // static asset updates are handled by browser refresh server: - => Task.FromResult(ApplyStatus.NoChangesApplied); + => Task.FromResult(Task.FromResult(true)); - private static bool ReceiveUpdateResponseAsync(ReadOnlySpan value, ILogger logger) + private static bool ReceiveUpdateResponse(ReadOnlySpan value, ILogger logger) { var data = AbstractBrowserRefreshServer.DeserializeJson(value); diff --git a/src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs b/src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs index 0bae06178441..72fadfe6f024 100644 --- a/src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs +++ b/src/BuiltInTools/Watch.Aspire/DotNetWatchLauncher.cs @@ -46,7 +46,7 @@ public static async Task RunAsync(string workingDirectory, DotNetWatchOpti var console = new PhysicalConsole(TestFlags.None); var reporter = new ConsoleReporter(console, suppressEmojis: false); var environmentOptions = EnvironmentOptions.FromEnvironment(muxerPath); - var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout(isHotReloadEnabled: true)); + var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout()); var loggerFactory = new LoggerFactory(reporter, globalOptions.LogLevel); var logger = loggerFactory.CreateLogger(DotNetWatchContext.DefaultLogComponentName); diff --git a/src/BuiltInTools/Watch/Context/EnvironmentOptions.cs b/src/BuiltInTools/Watch/Context/EnvironmentOptions.cs index 0569229e3233..1cb4f6db7bdc 100644 --- a/src/BuiltInTools/Watch/Context/EnvironmentOptions.cs +++ b/src/BuiltInTools/Watch/Context/EnvironmentOptions.cs @@ -63,7 +63,7 @@ internal sealed record EnvironmentOptions( TestOutput: EnvironmentVariables.TestOutputDir ); - public TimeSpan GetProcessCleanupTimeout(bool isHotReloadEnabled) + public TimeSpan GetProcessCleanupTimeout() // Allow sufficient time for the process to exit gracefully and release resources (e.g., network ports). => ProcessCleanupTimeout ?? TimeSpan.FromSeconds(5); diff --git a/src/BuiltInTools/Watch/HotReload/CompilationHandler.cs b/src/BuiltInTools/Watch/HotReload/CompilationHandler.cs index a8f73dbb48df..80e2b5169735 100644 --- a/src/BuiltInTools/Watch/HotReload/CompilationHandler.cs +++ b/src/BuiltInTools/Watch/HotReload/CompilationHandler.cs @@ -181,7 +181,10 @@ public async ValueTask StartSessionAsync(CancellationToken cancellationToken) var updatesToApply = _previousUpdates.Skip(appliedUpdateCount).ToImmutableArray(); if (updatesToApply.Any()) { - await clients.ApplyManagedCodeUpdatesAsync(ToManagedCodeUpdates(updatesToApply), isProcessSuspended: false, isInitial: true, processCommunicationCancellationToken); + await await clients.ApplyManagedCodeUpdatesAsync( + ToManagedCodeUpdates(updatesToApply), + applyOperationCancellationToken: processExitedSource.Token, + cancellationToken: processCommunicationCancellationToken); } appliedUpdateCount += updatesToApply.Length; @@ -366,7 +369,7 @@ private static void PrepareCompilations(Solution solution, string projectPath, C return (updates.ProjectUpdates, projectsToRebuild, projectsToRedeploy, projectsToRestart); } - public async ValueTask ApplyUpdatesAsync(ImmutableArray updates, CancellationToken cancellationToken) + public async ValueTask ApplyUpdatesAsync(ImmutableArray updates, Stopwatch stopwatch, CancellationToken cancellationToken) { Debug.Assert(!updates.IsEmpty); @@ -383,18 +386,43 @@ public async ValueTask ApplyUpdatesAsync(ImmutableArray // Apply changes to all running projects, even if they do not have a static project dependency on any project that changed. // The process may load any of the binaries using MEF or some other runtime dependency loader. - await ForEachProjectAsync(projectsToUpdate, async (runningProject, cancellationToken) => + var applyTasks = new List(); + + foreach (var (_, projects) in projectsToUpdate) { - try + foreach (var runningProject in projects) { - using var processCommunicationCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(runningProject.ProcessExitedCancellationToken, cancellationToken); - await runningProject.Clients.ApplyManagedCodeUpdatesAsync(ToManagedCodeUpdates(updates), isProcessSuspended: false, isInitial: false, processCommunicationCancellationSource.Token); + // Only cancel applying updates when the process exits. Canceling disables further updates since the state of the runtime becomes unknown. + var applyTask = await runningProject.Clients.ApplyManagedCodeUpdatesAsync( + ToManagedCodeUpdates(updates), + applyOperationCancellationToken: runningProject.ProcessExitedCancellationToken, + cancellationToken); + + applyTasks.Add(runningProject.CompleteApplyOperationAsync(applyTask)); } - catch (OperationCanceledException) when (runningProject.ProcessExitedCancellationToken.IsCancellationRequested && !cancellationToken.IsCancellationRequested) + } + + // fire and forget: + _ = CompleteApplyOperationAsync(applyTasks, stopwatch, MessageDescriptor.ManagedCodeChangesApplied); + } + + private async Task CompleteApplyOperationAsync(IEnumerable applyTasks, Stopwatch stopwatch, MessageDescriptor message) + { + try + { + await Task.WhenAll(applyTasks); + + _context.Logger.Log(message, stopwatch.ElapsedMilliseconds); + } + catch (Exception e) + { + // Handle all exceptions since this is a fire-and-forget task. + + if (e is not OperationCanceledException) { - runningProject.Clients.ClientLogger.Log(MessageDescriptor.HotReloadCanceledProcessExited); + _context.Logger.LogError("Failed to apply updates: {Exception}", e.ToString()); } - }, cancellationToken); + } } private static RunningProject? GetCorrespondingRunningProject(Project project, ImmutableDictionary> runningProjects) @@ -562,6 +590,7 @@ public async ValueTask HandleStaticAssetChangesAsync( IReadOnlyList files, ProjectNodeMap projectMap, IReadOnlyDictionary manifests, + Stopwatch stopwatch, CancellationToken cancellationToken) { var assets = new Dictionary>(); @@ -697,30 +726,36 @@ public async ValueTask HandleStaticAssetChangesAsync( } } - var tasks = assets.Select(async entry => - { - var (applicationProjectInstance, instanceAssets) = entry; + // Creating apply tasks involves reading static assets from disk. Parallelize this IO. + var applyTaskProducers = new List>(); + foreach (var (applicationProjectInstance, instanceAssets) in assets) + { if (failedApplicationProjectInstances?.Contains(applicationProjectInstance) == true) { - return; + continue; } if (!TryGetRunningProject(applicationProjectInstance.FullPath, out var runningProjects)) { - return; + continue; } foreach (var runningProject in runningProjects) { - using var processCommunicationCancellationSource = CancellationTokenSource.CreateLinkedTokenSource(runningProject.ProcessExitedCancellationToken, cancellationToken); - await runningProject.Clients.ApplyStaticAssetUpdatesAsync(instanceAssets.Values, processCommunicationCancellationSource.Token); + // Only cancel applying updates when the process exits. Canceling in-progress static asset update might be ok, + // but for consistency with managed code updates we only cancel when the process exits. + applyTaskProducers.Add(runningProject.Clients.ApplyStaticAssetUpdatesAsync( + instanceAssets.Values, + applyOperationCancellationToken: runningProject.ProcessExitedCancellationToken, + cancellationToken)); } - }); + } - await Task.WhenAll(tasks).WaitAsync(cancellationToken); + var applyTasks = await Task.WhenAll(applyTaskProducers); - Logger.Log(MessageDescriptor.StaticAssetsReloaded); + // fire and forget: + _ = CompleteApplyOperationAsync(applyTasks, stopwatch, MessageDescriptor.StaticAssetsChangesApplied); } /// diff --git a/src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs b/src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs index ab85d94c08f0..e82c41ed0f09 100644 --- a/src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs +++ b/src/BuiltInTools/Watch/HotReload/HotReloadDotNetWatcher.cs @@ -261,7 +261,7 @@ void FileChangedCallback(ChangedPath change) var stopwatch = Stopwatch.StartNew(); HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.StaticHandler); - await compilationHandler.HandleStaticAssetChangesAsync(changedFiles, projectMap, evaluationResult.StaticWebAssetsManifests, iterationCancellationToken); + await compilationHandler.HandleStaticAssetChangesAsync(changedFiles, projectMap, evaluationResult.StaticWebAssetsManifests, stopwatch, iterationCancellationToken); HotReloadEventSource.Log.HotReloadEnd(HotReloadEventSource.StartType.StaticHandler); HotReloadEventSource.Log.HotReloadStart(HotReloadEventSource.StartType.CompilationHandler); @@ -378,7 +378,7 @@ void FileChangedCallback(ChangedPath change) // so that updated code doesn't attempt to access the dependency before it has been deployed. if (!managedCodeUpdates.IsEmpty) { - await compilationHandler.ApplyUpdatesAsync(managedCodeUpdates, iterationCancellationToken); + await compilationHandler.ApplyUpdatesAsync(managedCodeUpdates, stopwatch, iterationCancellationToken); } if (!projectsToRestart.IsEmpty) @@ -394,8 +394,6 @@ await Task.WhenAll( _context.Logger.Log(MessageDescriptor.ProjectsRestarted, projectsToRestart.Length); } - _context.Logger.Log(MessageDescriptor.HotReloadChangeHandled, stopwatch.ElapsedMilliseconds); - async Task> CaptureChangedFilesSnapshot(ImmutableArray rebuiltProjects) { var changedPaths = Interlocked.Exchange(ref changedFilesAccumulator, []); diff --git a/src/BuiltInTools/Watch/Process/ProcessRunner.cs b/src/BuiltInTools/Watch/Process/ProcessRunner.cs index 54ae7d130229..4734b844fdce 100644 --- a/src/BuiltInTools/Watch/Process/ProcessRunner.cs +++ b/src/BuiltInTools/Watch/Process/ProcessRunner.cs @@ -19,11 +19,15 @@ private sealed class ProcessState(Process process) : IDisposable // True if Ctrl+C was sent to the process on Windows. public bool SentWindowsCtrlC; + // True if SIGKILL was sent to the process on Unix. + public bool SentUnixSigKill; + public void Dispose() => Process.Dispose(); } private const int CtlrCExitCode = unchecked((int)0xC000013A); + private const int SigKillExitCode = 137; // For testing purposes only, lock on access. private static readonly HashSet s_runningApplicationProcesses = []; @@ -111,7 +115,9 @@ public async Task RunAsync(ProcessSpec processSpec, ILogger logger, Process if (processSpec.IsUserApplication) { - if (exitCode == 0 || state.SentWindowsCtrlC && exitCode == CtlrCExitCode) + if (exitCode == 0 || + state.SentWindowsCtrlC && exitCode == CtlrCExitCode || + state.SentUnixSigKill && exitCode == SigKillExitCode) { logger.Log(MessageDescriptor.Exited); } @@ -361,13 +367,12 @@ private static void TerminateWindowsProcess(Process process, ProcessState state, } else { + state.SentWindowsCtrlC = true; + var error = ProcessUtilities.SendWindowsCtrlCEvent(state.ProcessId); - if (error == null) - { - state.SentWindowsCtrlC = true; - } - else + if (error != null) { + state.SentWindowsCtrlC = false; logger.Log(MessageDescriptor.FailedToSendSignalToProcess, signalName, state.ProcessId, error); } } @@ -378,9 +383,19 @@ private static void TerminateUnixProcess(ProcessState state, ILogger logger, boo var signalName = force ? "SIGKILL" : "SIGTERM"; logger.Log(MessageDescriptor.TerminatingProcess, state.ProcessId, signalName); + if (force) + { + state.SentUnixSigKill = true; + } + var error = ProcessUtilities.SendPosixSignal(state.ProcessId, signal: force ? ProcessUtilities.SIGKILL : ProcessUtilities.SIGTERM); if (error != null) { + if (force) + { + state.SentUnixSigKill = false; + } + logger.Log(MessageDescriptor.FailedToSendSignalToProcess, signalName, state.ProcessId, error); } } diff --git a/src/BuiltInTools/Watch/Process/RunningProject.cs b/src/BuiltInTools/Watch/Process/RunningProject.cs index 8f5bfe94b004..d94c90fbf6e5 100644 --- a/src/BuiltInTools/Watch/Process/RunningProject.cs +++ b/src/BuiltInTools/Watch/Process/RunningProject.cs @@ -111,5 +111,24 @@ public Task TerminateForRestartAsync() InitiateRestart(); return TerminateAsync(); } + + public async Task CompleteApplyOperationAsync(Task applyTask) + { + try + { + await applyTask; + } + catch (OperationCanceledException) + { + // Do not report error. + } + catch (Exception e) + { + // Handle all exceptions. If one process is terminated or fails to apply changes + // it shouldn't prevent applying updates to other processes. + + Clients.ClientLogger.LogError("Failed to apply updates to process {Process}: {Exception}", ProcessId, e.ToString()); + } + } } } diff --git a/src/BuiltInTools/Watch/UI/IReporter.cs b/src/BuiltInTools/Watch/UI/IReporter.cs index 079ce3e46101..b2421ef89fa4 100644 --- a/src/BuiltInTools/Watch/UI/IReporter.cs +++ b/src/BuiltInTools/Watch/UI/IReporter.cs @@ -168,9 +168,14 @@ public MessageDescriptor WithLevelWhen(LogLevel level, bool condition) public static readonly MessageDescriptor FixBuildError = Create("Fix the error to continue or press Ctrl+C to exit.", Emoji.Watch, LogLevel.Warning); public static readonly MessageDescriptor WaitingForChanges = Create("Waiting for changes", Emoji.Watch, LogLevel.Information); public static readonly MessageDescriptor LaunchedProcess = Create("Launched '{0}' with arguments '{1}': process id {2}", Emoji.Launch, LogLevel.Debug); - public static readonly MessageDescriptor HotReloadChangeHandled = Create("Hot reload change handled in {0}ms.", Emoji.HotReload, LogLevel.Debug); - public static readonly MessageDescriptor HotReloadSucceeded = Create(LogEvents.HotReloadSucceeded, Emoji.HotReload); - public static readonly MessageDescriptor UpdatesApplied = Create(LogEvents.UpdatesApplied, Emoji.HotReload); + public static readonly MessageDescriptor ManagedCodeChangesApplied = Create("C# and Razor changes applied in {0}ms.", Emoji.HotReload, LogLevel.Information); + public static readonly MessageDescriptor StaticAssetsChangesApplied = Create("Static asset changes applied in {0}ms.", Emoji.HotReload, LogLevel.Information); + public static readonly MessageDescriptor SendingUpdateBatch = Create(LogEvents.SendingUpdateBatch, Emoji.HotReload); + public static readonly MessageDescriptor UpdateBatchCompleted = Create(LogEvents.UpdateBatchCompleted, Emoji.HotReload); + public static readonly MessageDescriptor UpdateBatchFailed = Create(LogEvents.UpdateBatchFailed, Emoji.HotReload); + public static readonly MessageDescriptor UpdateBatchCanceled = Create(LogEvents.UpdateBatchCanceled, Emoji.HotReload); + public static readonly MessageDescriptor UpdateBatchFailedWithError = Create(LogEvents.UpdateBatchFailedWithError, Emoji.HotReload); + public static readonly MessageDescriptor UpdateBatchExceptionStackTrace = Create(LogEvents.UpdateBatchExceptionStackTrace, Emoji.HotReload); public static readonly MessageDescriptor Capabilities = Create(LogEvents.Capabilities, Emoji.HotReload); public static readonly MessageDescriptor WaitingForFileChangeBeforeRestarting = Create("Waiting for a file to change before restarting ...", Emoji.Wait, LogLevel.Warning); public static readonly MessageDescriptor WatchingWithHotReload = Create("Watching with Hot Reload.", Emoji.Watch, LogLevel.Debug); @@ -202,7 +207,7 @@ public MessageDescriptor WithLevelWhen(LogLevel level, bool condition) public static readonly MessageDescriptor FileAdditionTriggeredReEvaluation = Create("File addition triggered re-evaluation: '{0}'.", Emoji.Watch, LogLevel.Debug); public static readonly MessageDescriptor ProjectChangeTriggeredReEvaluation = Create("Project change triggered re-evaluation: '{0}'.", Emoji.Watch, LogLevel.Debug); public static readonly MessageDescriptor ReEvaluationCompleted = Create("Re-evaluation completed.", Emoji.Watch, LogLevel.Debug); - public static readonly MessageDescriptor NoCSharpChangesToApply = Create("No C# changes to apply.", Emoji.Watch, LogLevel.Information); + public static readonly MessageDescriptor NoCSharpChangesToApply = Create("No C# or Razor changes to apply.", Emoji.Watch, LogLevel.Information); public static readonly MessageDescriptor Exited = Create("Exited", Emoji.Watch, LogLevel.Information); public static readonly MessageDescriptor ExitedWithUnknownErrorCode = Create("Exited with unknown error code", Emoji.Error, LogLevel.Error); public static readonly MessageDescriptor ExitedWithErrorCode = Create("Exited with error code {0}", Emoji.Error, LogLevel.Error); @@ -215,7 +220,6 @@ public MessageDescriptor WithLevelWhen(LogLevel level, bool condition) public static readonly MessageDescriptor TerminatingProcess = Create("Terminating process {0} ({1}).", Emoji.Watch, LogLevel.Debug); public static readonly MessageDescriptor FailedToSendSignalToProcess = Create("Failed to send {0} signal to process {1}: {2}", Emoji.Warning, LogLevel.Warning); public static readonly MessageDescriptor ErrorReadingProcessOutput = Create("Error reading {0} of process {1}: {2}", Emoji.Watch, LogLevel.Debug); - public static readonly MessageDescriptor StaticAssetsReloaded = Create("Static assets reloaded.", Emoji.HotReload, LogLevel.Information); public static readonly MessageDescriptor SendingStaticAssetUpdateRequest = Create(LogEvents.SendingStaticAssetUpdateRequest, Emoji.Default); public static readonly MessageDescriptor HotReloadCapabilities = Create("Hot reload capabilities: {0}.", Emoji.HotReload, LogLevel.Debug); public static readonly MessageDescriptor HotReloadSuspended = Create("Hot reload suspended. To continue hot reload, press \"Ctrl + R\".", Emoji.HotReload, LogLevel.Information); @@ -223,7 +227,6 @@ public MessageDescriptor WithLevelWhen(LogLevel level, bool condition) public static readonly MessageDescriptor RestartNeededToApplyChanges = Create("Restart is needed to apply the changes.", Emoji.HotReload, LogLevel.Information); public static readonly MessageDescriptor HotReloadEnabled = Create("Hot reload enabled. For a list of supported edits, see https://aka.ms/dotnet/hot-reload.", Emoji.HotReload, LogLevel.Information); public static readonly MessageDescriptor PressCtrlRToRestart = Create("Press Ctrl+R to restart.", Emoji.LightBulb, LogLevel.Information); - public static readonly MessageDescriptor HotReloadCanceledProcessExited = Create("Hot reload canceled because the process exited.", Emoji.HotReload, LogLevel.Debug); public static readonly MessageDescriptor ApplicationKind_BlazorHosted = Create("Application kind: BlazorHosted. '{0}' references BlazorWebAssembly project '{1}'.", Emoji.Default, LogLevel.Debug); public static readonly MessageDescriptor ApplicationKind_BlazorWebAssembly = Create("Application kind: BlazorWebAssembly.", Emoji.Default, LogLevel.Debug); public static readonly MessageDescriptor ApplicationKind_WebApplication = Create("Application kind: WebApplication.", Emoji.Default, LogLevel.Debug); diff --git a/src/BuiltInTools/dotnet-watch/Program.cs b/src/BuiltInTools/dotnet-watch/Program.cs index 476108f319c7..938865c9d367 100644 --- a/src/BuiltInTools/dotnet-watch/Program.cs +++ b/src/BuiltInTools/dotnet-watch/Program.cs @@ -158,8 +158,7 @@ private static bool TryFindProject(string searchBase, CommandLineOptions options // internal for testing internal async Task RunAsync() { - var isHotReloadEnabled = IsHotReloadEnabled(); - var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout(isHotReloadEnabled)); + var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout()); using var shutdownHandler = new ShutdownHandler(console, logger); @@ -182,7 +181,7 @@ internal async Task RunAsync() using var context = CreateContext(processRunner); - if (isHotReloadEnabled) + if (IsHotReloadEnabled()) { var watcher = new HotReloadDotNetWatcher(context, console, runtimeProcessLauncherFactory: null); await watcher.WatchAsync(shutdownHandler.CancellationToken); diff --git a/src/BuiltInTools/dotnet-watch/Watch/StaticFileHandler.cs b/src/BuiltInTools/dotnet-watch/Watch/StaticFileHandler.cs index dddba6cb2d41..18d51c043277 100644 --- a/src/BuiltInTools/dotnet-watch/Watch/StaticFileHandler.cs +++ b/src/BuiltInTools/dotnet-watch/Watch/StaticFileHandler.cs @@ -1,6 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Diagnostics; using Microsoft.Build.Graph; using Microsoft.DotNet.HotReload; using Microsoft.Extensions.Logging; @@ -11,6 +12,7 @@ internal sealed class StaticFileHandler(ILogger logger, ProjectNodeMap projectMa { public async ValueTask HandleFileChangesAsync(IReadOnlyList files, CancellationToken cancellationToken) { + var stopwatch = Stopwatch.StartNew(); var allFilesHandled = true; var refreshRequests = new Dictionary>(); var projectsWithoutRefreshServer = new HashSet(); @@ -65,7 +67,7 @@ public async ValueTask HandleFileChangesAsync(IReadOnlyList f await Task.WhenAll(tasks).WaitAsync(cancellationToken); - logger.Log(MessageDescriptor.StaticAssetsReloaded); + logger.Log(MessageDescriptor.StaticAssetsChangesApplied, stopwatch.ElapsedMilliseconds); return allFilesHandled; } diff --git a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadClientTests.cs b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadClientTests.cs index a58c43f7dcfe..7bba809b7657 100644 --- a/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadClientTests.cs +++ b/test/Microsoft.Extensions.DotNetDeltaApplier.Tests/HotReloadClientTests.cs @@ -38,43 +38,7 @@ public async ValueTask DisposeAsync() } [Fact] - public async Task ApplyManagedCodeUpdates_ProcessNotSuspended() - { - var moduleId = Guid.NewGuid(); - - var agent = new TestHotReloadAgent() - { - Capabilities = "Baseline AddMethodToExistingType AddStaticFieldToExistingType", - ApplyManagedCodeUpdatesImpl = updates => - { - Assert.Single(updates); - var update = updates.First(); - Assert.Equal(moduleId, update.ModuleId); - AssertEx.SequenceEqual([1, 2, 3], update.MetadataDelta); - } - }; - - await using var test = new Test(output, agent); - - var actualCapabilities = await test.Client.GetUpdateCapabilitiesAsync(CancellationToken.None); - AssertEx.SequenceEqual(["Baseline", "AddMethodToExistingType", "AddStaticFieldToExistingType", "AddExplicitInterfaceImplementation"], actualCapabilities); - - var update = new HotReloadManagedCodeUpdate( - moduleId: moduleId, - metadataDelta: [1, 2, 3], - ilDelta: [], - pdbDelta: [], - updatedTypes: [], - requiredCapabilities: ["Baseline"]); - - Assert.Equal(ApplyStatus.AllChangesApplied, await test.Client.ApplyManagedCodeUpdatesAsync([update], isProcessSuspended: false, CancellationToken.None)); - - Assert.Contains("[Debug] Writing capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType", test.AgentLogger.GetAndClearMessages()); - Assert.Contains("[Debug] Updates applied: 1 out of 1.", test.Logger.GetAndClearMessages()); - } - - [Fact] - public async Task ApplyManagedCodeUpdates_ProcessSuspended() + public async Task ApplyManagedCodeUpdates() { var moduleId = Guid.NewGuid(); @@ -98,18 +62,13 @@ public async Task ApplyManagedCodeUpdates_ProcessSuspended() var agentMessage = "[Debug] Writing capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType"; - Assert.Equal(ApplyStatus.AllChangesApplied, await test.Client.ApplyManagedCodeUpdatesAsync([update], isProcessSuspended: true, CancellationToken.None)); - - // emulate process being resumed: - await test.Client.PendingUpdates; + await await test.Client.ApplyManagedCodeUpdatesAsync([update], CancellationToken.None, CancellationToken.None); var clientMessages = test.Logger.GetAndClearMessages(); var agentMessages = test.AgentLogger.GetAndClearMessages(); - // agent log messages not reported to the client logger while the process is suspended: - Assert.Contains("[Debug] Sending update batch #0", clientMessages); - Assert.Contains("[Debug] Updates applied: 1 out of 1.", clientMessages); - Assert.Contains("[Debug] Update batch #0 completed.", clientMessages); + Assert.Contains("[Debug] " + string.Format(LogEvents.SendingUpdateBatch.Message, 0), clientMessages); + Assert.Contains("[Debug] " + string.Format(LogEvents.UpdateBatchCompleted.Message, 0), clientMessages); Assert.Contains(agentMessage, agentMessages); } @@ -135,9 +94,8 @@ public async Task ApplyManagedCodeUpdates_Failure() updatedTypes: [], requiredCapabilities: ["Baseline"]); - Assert.Equal(ApplyStatus.Failed, await test.Client.ApplyManagedCodeUpdatesAsync([update], isProcessSuspended: false, CancellationToken.None)); + await await test.Client.ApplyManagedCodeUpdatesAsync([update], CancellationToken.None, CancellationToken.None); - // agent log messages were reported to the agent logger: var agentMessages = test.AgentLogger.GetAndClearMessages(); Assert.Contains("[Error] The runtime failed to applying the change: Bug!", agentMessages); Assert.Contains("[Warning] Further changes won't be applied to this process.", agentMessages); diff --git a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs index 93d86edf07d6..e238049d1160 100644 --- a/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs +++ b/test/Microsoft.TemplateEngine.Cli.UnitTests/ParserTests/InstallTests.cs @@ -237,6 +237,5 @@ public void CommandExampleCanShowParentCommandsBeyondNew() ParseResult parseResult = rootCommand.Parse("dotnet new install source"); Assert.Equal("dotnet new install my-source", Example.For(parseResult).WithSubcommand().WithArguments("my-source")); } - } } diff --git a/test/dotnet-watch.Tests/Browser/BrowserTests.cs b/test/dotnet-watch.Tests/Browser/BrowserTests.cs index 17e21166bf3f..db850da520d2 100644 --- a/test/dotnet-watch.Tests/Browser/BrowserTests.cs +++ b/test/dotnet-watch.Tests/Browser/BrowserTests.cs @@ -111,7 +111,7 @@ await App.WaitUntilOutputContains(""" // valid edit: UpdateSourceFile(homePagePath, src => src.Replace("/* member placeholder */", "public int F() => 1;")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadSucceeded); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains($$""" 🧪 Received: {"type":"ReportDiagnostics","diagnostics":[]} diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index dac37bcc4fcd..03eadbda0ac8 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -108,7 +108,7 @@ public static unsafe void Print() UpdateSourceFile(Path.Combine(dependencyDir, "Foo.cs"), newSrc); await App.AssertOutputLineStartsWith("Changed!"); - await App.WaitUntilOutputContains($"dotnet watch 🔥 [App.WithDeps ({ToolsetInfo.CurrentTargetFramework})] Hot reload succeeded."); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); } [Theory] @@ -190,7 +190,7 @@ public static void Print() directoryBuildProps, src => src.Replace("BUILD_CONST_IN_PROPS", "")); - await App.WaitUntilOutputContains($"dotnet watch 🔥 [App.WithDeps ({ToolsetInfo.CurrentTargetFramework})] Hot reload succeeded."); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains("BUILD_CONST not set"); App.AssertOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); @@ -339,7 +339,7 @@ public async Task ProjectChange_GlobalUsings() """)); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadSucceeded, $"WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})"); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains(">>> System.Xml.Linq.XDocument"); @@ -439,7 +439,7 @@ public async Task AutoRestartOnRudeEdit(bool nonInteractive) // valid edit: UpdateSourceFile(programPath, src => src.Replace("public virtual void F() {}", "public virtual void F() { Console.WriteLine(1); }")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadSucceeded); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); } [Theory(Skip = "https://github.com/dotnet/sdk/issues/51469")] @@ -583,7 +583,7 @@ public async Task AutoRestartOnNoEffectEdit(bool nonInteractive) // valid edit: UpdateSourceFile(programPath, src => src.Replace("/* member placeholder */", "public void F() {}")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadSucceeded); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); } /// @@ -768,7 +768,7 @@ class AppUpdateHandler if (verbose) { - await App.WaitUntilOutputContains(MessageDescriptor.UpdatesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.UpdateBatchCompleted); } else { @@ -888,7 +888,7 @@ public async Task BlazorWasm(bool projectSpecifiesCapabilities) """; UpdateSourceFile(Path.Combine(testAsset.Path, "Pages", "Index.razor"), newSource); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadSucceeded, $"blazorwasm ({ToolsetInfo.CurrentTargetFramework})"); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); // check project specified capapabilities: if (projectSpecifiesCapabilities) @@ -995,21 +995,19 @@ public async Task Razor_Component_ScopedCssAndStaticAssets() """; UpdateSourceFile(scopedCssPath, newCss); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); + await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); App.AssertOutputContains(MessageDescriptor.SendingStaticAssetUpdateRequest.GetMessage("wwwroot/RazorClassLibrary.bundle.scp.css")); - App.AssertOutputContains(MessageDescriptor.StaticAssetsReloaded); - App.AssertOutputContains(MessageDescriptor.NoCSharpChangesToApply); App.Process.ClearOutput(); var cssPath = Path.Combine(testAsset.Path, "RazorApp", "wwwroot", "app.css"); UpdateSourceFile(cssPath, content => content.Replace("background-color: white;", "background-color: red;")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); + await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); App.AssertOutputContains(MessageDescriptor.SendingStaticAssetUpdateRequest.GetMessage("wwwroot/app.css")); - App.AssertOutputContains(MessageDescriptor.StaticAssetsReloaded); - App.AssertOutputContains(MessageDescriptor.NoCSharpChangesToApply); App.Process.ClearOutput(); } @@ -1041,10 +1039,8 @@ public async Task MauiBlazor() var razorPath = Path.Combine(testAsset.Path, "Components", "Pages", "Home.razor"); UpdateSourceFile(razorPath, content => content.Replace("Hello, world!", "Updated")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); - // TODO: Warning is currently reported because UpdateContent is not recognized - App.AssertOutputContains("Updates applied: 1 out of 1."); App.AssertOutputContains("Microsoft.AspNetCore.Components.HotReload.HotReloadManager.UpdateApplication"); App.Process.ClearOutput(); @@ -1052,20 +1048,18 @@ public async Task MauiBlazor() var cssPath = Path.Combine(testAsset.Path, "wwwroot", "css", "app.css"); UpdateSourceFile(cssPath, content => content.Replace("background-color: white;", "background-color: red;")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); - App.AssertOutputContains("Updates applied: 1 out of 1."); + await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); App.AssertOutputContains("Microsoft.AspNetCore.Components.WebView.StaticContentHotReloadManager.UpdateContent"); - App.AssertOutputContains("No C# changes to apply."); + App.AssertOutputContains(MessageDescriptor.NoCSharpChangesToApply); App.Process.ClearOutput(); // update scoped css: var scopedCssPath = Path.Combine(testAsset.Path, "Components", "Pages", "Counter.razor.css"); UpdateSourceFile(scopedCssPath, content => content.Replace("background-color: green", "background-color: red")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); - App.AssertOutputContains("Updates applied: 1 out of 1."); + await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); App.AssertOutputContains("Microsoft.AspNetCore.Components.WebView.StaticContentHotReloadManager.UpdateContent"); - App.AssertOutputContains("No C# changes to apply."); + App.AssertOutputContains(MessageDescriptor.NoCSharpChangesToApply); } // Test is timing out on .NET Framework: https://github.com/dotnet/sdk/issues/41669 @@ -1252,12 +1246,9 @@ public async Task Aspire_BuildError_ManualRestart() serviceSourcePath, serviceSource.Replace("Enumerable.Range(1, 5)", "Enumerable.Range(1, 10)")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); App.AssertOutputContains("Using Aspire process launcher."); - App.AssertOutputContains(MessageDescriptor.HotReloadSucceeded, $"WatchAspire.AppHost ({tfm})"); - App.AssertOutputContains(MessageDescriptor.HotReloadSucceeded, $"WatchAspire.ApiService ({tfm})"); - App.AssertOutputContains(MessageDescriptor.HotReloadSucceeded, $"WatchAspire.Web ({tfm})"); // Only one browser should be launched (dashboard). The child process shouldn't launch a browser. Assert.Equal(1, App.Process.Output.Count(line => line.StartsWith("dotnet watch ⌚ Launching browser: "))); @@ -1348,10 +1339,9 @@ public async Task Aspire_NoEffect_AutoRestart() // no-effect edit: UpdateSourceFile(webSourcePath, src => src.Replace("/* top-level placeholder */", "builder.Services.AddRazorComponents();")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #3"); - - App.AssertOutputContains(MessageDescriptor.ProjectsRestarted.GetMessage(1)); + await App.WaitUntilOutputContains(MessageDescriptor.ProjectsRestarted.GetMessage(1)); App.AssertOutputDoesNotContain("⚠"); // The process exited and should not participate in Hot Reload: @@ -1363,7 +1353,7 @@ public async Task Aspire_NoEffect_AutoRestart() // lambda body edit: UpdateSourceFile(webSourcePath, src => src.Replace("Hello world!", "")); - await App.WaitForOutputLineContaining(MessageDescriptor.HotReloadChangeHandled); + await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); App.AssertOutputContains($"dotnet watch 🕵️ [WatchAspire.Web ({tfm})] Updates applied."); App.AssertOutputDoesNotContain(MessageDescriptor.ProjectsRebuilt); App.AssertOutputDoesNotContain(MessageDescriptor.ProjectsRestarted); diff --git a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs index 81130fbc2092..9495719fe794 100644 --- a/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs +++ b/test/dotnet-watch.Tests/HotReload/RuntimeProcessLauncherTests.cs @@ -99,7 +99,7 @@ private RunningWatcher StartWatcher(TestAsset testAsset, string[] args, string? var reporter = new TestReporter(Logger); var loggerFactory = new LoggerFactory(reporter, LogLevel.Trace); var environmentOptions = TestOptions.GetEnvironmentOptions(workingDirectory ?? testAsset.Path, TestContext.Current.ToolsetUnderTest.DotNetHostPath, testAsset); - var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout(isHotReloadEnabled: true)); + var processRunner = new ProcessRunner(environmentOptions.GetProcessCleanupTimeout()); var program = Program.TryCreate( TestOptions.GetCommandLineOptions(["--verbose", ..args]), @@ -195,7 +195,8 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) var waitingForChanges = w.Reporter.RegisterSemaphore(MessageDescriptor.WaitingForChanges); - var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); + var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); + var projectsRestarted = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectsRestarted); var sessionStarted = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadSessionStarted); var projectBaselinesUpdated = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectsRebuilt); await launchCompletionA.Task; @@ -210,8 +211,8 @@ public async Task UpdateAndRudeEdit(TriggerEvent trigger) await MakeRudeEditChange(); - Log("Waiting for changed handled ..."); - await changeHandled.WaitAsync(w.ShutdownSource.Token); + Log("Waiting for projects restarted ..."); + await projectsRestarted.WaitAsync(w.ShutdownSource.Token); // Wait for project baselines to be updated, so that we capture the new solution snapshot // and further changes are treated as another update. @@ -330,8 +331,8 @@ public async Task UpdateAppliedToNewProcesses(bool sharedOutput) await using var w = StartWatcher(testAsset, ["--non-interactive", "--project", hostProject], workingDirectory); var waitingForChanges = w.Reporter.RegisterSemaphore(MessageDescriptor.WaitingForChanges); - var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); - var updatesApplied = w.Reporter.RegisterSemaphore(MessageDescriptor.UpdatesApplied); + var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); + var updatesApplied = w.Reporter.RegisterSemaphore(MessageDescriptor.UpdateBatchCompleted); var hasUpdateA = new SemaphoreSlim(initialCount: 0); var hasUpdateB = new SemaphoreSlim(initialCount: 0); @@ -420,7 +421,7 @@ public async Task HostRestart(UpdateLocation updateLocation) await using var w = StartWatcher(testAsset, args: ["--project", hostProject], workingDirectory); var waitingForChanges = w.Reporter.RegisterSemaphore(MessageDescriptor.WaitingForChanges); - var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); + var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); var restartNeeded = w.Reporter.RegisterSemaphore(MessageDescriptor.ApplyUpdate_ChangingEntryPoint); var restartRequested = w.Reporter.RegisterSemaphore(MessageDescriptor.RestartRequested); @@ -510,7 +511,7 @@ public async Task RudeEditInProjectWithoutRunningProcess() var waitingForChanges = w.Reporter.RegisterSemaphore(MessageDescriptor.WaitingForChanges); - var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); + var projectsRebuilt = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectsRebuilt); var sessionStarted = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadSessionStarted); var applyUpdateVerbose = w.Reporter.RegisterSemaphore(MessageDescriptor.ApplyUpdate_Verbose); @@ -534,8 +535,8 @@ public async Task RudeEditInProjectWithoutRunningProcess() [assembly: System.Reflection.AssemblyMetadata("TestAssemblyMetadata", "2")] """); - Log("Waiting for change handled ..."); - await changeHandled.WaitAsync(w.ShutdownSource.Token); + Log("Waiting for projects rebuilt ..."); + await projectsRebuilt.WaitAsync(w.ShutdownSource.Token); Log("Waiting for verbose rude edit reported ..."); await applyUpdateVerbose.WaitAsync(w.ShutdownSource.Token); @@ -601,7 +602,7 @@ public async Task IgnoredChange(bool isExisting, bool isIncluded, DirectoryKind await using var w = StartWatcher(testAsset, ["--no-exit"], workingDirectory); var waitingForChanges = w.Reporter.RegisterSemaphore(MessageDescriptor.WaitingForChanges); - var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); + var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); var ignoringChangeInHiddenDirectory = w.Reporter.RegisterSemaphore(MessageDescriptor.IgnoringChangeInHiddenDirectory); var ignoringChangeInExcludedFile = w.Reporter.RegisterSemaphore(MessageDescriptor.IgnoringChangeInExcludedFile); var fileAdditionTriggeredReEvaluation = w.Reporter.RegisterSemaphore(MessageDescriptor.FileAdditionTriggeredReEvaluation); @@ -663,7 +664,7 @@ public async Task ProjectAndSourceFileChange() var waitingForChanges = w.Reporter.RegisterSemaphore(MessageDescriptor.WaitingForChanges); - var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadChangeHandled); + var changeHandled = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); var hasUpdatedOutput = w.CreateCompletionSource(); w.Reporter.OnProcessOutput += line => @@ -721,7 +722,7 @@ public async Task ProjectAndSourceFileChange_AddProjectReference() var projectChangeTriggeredReEvaluation = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectChangeTriggeredReEvaluation); var projectsRebuilt = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectsRebuilt); var projectDependenciesDeployed = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectDependenciesDeployed); - var hotReloadSucceeded = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadSucceeded); + var managedCodeChangesApplied = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); var hasUpdatedOutput = w.CreateCompletionSource(); w.Reporter.OnProcessOutput += line => @@ -759,7 +760,7 @@ public async Task ProjectAndSourceFileChange_AddProjectReference() Assert.Equal(1, projectChangeTriggeredReEvaluation.CurrentCount); Assert.Equal(1, projectsRebuilt.CurrentCount); Assert.Equal(1, projectDependenciesDeployed.CurrentCount); - Assert.Equal(1, hotReloadSucceeded.CurrentCount); + Assert.Equal(1, managedCodeChangesApplied.CurrentCount); } [Fact] @@ -780,7 +781,7 @@ public async Task ProjectAndSourceFileChange_AddPackageReference() var projectChangeTriggeredReEvaluation = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectChangeTriggeredReEvaluation); var projectsRebuilt = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectsRebuilt); var projectDependenciesDeployed = w.Reporter.RegisterSemaphore(MessageDescriptor.ProjectDependenciesDeployed); - var hotReloadSucceeded = w.Reporter.RegisterSemaphore(MessageDescriptor.HotReloadSucceeded); + var managedCodeChangesApplied = w.Reporter.RegisterSemaphore(MessageDescriptor.ManagedCodeChangesApplied); var hasUpdatedOutput = w.CreateCompletionSource(); w.Reporter.OnProcessOutput += line => @@ -816,6 +817,6 @@ public async Task ProjectAndSourceFileChange_AddPackageReference() Assert.Equal(1, projectChangeTriggeredReEvaluation.CurrentCount); Assert.Equal(0, projectsRebuilt.CurrentCount); Assert.Equal(1, projectDependenciesDeployed.CurrentCount); - Assert.Equal(1, hotReloadSucceeded.CurrentCount); + Assert.Equal(1, managedCodeChangesApplied.CurrentCount); } } diff --git a/test/dotnet-watch.Tests/TestUtilities/TestOptions.cs b/test/dotnet-watch.Tests/TestUtilities/TestOptions.cs index fd846476e25b..9116bbecb0b5 100644 --- a/test/dotnet-watch.Tests/TestUtilities/TestOptions.cs +++ b/test/dotnet-watch.Tests/TestUtilities/TestOptions.cs @@ -15,7 +15,7 @@ public static int GetTestPort() public static readonly ProjectOptions ProjectOptions = GetProjectOptions([]); public static EnvironmentOptions GetEnvironmentOptions(string workingDirectory = "", string muxerPath = "", TestAsset? asset = null) - => new(workingDirectory, muxerPath, TimeSpan.Zero, IsPollingEnabled: true, TestFlags: TestFlags.RunningAsTest, TestOutput: asset != null ? asset.GetWatchTestOutputPath() : ""); + => new(workingDirectory, muxerPath, ProcessCleanupTimeout: null, IsPollingEnabled: true, TestFlags: TestFlags.RunningAsTest, TestOutput: asset != null ? asset.GetWatchTestOutputPath() : ""); public static CommandLineOptions GetCommandLineOptions(string[] args) => CommandLineOptions.Parse(args, NullLogger.Instance, TextWriter.Null, out _) ?? throw new InvalidOperationException(); From 0e1a803b17b716607ed345fbee0c774c3999ba39 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 17:45:02 +0000 Subject: [PATCH 226/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 55cdf2b54600..420eda04c7ea 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2d46a1f1682d..c1c7961ffae9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26078.119 - 10.0.4-servicing.26078.119 - 10.0.4-servicing.26078.119 - 10.0.4-servicing.26078.119 + 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.103 10.0.4 - 10.0.4-servicing.26078.119 + 10.0.4-servicing.26079.103 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26078.119 + 10.0.4-servicing.26079.103 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26078.119 + 10.0.4-servicing.26079.103 10.0.4 - 10.0.4-servicing.26078.119 - 10.0.4-servicing.26078.119 - 10.0.0-preview.26078.119 + 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.103 + 10.0.0-preview.26079.103 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26078-119 - 7.0.2-rc.7919 + 18.0.11-servicing-26079-103 + 7.0.2-rc.8003 10.0.104 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 10.0.0-preview.26078.119 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 2.0.0-preview.1.26078.119 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 10.0.0-preview.26079.103 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 2.0.0-preview.1.26079.103 2.2.4 - 10.0.0-beta.26078.119 - 10.0.0-beta.26078.119 - 10.0.0-beta.26078.119 - 10.0.0-beta.26078.119 - 10.0.0-beta.26078.119 - 10.0.0-beta.26078.119 + 10.0.0-beta.26079.103 + 10.0.0-beta.26079.103 + 10.0.0-beta.26079.103 + 10.0.0-beta.26079.103 + 10.0.0-beta.26079.103 + 10.0.0-beta.26079.103 10.0.4 10.0.4 - 10.0.4-servicing.26078.119 - 10.0.4-servicing.26078.119 - 10.0.0-beta.26078.119 - 10.0.0-beta.26078.119 + 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.103 + 10.0.0-beta.26079.103 + 10.0.0-beta.26079.103 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26078.119 + 14.0.104-servicing.26079.103 10.0.4 - 5.0.0-2.26078.119 - 5.0.0-2.26078.119 - 10.0.4-servicing.26078.119 + 5.0.0-2.26079.103 + 5.0.0-2.26079.103 + 10.0.4-servicing.26079.103 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26078.119 - 10.0.4-servicing.26078.119 - 18.0.1-release-26078-119 + 10.0.0-preview.26079.103 + 10.0.4-servicing.26079.103 + 18.0.1-release-26079-103 10.0.4 - 10.0.4-servicing.26078.119 + 10.0.4-servicing.26079.103 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26078.119 + 10.0.104-servicing.26079.103 10.0.104 - 10.0.104-servicing.26078.119 + 10.0.104-servicing.26079.103 10.0.104 10.0.104 - 10.0.104-servicing.26078.119 - 18.0.1-release-26078-119 - 18.0.1-release-26078-119 + 10.0.104-servicing.26079.103 + 18.0.1-release-26079-103 + 18.0.1-release-26079-103 3.2.4 10.0.4 - 10.0.4-servicing.26078.119 + 10.0.4-servicing.26079.103 10.0.4 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 - 7.0.2-rc.7919 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 + 7.0.2-rc.8003 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3abbe8e9837b..dbf490ef6533 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 - + https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - b57f2667e138c31d3f3efc39aa84e71337365ad3 + 7f774a3fe8e54a2b63f538feb853c96857f36811 diff --git a/global.json b/global.json index cb7c6b6e219f..3a353ddfa927 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26078.119", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26078.119", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.103", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From fadbc3ca28958417082b0c01c93919b4a7fda4be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 10:03:23 -0800 Subject: [PATCH 227/280] [release/10.0.3xx] Source code updates from dotnet/dotnet (#52585) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Donna Chen (BEYONDSOFT CONSULTING INC) Co-authored-by: Michael Yanni Co-authored-by: Marc Paine Co-authored-by: Nikolche Kolev Co-authored-by: Eric St. John --- .editorconfig | 3 + NuGet.config | 1 - eng/Publishing.props | 11 +- eng/Version.Details.props | 254 ++++++------ eng/Version.Details.xml | 376 +++++++++--------- eng/Versions.props | 2 +- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/tools.ps1 | 6 +- global.json | 6 +- .../Microsoft.CodeAnalysis.NetAnalyzers.sarif | 6 +- .../DisposeObjectsBeforeLosingScopeTests.cs | 4 +- src/RazorSdk/Tool/DiscoverCommand.cs | 5 +- src/RazorSdk/Tool/GenerateCommand.cs | 19 +- .../GivenAResolvePackageAssetsTask.cs | 14 + src/Workloads/Manifests/Directory.Build.props | 1 + .../Manifests/manifest-packages.csproj | 7 +- src/Workloads/VSInsertion/workloads.csproj | 110 ++++- .../ScopedCssIntegrationTests.cs | 4 +- ...ledPackage_LocalPackage.Linux.verified.txt | 2 +- ...alledPackage_LocalPackage.OSX.verified.txt | 2 +- ...dPackage_LocalPackage.Windows.verified.txt | 30 +- .../HotReload/ApplyDeltaTests.cs | 2 +- .../CompletionTests/DotnetCliSnapshotTests.cs | 2 +- 24 files changed, 498 insertions(+), 373 deletions(-) diff --git a/.editorconfig b/.editorconfig index 26b992500086..1caf766b86fe 100644 --- a/.editorconfig +++ b/.editorconfig @@ -512,6 +512,9 @@ dotnet_diagnostic.IDE0040.severity = warning [*.txt] insert_final_newline = false +[*.sarif] +insert_final_newline = false + # Verify settings [*.{received,verified}.{txt,xml,json,sh,zsh,nu,fish,ps1}] charset = "utf-8-bom" diff --git a/NuGet.config b/NuGet.config index 7e04985571cd..ff0d29fb990d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,6 @@ - diff --git a/eng/Publishing.props b/eng/Publishing.props index 802134fadee4..2369b1487145 100644 --- a/eng/Publishing.props +++ b/eng/Publishing.props @@ -43,10 +43,19 @@ - + + + + + + + + - - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 - 10.0.200-preview.25569.1 + + 10.0.0-preview.26076.108 + 18.3.0-preview-26076-108 + 18.3.0-preview-26076-108 + 7.3.0-preview.1.7708 + 10.0.300-alpha.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-preview.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 15.2.300-servicing.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-preview.7.25377.103 + 10.0.0-preview.26076.108 + 18.3.0-release-26076-108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 18.3.0-release-26076-108 + 18.3.0-release-26076-108 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 10.0.1-servicing.25569.105 10.0.1-servicing.25569.105 @@ -40,11 +93,12 @@ This file should be imported by eng/Versions.props 10.0.1-servicing.25569.105 10.0.1 10.0.1 - 10.0.0-beta.25569.105 2.0.0-preview.1.25569.105 2.2.1-beta.25569.105 10.0.1 10.0.1 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 10.0.1 10.0.1 10.0.1 @@ -61,11 +115,6 @@ This file should be imported by eng/Versions.props 10.0.1-servicing.25569.105 10.0.1 10.0.1-servicing.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 - 10.0.0-beta.25569.105 3.2.1-servicing.25569.105 10.0.1 10.0.1-servicing.25569.105 @@ -94,68 +143,48 @@ This file should be imported by eng/Versions.props 10.0.1 2.1.0 - - 10.0.0-preview.7.25377.103 - - 18.3.0-preview-25610-02 - 18.3.0-preview-25610-02 - - 15.1.200-servicing.25605.1 - - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - 5.3.0-2.25610.11 - - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - 7.1.0-preview.1.42 - - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 - 18.3.0-preview-25609-01 - - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 - 10.0.0-preview.25552.2 - - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 - 10.0.0-beta.25605.3 2.1.0-preview.25571.1 4.1.0-preview.25571.1 - + + $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildLocalizationPackageVersion) + $(MicrosoftBuildNuGetSdkResolverPackageVersion) + $(MicrosoftBuildTasksGitPackageVersion) + $(MicrosoftCodeAnalysisPackageVersion) + $(MicrosoftCodeAnalysisBuildClientPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) + $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) + $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) + $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDotNetArcadeSdkPackageVersion) + $(MicrosoftDotNetBuildTasksInstallersPackageVersion) + $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) + $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) + $(MicrosoftDotNetHelixSdkPackageVersion) + $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetXliffTasksPackageVersion) + $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftNetCompilersToolsetPackageVersion) + $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) + $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftSourceLinkAzureReposGitPackageVersion) + $(MicrosoftSourceLinkBitbucketGitPackageVersion) + $(MicrosoftSourceLinkCommonPackageVersion) + $(MicrosoftSourceLinkGitHubPackageVersion) + $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAuthoringTemplateVerifierPackageVersion) $(MicrosoftTemplateEngineEdgePackageVersion) @@ -165,6 +194,24 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateEngineUtilsPackageVersion) $(MicrosoftTemplateSearchCommonPackageVersion) $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) + $(MicrosoftTestPlatformBuildPackageVersion) + $(MicrosoftTestPlatformCLIPackageVersion) + $(NuGetBuildTasksPackageVersion) + $(NuGetBuildTasksConsolePackageVersion) + $(NuGetBuildTasksPackPackageVersion) + $(NuGetCommandLineXPlatPackageVersion) + $(NuGetCommandsPackageVersion) + $(NuGetCommonPackageVersion) + $(NuGetConfigurationPackageVersion) + $(NuGetCredentialsPackageVersion) + $(NuGetDependencyResolverCorePackageVersion) + $(NuGetFrameworksPackageVersion) + $(NuGetLibraryModelPackageVersion) + $(NuGetLocalizationPackageVersion) + $(NuGetPackagingPackageVersion) + $(NuGetProjectModelPackageVersion) + $(NuGetProtocolPackageVersion) + $(NuGetVersioningPackageVersion) $(dotnetdevcertsPackageVersion) $(dotnetuserjwtsPackageVersion) @@ -190,11 +237,12 @@ This file should be imported by eng/Versions.props $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreTestHostPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftBuildTasksGitPackageVersion) $(MicrosoftDeploymentDotNetReleasesPackageVersion) $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) @@ -211,11 +259,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCorePlatformsPackageVersion) - $(MicrosoftSourceLinkAzureReposGitPackageVersion) - $(MicrosoftSourceLinkBitbucketGitPackageVersion) - $(MicrosoftSourceLinkCommonPackageVersion) - $(MicrosoftSourceLinkGitHubPackageVersion) - $(MicrosoftSourceLinkGitLabPackageVersion) $(MicrosoftWebXdtPackageVersion) $(MicrosoftWin32SystemEventsPackageVersion) $(MicrosoftWindowsDesktopAppInternalPackageVersion) @@ -244,61 +287,6 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) - - $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) - - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildLocalizationPackageVersion) - - $(MicrosoftFSharpCompilerPackageVersion) - - $(MicrosoftCodeAnalysisPackageVersion) - $(MicrosoftCodeAnalysisBuildClientPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) - $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) - $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) - $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftNetCompilersToolsetPackageVersion) - $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - - $(MicrosoftBuildNuGetSdkResolverPackageVersion) - $(NuGetBuildTasksPackageVersion) - $(NuGetBuildTasksConsolePackageVersion) - $(NuGetBuildTasksPackPackageVersion) - $(NuGetCommandLineXPlatPackageVersion) - $(NuGetCommandsPackageVersion) - $(NuGetCommonPackageVersion) - $(NuGetConfigurationPackageVersion) - $(NuGetCredentialsPackageVersion) - $(NuGetDependencyResolverCorePackageVersion) - $(NuGetFrameworksPackageVersion) - $(NuGetLibraryModelPackageVersion) - $(NuGetLocalizationPackageVersion) - $(NuGetPackagingPackageVersion) - $(NuGetProjectModelPackageVersion) - $(NuGetProtocolPackageVersion) - $(NuGetVersioningPackageVersion) - - $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftTestPlatformBuildPackageVersion) - $(MicrosoftTestPlatformCLIPackageVersion) - - $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) - $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - - $(MicrosoftDotNetArcadeSdkPackageVersion) - $(MicrosoftDotNetBuildTasksInstallersPackageVersion) - $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) - $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) - $(MicrosoftDotNetHelixSdkPackageVersion) - $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetXliffTasksPackageVersion) - $(MicrosoftDotNetXUnitExtensionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7592ec421964..e8d4d98820b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/templating - 069bda6132d6ac2134cc9b26d651ccb825ff212d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/msbuild - 2960e90f194e80f8f664ac573d456058bc4f5cd9 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/fsharp - 89d788641914c5d0b87fddfa11f4df0b5cfaa73d + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/nuget/nuget.client - b5efdd1f17df11700c9383def6ece79a40218ccd + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/microsoft/vstest - bbee830b0ef18eb5b4aa5daee65ae35a34f8c132 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/razor - 191feab170b690f6a4923072d1b6f6e00272d8a7 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd @@ -514,43 +514,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef - - https://github.com/dotnet/roslyn - 46a48b8c1dfce7c35da115308bedd6a5954fd78a + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - - https://github.com/dotnet/arcade - 774a2ef8d2777c50d047d6776ced33260822cad6 + + https://github.com/dotnet/dotnet + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 2b40b0c484ac..bdd579abb852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,7 +6,7 @@ 10 0 - 2 + 3 00 + + + @@ -94,13 +95,82 @@ - + + + <_ManifestProjectFiles Include="../Manifests/**/*.proj" Exclude="../Manifests/**/*.Transport.*/*.proj" /> + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -111,7 +181,35 @@ UseHardlinksIfPossible="true" /> - + + + + + + + + + + + + + + + diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs index 6155a3498987..39b29f46f052 100644 --- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs +++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/ScopedCssIntegrationTests.cs @@ -92,7 +92,7 @@ public void CanOverrideScopeIdentifiers() var scoped = Path.Combine(intermediateOutputPath, "scopedcss", "Styles", "Pages", "Counter.rz.scp.css"); new FileInfo(scoped).Should().Exist(); new FileInfo(scoped).Should().Contain("b-overridden"); - var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generated = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components", "Pages", "Counter_razor.g.cs"); new FileInfo(generated).Should().Exist(); new FileInfo(generated).Should().Contain("b-overridden"); new FileInfo(Path.Combine(intermediateOutputPath, "scopedcss", "Components", "Pages", "Index.razor.rz.scp.css")).Should().NotExist(); @@ -318,7 +318,7 @@ public void Build_RemovingScopedCssAndBuilding_UpdatesGeneratedCodeAndBundle() new FileInfo(generatedBundle).Should().Exist(); var generatedProjectBundle = Path.Combine(intermediateOutputPath, "scopedcss", "projectbundle", "ComponentApp.bundle.scp.css"); new FileInfo(generatedProjectBundle).Should().Exist(); - var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components_Pages_Counter_razor.g.cs"); + var generatedCounter = Path.Combine(intermediateOutputPath, "generated", "Microsoft.CodeAnalysis.Razor.Compiler", "Microsoft.NET.Sdk.Razor.SourceGenerators.RazorSourceGenerator", "Components", "Pages", "Counter_razor.g.cs"); new FileInfo(generatedCounter).Should().Exist(); var componentThumbprint = FileThumbPrint.Create(generatedCounter); diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt index 948efa0f8d7b..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Linux.verified.txt @@ -77,10 +77,10 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt index 948efa0f8d7b..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.OSX.verified.txt @@ -77,10 +77,10 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset diff --git a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt index 8f48b106823e..ec398561bfac 100644 --- a/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt +++ b/test/dotnet-new.IntegrationTests/Approvals/DotnetNewDetailsTest.CanDisplayDetails_InstalledPackage_LocalPackage.Windows.verified.txt @@ -22,24 +22,24 @@ TestAssets.PostActions.AddJsonProperty.WithE... TestAssets.PostActions.AddJsonProperty.WithExistingProject.ExistingProject Test Asset TestAssets.PostActions.AddJsonProperty.WithE... TestAssets.PostActions.AddJsonProperty.WithExistingProject.MyProject Test Asset TestAssets.PostActions.AddJsonProperty.WithS... TestAssets.PostActions.AddJsonProperty.WithSourceNameChangeInJson Test Asset - TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.BasicWithFiles Test Asset TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.Basic Test Asset + TestAssets.PostActions.AddPackageReference.B... TestAssets.PostActions.AddPackageReference.BasicWithFiles Test Asset TestAssets.PostActions.AddProjectReference.B... TestAssets.PostActions.AddProjectReference.Basic Test Asset - TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.ExistingWithRename Test Asset TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.Existing Test Asset + TestAssets.PostActions.AddProjectReference.E... TestAssets.PostActions.AddProjectReference.ExistingWithRename Test Asset + TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.Basic Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicInSolutionRoot Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicWithFiles Test Asset TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.BasicWithIndexes Test Asset - TestAssets.PostActions.AddProjectToSolution.... TestAssets.PostActions.AddProjectToSolution.Basic Test Asset TestAssets.PostActions.Instructions.Basic TestAssets.PostActions.Instructions.Basic Test Asset - TestAssets.PostActions.RestoreNuGet.BasicWit... TestAssets.PostActions.RestoreNuGet.BasicWithFiles Test Asset TestAssets.PostActions.RestoreNuGet.Basic TestAssets.PostActions.RestoreNuGet.Basic Test Asset - TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.BasicWit... TestAssets.PostActions.RestoreNuGet.BasicWithFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePath Test Asset - TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourcePathFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPath Test Asset - TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPathFiles Test Asset + TestAssets.PostActions.RestoreNuGet.CustomSo... TestAssets.PostActions.RestoreNuGet.CustomSourceTargetPathFiles Test Asset TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPath Test Asset + TestAssets.PostActions.RestoreNuGet.CustomTa... TestAssets.PostActions.RestoreNuGet.CustomTargetPathFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Ma... TestAssets.PostActions.RestoreNuGet.Files_MatchSpecifiedFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Mi... TestAssets.PostActions.RestoreNuGet.Files_MismatchSpecifiedFiles Test Asset TestAssets.PostActions.RestoreNuGet.Files_Pa... TestAssets.PostActions.RestoreNuGet.Files_PatternWithFileName Test Asset @@ -48,16 +48,16 @@ TestAssets.PostActions.RestoreNuGet.Files_Su... TestAssets.PostActions.RestoreNuGet.Files_SupportSemicolonDelimitedList Test Asset TestAssets.PostActions.RestoreNuGet.Invalid TestAssets.PostActions.RestoreNuGet.Invalid Test Asset TestAssets.PostActions.RestoreNuGet.Invalid.... TestAssets.PostActions.RestoreNuGet.Invalid.ContinueOnError Test Asset - TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRenameFiles Test Asset TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRename Test Asset + TestAssets.PostActions.RestoreNuGet.SourceRe... TestAssets.PostActions.RestoreNuGet.SourceRenameFiles Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsFiles Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsPrimaryOutputs Test Asset - TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames2 Test Asset TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames Test Asset + TestAssets.PostActions.RestoreNuGet.TwoProje... TestAssets.PostActions.RestoreNuGet.TwoProjectsWithSourceRenames2 Test Asset TestAssets.PostActions.RunScript.Basic TestAssets.PostActions.RunScript.Basic Test Asset TestAssets.PostActions.RunScript.DoNotRedirect TestAssets.PostActions.RunScript.DoNotRedirect Test Asset - TestAssets.PostActions.RunScript.RedirectOnE... TestAssets.PostActions.RunScript.RedirectOnError Test Asset TestAssets.PostActions.RunScript.Redirect TestAssets.PostActions.RunScript.Redirect Test Asset + TestAssets.PostActions.RunScript.RedirectOnE... TestAssets.PostActions.RunScript.RedirectOnError Test Asset TestAssets.PostActions.UnknownPostAction TestAssets.PostActions.UnknownPostAction Test Asset TemplateConditionalProcessing TestAssets.TemplateConditionalProcessing Test Asset Basic FSharp template-grouping item Test Asset C#,F# @@ -77,28 +77,28 @@ TestAssets.TemplateWithFileRenameDate TestAssets.TemplateWithFileRenameDate Test Asset TemplateWithJoinAndFolderRename TestAssets.TemplateWithJoinAndFolderRename Test Asset name TestAssets.TemplateWithLocalization project Test Asset C# + TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset + TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesInducedOverlap Test Asset TemplateWithMultipleRenamesOnSameFileHandles... TestAssets.TemplateWithMultipleRenamesOnSameFileHandlesOverlap Test Asset - TemplateWithMultipleRenamesOnSameFile TestAssets.TemplateWithMultipleRenamesOnSameFile Test Asset - TemplateWithMultiValueChoice TestAssets.TemplateWithMultiValueChoice Test Asset TemplateWithParamsSharingPrefix TestAssets.TemplateWithParamsSharingPrefix project Test Asset TemplateWithPlaceholderFiles TestAssets.TemplateWithPlaceholderFiles Test Asset TemplateWithPortsAndCoalesce TestAssets.TemplateWithPortsAndCoalesce Test Asset - TemplateWithPreferDefaultNameButNoDefaultName TestAssets.TemplateWithPreferDefaultNameButNoDefaultName project Test Asset TemplateWithPreferDefaultName TestAssets.TemplateWithPreferDefaultName project Test Asset + TemplateWithPreferDefaultNameButNoDefaultName TestAssets.TemplateWithPreferDefaultNameButNoDefaultName project Test Asset TemplateWithRegexMatchMacro TestAssets.TemplateWithRegexMatchMacro Test Asset TemplateWithRenames TestAssets.TemplateWithRenames Test Asset TemplateWithRequiredParameters TestAssets.TemplateWithRequiredParameters Test Asset TemplateWithSourceBasedRenames TestAssets.TemplateWithSourceBasedRenames Test Asset + TemplateWithSourceName TestAssets.TemplateWithSourceName Test Asset TemplateWithSourceNameAndCustomSourceAndTarg... TestAssets.TemplateWithSourceNameAndCustomSourceAndTargetPaths Test Asset TemplateWithSourceNameAndCustomSourcePath TestAssets.TemplateWithSourceNameAndCustomSourcePath Test Asset TemplateWithSourceNameAndCustomTargetPath TestAssets.TemplateWithSourceNameAndCustomTargetPath Test Asset TemplateWithSourceNameInTargetPathGetsRenamed TestAssets.TemplateWithSourceNameInTargetPathGetsRenamed Test Asset - TemplateWithSourceName TestAssets.TemplateWithSourceName Test Asset TemplateWithSourcePathOutsideConfigRoot TestAssets.TemplateWithSourcePathOutsideConfigRoot Test Asset TemplateWithTags TestAssets.TemplateWithTags project Test Asset C# TemplateWithUnspecifiedSourceName TestAssets.TemplateWithUnspecifiedSourceName Test Asset TemplateWithValueForms TestAssets.TemplateWithValueForms Test Asset - Basic Template Without Exclude withoutexclude project Basic Template With Exclude withexclude project + Basic Template Without Exclude withoutexclude project \ No newline at end of file diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 03eadbda0ac8..ee278251ebce 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Watch.UnitTests { public class ApplyDeltaTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] public async Task AddSourceFile() { Log("AddSourceFile started"); diff --git a/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs b/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs index 14d12552b370..4b553ae7d33d 100644 --- a/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs +++ b/test/dotnet.Tests/CompletionTests/DotnetCliSnapshotTests.cs @@ -8,7 +8,7 @@ namespace Microsoft.DotNet.Cli.Completions.Tests; public class DotnetCliSnapshotTests(ITestOutputHelper log) : SdkTest(log) { [MemberData(nameof(TestCases))] - [Theory] + [Theory(Skip = "https://github.com/dotnet/sdk/issues/48817")] public async Task VerifyCompletions(string shellName) { var provider = CompletionsCommandParser.ShellProviders[shellName]; From 28084a73cf33989c72804fe037d960a0a2361964 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 14:54:25 -0800 Subject: [PATCH 228/280] [automated] Merge branch 'release/10.0.2xx' => 'release/10.0.3xx' (#52588) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Marc Paine Co-authored-by: dotnet-maestro[bot] Co-authored-by: DonnaChen888 Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Youssef Victor Co-authored-by: mariam-abdulla Co-authored-by: Mariam Abdullah <122357303+mariam-abdulla@users.noreply.github.com> Co-authored-by: Nikolche Kolev Co-authored-by: Eric St. John Co-authored-by: Chet Husk Co-authored-by: Tomáš Matoušek Co-authored-by: Michael Yanni --- .../HotReload/IncrementalMSBuildWorkspace.cs | 20 ++++++++- .../MicrosoftTestingPlatformTestCommand.cs | 23 ++++++++-- .../Test/MTP/Terminal/TerminalTestReporter.cs | 43 +++++++++---------- .../Terminal/TerminalTestReporterOptions.cs | 26 ++++++++--- .../TestProgressStateAwareTerminal.cs | 15 +++---- .../Test/MTP/TestApplicationHandler.cs | 6 ++- src/RazorSdk/Tool/GenerateCommand.cs | 1 - .../HotReload/ApplyDeltaTests.cs | 2 +- 8 files changed, 92 insertions(+), 44 deletions(-) diff --git a/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs b/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs index 2fc7e54a9b34..1581a57f3c66 100644 --- a/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs +++ b/src/BuiltInTools/Watch/HotReload/IncrementalMSBuildWorkspace.cs @@ -3,6 +3,7 @@ using System.Collections.Immutable; using System.Diagnostics; +using System.Reflection; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.ExternalAccess.HotReload.Api; using Microsoft.CodeAnalysis.Host.Mef; @@ -76,7 +77,7 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok continue; } - newSolution = HotReloadService.WithProjectInfo(newSolution, ProjectInfo.Create( + newSolution = HotReloadService.WithProjectInfo(newSolution, WithChecksumAlgorithm(ProjectInfo.Create( oldProjectId, newProjectInfo.Version, newProjectInfo.Name, @@ -93,7 +94,8 @@ public async Task UpdateProjectConeAsync(string rootProjectPath, CancellationTok MapDocuments(oldProjectId, newProjectInfo.AdditionalDocuments), isSubmission: false, hostObjectType: null, - outputRefFilePath: newProjectInfo.OutputRefFilePath) + outputRefFilePath: newProjectInfo.OutputRefFilePath), + GetChecksumAlgorithm(newProjectInfo)) .WithAnalyzerConfigDocuments(MapDocuments(oldProjectId, newProjectInfo.AnalyzerConfigDocuments)) .WithCompilationOutputInfo(newProjectInfo.CompilationOutputInfo)); } @@ -122,6 +124,20 @@ ImmutableArray MapDocuments(ProjectId mappedProjectId, IReadOnlyLi }).ToImmutableArray(); } + // TODO: remove + // workaround for https://github.com/dotnet/roslyn/pull/82051 + + private static MethodInfo? s_withChecksumAlgorithm; + private static PropertyInfo? s_getChecksumAlgorithm; + + private static ProjectInfo WithChecksumAlgorithm(ProjectInfo info, SourceHashAlgorithm algorithm) + => (ProjectInfo)(s_withChecksumAlgorithm ??= typeof(ProjectInfo).GetMethod("WithChecksumAlgorithm", BindingFlags.NonPublic | BindingFlags.Instance)!) + .Invoke(info, [algorithm])!; + + private static SourceHashAlgorithm GetChecksumAlgorithm(ProjectInfo info) + => (SourceHashAlgorithm)(s_getChecksumAlgorithm ??= typeof(ProjectInfo).GetProperty("ChecksumAlgorithm", BindingFlags.NonPublic | BindingFlags.Instance)!) + .GetValue(info)!; + public async ValueTask UpdateFileContentAsync(IEnumerable changedFiles, CancellationToken cancellationToken) { var updatedSolution = CurrentSolution; diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs index 63d307b39fd6..2883069e62e3 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs @@ -80,7 +80,13 @@ private int RunInternal(ParseResult parseResult, bool isHelp) actionQueue.EnqueueCompleted(); // Don't inline exitCode variable. We want to always call WaitAllActions first. var exitCode = actionQueue.WaitAllActions(); - exitCode = _output.HasHandshakeFailure ? ExitCode.GenericFailure : exitCode; + + // If all test apps exited with 0 exit code, but we detected that handshake didn't happen correctly, map that to generic failure. + if (exitCode == ExitCode.Success && _output.HasHandshakeFailure) + { + exitCode = ExitCode.GenericFailure; + } + if (exitCode == ExitCode.Success && parseResult.HasOption(definition.MinimumExpectedTestsOption) && parseResult.GetValue(definition.MinimumExpectedTestsOption) is { } minimumExpectedTests && @@ -105,12 +111,23 @@ private void InitializeOutput(int degreeOfParallelism, ParseResult parseResult, // TODO: Replace this with proper CI detection that we already have in telemetry. https://github.com/microsoft/testfx/issues/5533#issuecomment-2838893327 bool inCI = string.Equals(Environment.GetEnvironmentVariable("TF_BUILD"), "true", StringComparison.OrdinalIgnoreCase) || string.Equals(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), "true", StringComparison.OrdinalIgnoreCase); + AnsiMode ansiMode = AnsiMode.AnsiIfPossible; + if (noAnsi) + { + // User explicitly specified --no-ansi. + // We should respect that. + ansiMode = AnsiMode.NoAnsi; + } + else if (inCI) + { + ansiMode = AnsiMode.SimpleAnsi; + } + _output = new TerminalTestReporter(console, new TerminalTestReporterOptions() { ShowPassedTests = showPassedTests, ShowProgress = !noProgress, - UseAnsi = !noAnsi, - UseCIAnsi = inCI, + AnsiMode = ansiMode, ShowAssembly = true, ShowAssemblyStartAndComplete = true, MinimumExpectedTests = parseResult.GetValue(definition.MinimumExpectedTestsOption), diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs index 3ce010a078f0..ca8ea35e2d57 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporter.cs @@ -1,6 +1,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Collections.Concurrent; +using System.Diagnostics; using System.Globalization; using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; @@ -64,36 +65,34 @@ internal sealed partial class TerminalTestReporter : IDisposable public TerminalTestReporter(IConsole console, TerminalTestReporterOptions options) { _options = options; - TestProgressStateAwareTerminal terminalWithProgress; + bool showProgress = _options.ShowProgress; - // When not writing to ANSI we write the progress to screen and leave it there so we don't want to write it more often than every few seconds. - int nonAnsiUpdateCadenceInMs = 3_000; - // When writing to ANSI we update the progress in place and it should look responsive so we update every half second, because we only show seconds on the screen, so it is good enough. - int ansiUpdateCadenceInMs = 500; - if (!_options.UseAnsi) + ITerminal terminal; + if (_options.AnsiMode == AnsiMode.SimpleAnsi) { - terminalWithProgress = new TestProgressStateAwareTerminal(new NonAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: false, updateEvery: nonAnsiUpdateCadenceInMs); + // We are told externally that we are in CI, use simplified ANSI mode. + terminal = new SimpleAnsiTerminal(console); + showProgress = false; } else { - if (_options.UseCIAnsi) - { - // We are told externally that we are in CI, use simplified ANSI mode. - terminalWithProgress = new TestProgressStateAwareTerminal(new SimpleAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: true, updateEvery: nonAnsiUpdateCadenceInMs); - } - else + // We are not in CI, or in CI non-compatible with simple ANSI, autodetect terminal capabilities + // Autodetect. + (bool consoleAcceptsAnsiCodes, bool _, uint? originalConsoleMode) = NativeMethods.QueryIsScreenAndTryEnableAnsiColorCodes(); + _originalConsoleMode = originalConsoleMode; + + bool useAnsi = _options.AnsiMode switch { - // We are not in CI, or in CI non-compatible with simple ANSI, autodetect terminal capabilities - // Autodetect. - (bool consoleAcceptsAnsiCodes, bool _, uint? originalConsoleMode) = NativeMethods.QueryIsScreenAndTryEnableAnsiColorCodes(); - _originalConsoleMode = originalConsoleMode; - terminalWithProgress = consoleAcceptsAnsiCodes - ? new TestProgressStateAwareTerminal(new AnsiTerminal(console, _options.BaseDirectory), _options.ShowProgress, writeProgressImmediatelyAfterOutput: true, updateEvery: ansiUpdateCadenceInMs) - : new TestProgressStateAwareTerminal(new NonAnsiTerminal(console), _options.ShowProgress, writeProgressImmediatelyAfterOutput: false, updateEvery: nonAnsiUpdateCadenceInMs); - } + AnsiMode.NoAnsi => false, + AnsiMode.AnsiIfPossible => consoleAcceptsAnsiCodes, + _ => throw new UnreachableException(), + }; + + showProgress = showProgress && useAnsi; + terminal = useAnsi ? new AnsiTerminal(console, _options.BaseDirectory) : new NonAnsiTerminal(console); } - _terminalWithProgress = terminalWithProgress; + _terminalWithProgress = new TestProgressStateAwareTerminal(terminal, showProgress); } public void TestExecutionStarted(DateTimeOffset testStartTime, int workerCount, bool isDiscovery, bool isHelp, bool isRetry) diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs index ebce31bfc35d..7345d637aca4 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TerminalTestReporterOptions.cs @@ -31,7 +31,8 @@ internal sealed class TerminalTestReporterOptions public int MinimumExpectedTests { get; init; } /// - /// Gets a value indicating whether we should write the progress periodically to screen. When ANSI is allowed we update the progress as often as we can. When ANSI is not allowed we update it every 3 seconds. + /// Gets a value indicating whether we should write the progress periodically to screen. When ANSI is allowed we update the progress as often as we can. + /// When ANSI is not allowed we never have progress. /// public bool ShowProgress { get; init; } @@ -41,13 +42,26 @@ internal sealed class TerminalTestReporterOptions public bool ShowActiveTests { get; init; } /// - /// Gets a value indicating whether we should use ANSI escape codes or disable them. When true the capabilities of the console are autodetected. + /// Gets a value indicating the ANSI mode. /// - public bool UseAnsi { get; init; } + public AnsiMode AnsiMode { get; init; } +} + +internal enum AnsiMode +{ + /// + /// Disable ANSI escape codes. + /// + NoAnsi, + + /// + /// Use simplified ANSI renderer, which colors output, but does not move cursor. + /// This is used in compatible CI environments. + /// + SimpleAnsi, /// - /// Gets a value indicating whether we are running in compatible CI, and should use simplified ANSI renderer, which colors output, but does not move cursor. - /// Setting to false will disable this option. + /// Enable ANSI escape codes, including cursor movement, when the capabilities of the console allow it. /// - public bool UseCIAnsi { get; init; } + AnsiIfPossible, } diff --git a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs index 4b1deb703e3b..3a7fa52aa96d 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/Terminal/TestProgressStateAwareTerminal.cs @@ -6,7 +6,7 @@ namespace Microsoft.DotNet.Cli.Commands.Test.Terminal; /// /// Terminal that updates the progress in place when progress reporting is enabled. /// -internal sealed partial class TestProgressStateAwareTerminal(ITerminal terminal, bool showProgress, bool writeProgressImmediatelyAfterOutput, int updateEvery) : IDisposable +internal sealed partial class TestProgressStateAwareTerminal(ITerminal terminal, bool showProgress) : IDisposable { /// /// A cancellation token to signal the rendering thread that it should exit. @@ -20,8 +20,6 @@ internal sealed partial class TestProgressStateAwareTerminal(ITerminal terminal, private readonly ITerminal _terminal = terminal; private readonly bool _showProgress = showProgress; - private readonly bool _writeProgressImmediatelyAfterOutput = writeProgressImmediatelyAfterOutput; - private readonly int _updateEvery = updateEvery; private TestProgressState?[] _progressItems = []; /// @@ -37,7 +35,11 @@ private void ThreadProc() { try { - while (!_cts.Token.WaitHandle.WaitOne(_updateEvery)) + // When writing to ANSI, we update the progress in place and it should look responsive so we + // update every half second, because we only show seconds on the screen, so it is good enough. + // When writing to non-ANSI, we never show progress as the output can get long and messy. + const int AnsiUpdateCadenceInMs = 500; + while (!_cts.Token.WaitHandle.WaitOne(AnsiUpdateCadenceInMs)) { lock (_lock) { @@ -118,10 +120,7 @@ internal void WriteToTerminal(Action write) _terminal.StartUpdate(); _terminal.EraseProgress(); write(_terminal); - if (_writeProgressImmediatelyAfterOutput) - { - _terminal.RenderProgress(_progressItems); - } + _terminal.RenderProgress(_progressItems); } finally { diff --git a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs index 8db706d7c382..9735d0ab72b2 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/TestApplicationHandler.cs @@ -15,6 +15,7 @@ internal sealed class TestApplicationHandler private readonly Dictionary _testSessionEventCountPerSessionUid = new(); private (string? TargetFramework, string? Architecture, string ExecutionId)? _handshakeInfo; + private bool _receivedTestHostHandshake; public TestApplicationHandler(TerminalTestReporter output, TestModule module, TestOptions options) { @@ -62,6 +63,7 @@ internal void OnHandshakeReceived(HandshakeMessage handshakeMessage, bool gotSup // https://github.com/microsoft/testfx/blob/2a9a353ec2bb4ce403f72e8ba1f29e01e7cf1fd4/src/Platform/Microsoft.Testing.Platform/Hosts/CommonTestHost.cs#L87-L97 if (hostType == "TestHost") { + _receivedTestHostHandshake = true; // AssemblyRunStarted counts "retry count", and writes to terminal "(Try ) Running tests from " // So, we want to call it only for test host, and not for test host controller (or orchestrator, if in future it will handshake as well) // Calling it for both test host and test host controllers means we will count retries incorrectly, and will messages twice. @@ -263,8 +265,10 @@ internal bool HasMismatchingTestSessionEventCount() internal void OnTestProcessExited(int exitCode, string outputData, string errorData) { - if (_handshakeInfo.HasValue) + if (_receivedTestHostHandshake && _handshakeInfo.HasValue) { + // If we received a handshake from TestHostController but not from TestHost, + // call HandshakeFailure instead of AssemblyRunCompleted _output.AssemblyRunCompleted(_handshakeInfo.Value.ExecutionId, exitCode, outputData, errorData); } else diff --git a/src/RazorSdk/Tool/GenerateCommand.cs b/src/RazorSdk/Tool/GenerateCommand.cs index d76d49b0eb10..ee542977d8d8 100644 --- a/src/RazorSdk/Tool/GenerateCommand.cs +++ b/src/RazorSdk/Tool/GenerateCommand.cs @@ -5,7 +5,6 @@ using System.Collections.Immutable; using System.Diagnostics; -using System.Threading; using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis.CSharp; using Microsoft.NET.Sdk.Razor.Tool.CommandLineUtils; diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index ee278251ebce..709f3fbf206d 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -73,7 +73,7 @@ public static void Print() App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); } - [Fact] + [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] public async Task ProjectChange_UpdateDirectoryBuildPropsThenUpdateSource() { var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") From 9e8c04c1935476993c8dbb095df0c91455729a5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Jan 2026 01:05:57 +0000 Subject: [PATCH 229/280] Update dependencies --- NuGet.config | 2 +- eng/Version.Details.props | 126 ++++++------ eng/Version.Details.xml | 392 +++++++++++++++++++------------------- global.json | 4 +- 4 files changed, 262 insertions(+), 262 deletions(-) diff --git a/NuGet.config b/NuGet.config index 420eda04c7ea..eca87006f0f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c1c7961ffae9..4af871bb24c8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,12 +6,12 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26079.103 - 10.0.4-servicing.26079.103 - 10.0.4-servicing.26079.103 - 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.110 + 10.0.4-servicing.26079.110 + 10.0.4-servicing.26079.110 + 10.0.4-servicing.26079.110 10.0.4 - 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.110 10.0.4 10.0.4 10.0.4 @@ -19,46 +19,46 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.110 10.0.4 10.0.4 10.0.4 10.0.4 - 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.110 10.0.4 - 10.0.4-servicing.26079.103 - 10.0.4-servicing.26079.103 - 10.0.0-preview.26079.103 + 10.0.4-servicing.26079.110 + 10.0.4-servicing.26079.110 + 10.0.0-preview.26079.110 10.0.4 10.0.4 18.0.11 - 18.0.11-servicing-26079-103 - 7.0.2-rc.8003 + 18.0.11-servicing-26079-110 + 7.0.2-rc.8010 10.0.104 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 10.0.0-preview.26079.103 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 2.0.0-preview.1.26079.103 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 10.0.0-preview.26079.110 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 2.0.0-preview.1.26079.110 2.2.4 - 10.0.0-beta.26079.103 - 10.0.0-beta.26079.103 - 10.0.0-beta.26079.103 - 10.0.0-beta.26079.103 - 10.0.0-beta.26079.103 - 10.0.0-beta.26079.103 + 10.0.0-beta.26079.110 + 10.0.0-beta.26079.110 + 10.0.0-beta.26079.110 + 10.0.0-beta.26079.110 + 10.0.0-beta.26079.110 + 10.0.0-beta.26079.110 10.0.4 10.0.4 - 10.0.4-servicing.26079.103 - 10.0.4-servicing.26079.103 - 10.0.0-beta.26079.103 - 10.0.0-beta.26079.103 + 10.0.4-servicing.26079.110 + 10.0.4-servicing.26079.110 + 10.0.0-beta.26079.110 + 10.0.0-beta.26079.110 10.0.4 10.0.4 10.0.4 @@ -68,19 +68,19 @@ This file should be imported by eng/Versions.props 10.0.4 10.0.4 10.0.4 - 14.0.104-servicing.26079.103 + 14.0.104-servicing.26079.110 10.0.4 - 5.0.0-2.26079.103 - 5.0.0-2.26079.103 - 10.0.4-servicing.26079.103 + 5.0.0-2.26079.110 + 5.0.0-2.26079.110 + 10.0.4-servicing.26079.110 10.0.4 10.0.4 10.0.0-preview.7.25377.103 - 10.0.0-preview.26079.103 - 10.0.4-servicing.26079.103 - 18.0.1-release-26079-103 + 10.0.0-preview.26079.110 + 10.0.4-servicing.26079.110 + 18.0.1-release-26079-110 10.0.4 - 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.110 10.0.104 10.0.104 10.0.104 @@ -89,34 +89,34 @@ This file should be imported by eng/Versions.props 10.0.104 10.0.104 10.0.104 - 10.0.104-servicing.26079.103 + 10.0.104-servicing.26079.110 10.0.104 - 10.0.104-servicing.26079.103 + 10.0.104-servicing.26079.110 10.0.104 10.0.104 - 10.0.104-servicing.26079.103 - 18.0.1-release-26079-103 - 18.0.1-release-26079-103 + 10.0.104-servicing.26079.110 + 18.0.1-release-26079-110 + 18.0.1-release-26079-110 3.2.4 10.0.4 - 10.0.4-servicing.26079.103 + 10.0.4-servicing.26079.110 10.0.4 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 - 7.0.2-rc.8003 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 + 7.0.2-rc.8010 10.0.4 2.0.4 10.0.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dbf490ef6533..aebf3a31a13a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 @@ -70,168 +70,168 @@ https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 - + https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 https://github.com/microsoft/testfx @@ -571,7 +571,7 @@ https://github.com/dotnet/dotnet - 7f774a3fe8e54a2b63f538feb853c96857f36811 + 2e33fb289644d6ffa327eef394eb8279b452f7b9 diff --git a/global.json b/global.json index 3a353ddfa927..f11f080f97ff 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.110", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.110", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From b36672eeec0180f1245a6d37bf7de169dc77fa32 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Jan 2026 03:13:34 +0000 Subject: [PATCH 230/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 00767fa3eae3..13a5e68547c4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26078.115 - 18.3.0-release-26078-115 - 18.3.0-release-26078-115 - 7.3.0-preview.1.7915 - 10.0.200-alpha.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 10.0.0-preview.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 10.0.0-beta.26078.115 - 15.2.200-servicing.26078.115 - 5.3.0-2.26078.115 - 5.3.0-2.26078.115 + 10.0.0-preview.26079.118 + 18.3.0-release-26079-118 + 18.3.0-release-26079-118 + 7.3.0-preview.1.8018 + 10.0.200-alpha.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 10.0.0-preview.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 15.2.200-servicing.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 10.0.0-preview.7.25377.103 - 10.0.0-preview.26078.115 - 18.3.0-release-26078-115 - 10.0.200-alpha.26078.115 - 10.0.200-alpha.26078.115 - 10.0.200-alpha.26078.115 - 10.0.200-alpha.26078.115 - 10.0.200-alpha.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 10.0.200-preview.26078.115 - 18.3.0-release-26078-115 - 18.3.0-release-26078-115 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 - 7.3.0-preview.1.7915 + 10.0.0-preview.26079.118 + 18.3.0-release-26079-118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 18.3.0-release-26079-118 + 18.3.0-release-26079-118 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f50c28ecda2..8409ae6e4874 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 1dbc09658f3a3c21e5ff492d56bf575f368b3b1e + 1359b581c6c349cd204f70df32f83bc539cd56ea https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index 4c5350cccdbb..e120ded9cb26 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26078.115", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26078.115", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.118", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.118", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 1cb28a45f83f36e1b5f4398e51b4cf4b7814d45e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Jan 2026 06:37:32 +0000 Subject: [PATCH 231/280] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 368 +++++----- eng/Version.Details.xml | 677 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +- global.json | 4 +- 9 files changed, 538 insertions(+), 537 deletions(-) diff --git a/NuGet.config b/NuGet.config index eca87006f0f1..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4af871bb24c8..13a5e68547c4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,139 +6,141 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26079.110 - 10.0.4-servicing.26079.110 - 10.0.4-servicing.26079.110 - 10.0.4-servicing.26079.110 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.4-servicing.26079.110 - 10.0.0-preview.26079.110 - 10.0.4 - 10.0.4 - 18.0.11 - 18.0.11-servicing-26079-110 - 7.0.2-rc.8010 - 10.0.104 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 10.0.0-preview.26079.110 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 2.0.0-preview.1.26079.110 - 2.2.4 - 10.0.0-beta.26079.110 - 10.0.0-beta.26079.110 - 10.0.0-beta.26079.110 - 10.0.0-beta.26079.110 - 10.0.0-beta.26079.110 - 10.0.0-beta.26079.110 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.4-servicing.26079.110 - 10.0.0-beta.26079.110 - 10.0.0-beta.26079.110 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 14.0.104-servicing.26079.110 - 10.0.4 - 5.0.0-2.26079.110 - 5.0.0-2.26079.110 - 10.0.4-servicing.26079.110 - 10.0.4 - 10.0.4 + 10.0.0-preview.26079.118 + 18.3.0-release-26079-118 + 18.3.0-release-26079-118 + 7.3.0-preview.1.8018 + 10.0.200-alpha.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 10.0.0-preview.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 10.0.0-beta.26079.118 + 15.2.200-servicing.26079.118 + 5.3.0-2.26079.118 + 5.3.0-2.26079.118 10.0.0-preview.7.25377.103 - 10.0.0-preview.26079.110 - 10.0.4-servicing.26079.110 - 18.0.1-release-26079-110 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26079.110 - 10.0.104 - 10.0.104-servicing.26079.110 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26079.110 - 18.0.1-release-26079-110 - 18.0.1-release-26079-110 - 3.2.4 - 10.0.4 - 10.0.4-servicing.26079.110 - 10.0.4 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 7.0.2-rc.8010 - 10.0.4 - 2.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 + 10.0.0-preview.26079.118 + 18.3.0-release-26079-118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-alpha.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 10.0.200-preview.26079.118 + 18.3.0-release-26079-118 + 18.3.0-release-26079-118 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + 7.3.0-preview.1.8018 + + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 @@ -148,31 +150,7 @@ This file should be imported by eng/Versions.props - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -183,46 +161,25 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) - $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -239,10 +196,6 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -259,6 +212,57 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aebf3a31a13a..8409ae6e4874 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - + https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + 1359b581c6c349cd204f70df32f83bc539cd56ea - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -569,9 +572,9 @@ https://github.com/microsoft/testfx 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 - - https://github.com/dotnet/dotnet - 2e33fb289644d6ffa327eef394eb8279b452f7b9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad03..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: Azure-Linux-3-Amd64 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index f11f080f97ff..e120ded9cb26 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.110", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.110", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.118", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.118", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From b3262ef89c6fd62b3908fed6c2a560ff2ca27b87 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Jan 2026 06:37:39 +0000 Subject: [PATCH 232/280] Reset files to release/10.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 2 + eng/Version.Details.props | 266 +++++++++---------- eng/Version.Details.xml | 534 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 405 insertions(+), 403 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3f728c95515..ff0d29fb990d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -39,6 +40,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 13a5e68547c4..c88cd20c8ed9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,146 +6,146 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26079.118 - 18.3.0-release-26079-118 - 18.3.0-release-26079-118 - 7.3.0-preview.1.8018 - 10.0.200-alpha.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 10.0.0-preview.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 15.2.200-servicing.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 + 10.0.0-preview.26076.108 + 18.3.0-preview-26076-108 + 18.3.0-preview-26076-108 + 7.3.0-preview.1.7708 + 10.0.300-alpha.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-preview.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 15.2.300-servicing.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.26079.118 - 18.3.0-release-26079-118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 18.3.0-release-26079-118 - 18.3.0-release-26079-118 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 + 10.0.0-preview.26076.108 + 18.3.0-release-26076-108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 18.3.0-release-26076-108 + 18.3.0-release-26076-108 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.0-preview.1.25612.105 - 2.2.2 - 10.0.2 - 10.0.2 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 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.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 10.0.1 + 10.0.1 10.0.0-rtm.25523.111 10.0.0-rtm.25523.111 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 3.2.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 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-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 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 - 2.1.0-preview.26078.2 - 4.1.0-preview.26078.2 + 2.1.0-preview.25571.1 + 4.1.0-preview.25571.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8409ae6e4874..e8d4d98820b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,53 +528,53 @@ - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/global.json b/global.json index e120ded9cb26..d197f033377b 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.118", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.118", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From ea3161e8184d0998e50e2afd8dab2563f40046d5 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 29 Jan 2026 23:08:40 -0800 Subject: [PATCH 233/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2891154 --- src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index 32c88e0bfa9f..aea4cf0e6adf 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -3973,7 +3973,7 @@ To display a value, specify the corresponding command-line option without provid Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + В версии набора рабочих нагрузок {0} отсутствуют манифесты, которые, вероятно, были удалены при управлении пакетами. Чтобы устранить эту проблему, выполните команду "dotnet workload repair". {0} is the workload set version. {Locked="dotnet workload repair"} From ef54d09453cd6b7858d8661da0ec83385f20b4ad Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Thu, 29 Jan 2026 23:15:10 -0800 Subject: [PATCH 234/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2891154 --- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf | 2 +- .../xlf/Strings.pt-BR.xlf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf index e52c35088d8a..314e15daddb0 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Ve verzi sady úloh {0} chybí manifesty, které pravděpodobně odstranila správa balíčků. Pokud chcete tento problém vyřešit, spusťte příkaz dotnet workload repair. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf index 91127d3307bf..fa5f6c52c089 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + La versión del conjunto de cargas de trabajo {0} tiene manifiestos faltantes, probablemente eliminados por la administración de paquetes. Ejecute "dotnet workload repair" para corregir esto. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf index 19aa8c2b6001..ded314a61d27 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + A versão do conjunto de cargas de trabalho {0} tem manifestos ausentes, provavelmente removidos pelo gerenciamento de pacotes. Execute "dotnet workload repair" para corrigir isso. {Locked="dotnet workload repair"} From 93beafa6ce1972c1b207836ecf35986ce25a6a37 Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Fri, 30 Jan 2026 17:02:56 +0800 Subject: [PATCH 235/280] Revert the WorkloadSetVersionOptionDescription change in CliCommandStrings files --- src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf | 5 ----- src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf | 5 ----- 13 files changed, 65 deletions(-) diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index 9a0694ac6e49..ddc24dfadea5 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -2212,11 +2212,6 @@ příkazu „dotnet tool list“. Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Verze úlohy, která se má zobrazit, nebo jedna nebo více úloh a jejich verze spojené znakem @. - - Installation Source Zdroj instalace diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index bb4eaaacdc8b..121ca426e28b 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -2212,11 +2212,6 @@ und die zugehörigen Paket-IDs für installierte Tools über den Befehl Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Eine Workloadversion zum Anzeigen oder mindestens eine Workload und deren Versionen, die mit dem Zeichen "@" verknüpft sind. - - Installation Source Installationsquelle diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index 51b407e2847f..a348d413d164 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -2212,11 +2212,6 @@ y los identificadores de los paquetes correspondientes a las herramientas instal Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Una versión de carga de trabajo para mostrar o una o varias cargas de trabajo y sus versiones unidas por el carácter "@". - - Installation Source Origen de la instalación diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index e53212e5ef26..f06b4973e79e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -2212,11 +2212,6 @@ et les ID de package correspondants aux outils installés, utilisez la commande Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Version de charge de travail à afficher ou une ou plusieurs charges de travail et leurs versions jointes par le caractère « @ ». - - Installation Source Source de l’installation diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index acc745641dc4..b3daa1e8e5c5 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -2212,11 +2212,6 @@ e gli ID pacchetto corrispondenti per gli strumenti installati usando il comando Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Una versione del carico di lavoro da visualizzare oppure uno o più carichi di lavoro e le relative versioni unite dal carattere '@'. - - Installation Source Origine dell'installazione diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index e1cb66e28ac0..6d4a38052203 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -2212,11 +2212,6 @@ and the corresponding package Ids for installed tools using the command Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - 表示するワークロードのバージョン、または '@' 文字で結合された 1 つ以上のワークロードとそのバージョン。 - - Installation Source インストール ソース diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index 1c977c9e7200..fd078178129d 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -2212,11 +2212,6 @@ and the corresponding package Ids for installed tools using the command Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - 표시할 워크로드 버전 또는 '@' 문자로 결합된 하나 이상의 워크로드와 해당 버전입니다. - - Installation Source 설치 원본 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 59e885505a37..18b3f648d1bc 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -2212,11 +2212,6 @@ i odpowiednie identyfikatory pakietów zainstalowanych narzędzi można znaleź Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Wersja obciążenia do wyświetlenia lub jedno lub więcej obciążeń i ich wersji połączonych znakiem „@”. - - Installation Source Źródło instalacji diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index fd2bf518392f..66c3d19ace1a 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -2212,11 +2212,6 @@ e as Ids de pacote correspondentes para as ferramentas instaladas usando o coman Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Uma versão de carga de trabalho para exibir ou uma ou mais cargas de trabalho e suas versões unidas pelo caractere ''@''. - - Installation Source Origem da Instalação diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index bcde5043b871..07d1733a30b8 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -2213,11 +2213,6 @@ and the corresponding package Ids for installed tools using the command Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Версия рабочей нагрузки для отображения или одной или нескольких рабочих нагрузок и их версий, соединенных символом "@". - - Installation Source Источник установки diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf index d303562d91f5..5e0d801324bd 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf @@ -2212,11 +2212,6 @@ karşılık gelen paket kimliklerini bulmak için Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - Görüntülenecek bir iş yükü sürümü veya bir veya daha fazla iş yükü ve bunların '@' karakteriyle birleştirilen sürümleri. - - Installation Source Yükleme Kaynağı diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index b207d376ad7d..ec9d67a63006 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -2212,11 +2212,6 @@ and the corresponding package Ids for installed tools using the command Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - 要显示的工作负载版本，或一个或多个工作负载，并且其版本由 ‘@’ 字符联接。 - - Installation Source 安装源文件 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index 9fbcafa4a52b..c496d9947662 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -2212,11 +2212,6 @@ and the corresponding package Ids for installed tools using the command Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - - A workload version to display or one or more workloads and their versions joined by the '@' character. - 要顯示的工作負載版本，或是一或多個工作負載及其由 '@' 字元連接的版本。 - - Installation Source 安裝來源 From f24594cb0f8c94d9791f1fbf4a0110f86898a45e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 30 Jan 2026 15:02:24 +0000 Subject: [PATCH 236/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 13a5e68547c4..4fd79964ed13 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26079.118 - 18.3.0-release-26079-118 - 18.3.0-release-26079-118 - 7.3.0-preview.1.8018 - 10.0.200-alpha.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 10.0.0-preview.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 15.2.200-servicing.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 + 10.0.0-preview.26080.106 + 18.3.0-release-26080-106 + 18.3.0-release-26080-106 + 7.3.0-preview.1.8106 + 10.0.200-alpha.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 10.0.0-preview.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 10.0.0-beta.26080.106 + 15.2.200-servicing.26080.106 + 5.3.0-2.26080.106 + 5.3.0-2.26080.106 10.0.0-preview.7.25377.103 - 10.0.0-preview.26079.118 - 18.3.0-release-26079-118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 18.3.0-release-26079-118 - 18.3.0-release-26079-118 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 + 10.0.0-preview.26080.106 + 18.3.0-release-26080-106 + 10.0.200-alpha.26080.106 + 10.0.200-alpha.26080.106 + 10.0.200-alpha.26080.106 + 10.0.200-alpha.26080.106 + 10.0.200-alpha.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 10.0.200-preview.26080.106 + 18.3.0-release-26080-106 + 18.3.0-release-26080-106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 + 7.3.0-preview.1.8106 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8409ae6e4874..4eaea204e36b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + de9bfaf8960ed96e5a0b08694d069d797569ee9e https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index e120ded9cb26..40412918e292 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.118", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.118", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26080.106", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From d376ce53ad945aadae66bf993ccdf3d6c1c2d449 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 30 Jan 2026 10:51:16 -0800 Subject: [PATCH 237/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2891567 --- src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index e863fb2e237b..34987e04e9a3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -3972,7 +3972,7 @@ Pokud chcete zobrazit hodnotu, zadejte odpovídající volbu příkazového řá Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Ve verzi sady úloh {0} chybí manifesty, které pravděpodobně odstranila správa balíčků. Pokud chcete tento problém vyřešit, spusťte příkaz dotnet workload repair. {0} is the workload set version. {Locked="dotnet workload repair"} From 311ef0c9f3fc413b489a94fc1f704d5093887d68 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 30 Jan 2026 10:52:32 -0800 Subject: [PATCH 238/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2891567 --- src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index 42886904e756..b68592bc88ee 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -3972,7 +3972,7 @@ Para mostrar un valor, especifique la opción de línea de comandos correspondie Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + La versión del conjunto de cargas de trabajo {0} tiene manifiestos faltantes, probablemente eliminados por la administración de paquetes. Ejecute "dotnet workload repair" para corregir esto. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index 17b4209ad77b..4cc6233a75a7 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -3972,7 +3972,7 @@ Pour afficher une valeur, spécifiez l’option de ligne de commande corresponda Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + La version {0} de l’ensemble de la charge de travail comporte des manifestes manquants qui ont probablement été supprimés par Package Management. Exécutez « dotnet workload repair » pour corriger ce problème. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index 66819198ab58..5330188a35a3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -3972,7 +3972,7 @@ To display a value, specify the corresponding command-line option without provid Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + ワークロード セット バージョン {0} で、パッケージ管理によって削除された可能性が高いマニフェストが不足しています。これを修正するには、"dotnet workload repair" を実行してください。 {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index 38bfbc219038..c2350a9d3c8d 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -3972,7 +3972,7 @@ To display a value, specify the corresponding command-line option without provid Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + 워크로드 집합 버전 {0}에 패키지 관리에 의해 제거될 수 있는 매니페스트가 누락되었습니다. 이 문제를 해결하려면 "dotnet workload repair"를 실행하세요. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index 2144334fc63a..88bf28d6fd55 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -3972,7 +3972,7 @@ Para exibir um valor, especifique a opção de linha de comando correspondente s Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + A versão do conjunto de cargas de trabalho {0} tem manifestos ausentes, provavelmente removidos pelo gerenciamento de pacotes. Execute "dotnet workload repair" para corrigir isso. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf index 933d53910bce..db719074d5ff 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf @@ -3972,7 +3972,7 @@ Bir değeri görüntülemek için, bir değer sağlamadan ilgili komut satırı Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + İş yükü kümesi {0} sürümü, paket yönetimi tarafından kaldırılmış olabilecek eksik bildirimlere sahip. Bunu düzeltmek için "dotnet workload repair" komutunu çalıştırın. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index 748d9c43641c..ba16261662f3 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -3972,7 +3972,7 @@ To display a value, specify the corresponding command-line option without provid Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + 工作負載集合版本 {0} 缺少資訊清單，其可能已遭套件管理移除。請執行「dotnet workload repair」來修復此問題。 {0} is the workload set version. {Locked="dotnet workload repair"} From 31adf78ff936d787c08fd67cb55bfc7dc072f1ee Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Fri, 30 Jan 2026 10:58:41 -0800 Subject: [PATCH 239/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2891567 --- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf | 2 +- .../xlf/Strings.zh-Hant.xlf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf index 550221d36e00..4a4262c69213 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + La version {0} de l’ensemble de la charge de travail comporte des manifestes manquants qui ont probablement été supprimés par Package Management. Exécutez « dotnet workload repair » pour corriger ce problème. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf index 5254999963fa..cec4a86a8e92 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + ワークロード セット バージョン {0} で、パッケージ管理によって削除された可能性が高いマニフェストが不足しています。これを修正するには、"dotnet workload repair" を実行してください。 {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf index 06a3d8b1e20b..85060a626cd5 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + 워크로드 집합 버전 {0}에 패키지 관리에 의해 제거될 수 있는 매니페스트가 누락되었습니다. 이 문제를 해결하려면 "dotnet workload repair"를 실행하세요. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf index 01bf7048e135..7f14a7a2b8b0 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + В версии набора рабочих нагрузок {0} отсутствуют манифесты, которые, вероятно, были удалены при управлении пакетами. Чтобы устранить эту проблему, выполните команду "dotnet workload repair". {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf index 15e1e6425967..33acc94ab13d 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + İş yükü kümesi {0} sürümü, paket yönetimi tarafından kaldırılmış olabilecek eksik bildirimlere sahip. Bunu düzeltmek için "dotnet workload repair" komutunu çalıştırın. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf index 2435cecf1b39..6ec848a5c76e 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + 工作負載集合版本 {0} 缺少資訊清單，其可能已遭套件管理移除。請執行「dotnet workload repair」來修復此問題。 {Locked="dotnet workload repair"} From 89b2e8c6bd0d25ef933a6542a53e1bdcc0585e33 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 30 Jan 2026 21:01:32 +0000 Subject: [PATCH 240/280] Reset files to release/10.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 2 + eng/Version.Details.props | 266 +++++++++---------- eng/Version.Details.xml | 534 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 405 insertions(+), 403 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3f728c95515..ff0d29fb990d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -39,6 +40,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 13a5e68547c4..c88cd20c8ed9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,146 +6,146 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26079.118 - 18.3.0-release-26079-118 - 18.3.0-release-26079-118 - 7.3.0-preview.1.8018 - 10.0.200-alpha.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 10.0.0-preview.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 10.0.0-beta.26079.118 - 15.2.200-servicing.26079.118 - 5.3.0-2.26079.118 - 5.3.0-2.26079.118 + 10.0.0-preview.26076.108 + 18.3.0-preview-26076-108 + 18.3.0-preview-26076-108 + 7.3.0-preview.1.7708 + 10.0.300-alpha.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-preview.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 15.2.300-servicing.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.26079.118 - 18.3.0-release-26079-118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-alpha.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 10.0.200-preview.26079.118 - 18.3.0-release-26079-118 - 18.3.0-release-26079-118 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 - 7.3.0-preview.1.8018 + 10.0.0-preview.26076.108 + 18.3.0-release-26076-108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 18.3.0-release-26076-108 + 18.3.0-release-26076-108 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.0-preview.1.25612.105 - 2.2.2 - 10.0.2 - 10.0.2 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 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.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 10.0.1 + 10.0.1 10.0.0-rtm.25523.111 10.0.0-rtm.25523.111 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 3.2.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 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-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 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 - 2.1.0-preview.26078.2 - 4.1.0-preview.26078.2 + 2.1.0-preview.25571.1 + 4.1.0-preview.25571.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8409ae6e4874..e8d4d98820b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,53 +528,53 @@ - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - 1359b581c6c349cd204f70df32f83bc539cd56ea + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/global.json b/global.json index e120ded9cb26..d197f033377b 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26079.118", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26079.118", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 41660a66c8f4ecf0ebf00e20d590ec47067b7297 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Sun, 1 Feb 2026 20:36:17 -0800 Subject: [PATCH 241/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2893098 --- src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index e458ac68d2bc..c63c9586e578 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -3972,7 +3972,7 @@ Um einen Wert anzuzeigen, geben Sie die entsprechende Befehlszeilenoption an, oh Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + In Version {0} des Arbeitslastsatzes fehlen Manifeste, die wahrscheinlich von der Paketverwaltung entfernt wurden. Führen Sie „dotnet workload repair“ aus, um das Problem zu beheben. {0} is the workload set version. {Locked="dotnet workload repair"} From ac3b6ca8df27025a9734b2266465f1280429ef86 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Sun, 1 Feb 2026 20:37:31 -0800 Subject: [PATCH 242/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2893098 --- src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf | 2 +- src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index 2986048b764f..b613ba616f98 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -3972,7 +3972,7 @@ Per visualizzare un valore, specifica l'opzione della riga di comando corrispond Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Nella versione {0} del set di carichi di lavoro mancano alcuni file manifesto, probabilmente rimossi da Gestione pacchetti. Eseguire "dotnet workload repair" per risolvere il problema. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 95e1b62f83a3..ac480b999383 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -3972,7 +3972,7 @@ Aby wyświetlić wartość, należy podać odpowiednią opcję wiersza poleceń Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Wersja zestawu obciążeń {0} ma brakujące manifesty, prawdopodobnie usunięte przez zarządzanie pakietami. Uruchom „dotnet workload repair”, aby to naprawić. {0} is the workload set version. {Locked="dotnet workload repair"} diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index 706431f2c3b5..fa7088cf2ac1 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -3972,7 +3972,7 @@ To display a value, specify the corresponding command-line option without provid Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + 工作负载集版本 {0} 缺少清单，这些清单可能已被包管理移除。请运行 "dotnet workload repair" 进行修复。 {0} is the workload set version. {Locked="dotnet workload repair"} From ae62a615e5199cccf1f3bdda63fce26b4e85adca Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Sun, 1 Feb 2026 20:43:40 -0800 Subject: [PATCH 243/280] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2893098 --- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf | 2 +- .../xlf/Strings.zh-Hans.xlf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf index c1b3de9e9b04..deccb474ffd2 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + In Version {0} des Arbeitslastsatzes fehlen Manifeste, die wahrscheinlich von der Paketverwaltung entfernt wurden. Führen Sie „dotnet workload repair“ aus, um das Problem zu beheben. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf index b2124effaba4..0362f8f48f0c 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Nella versione {0} del set di carichi di lavoro mancano alcuni file manifesto, probabilmente rimossi da Gestione pacchetti. Esegui "dotnet workload repair" per risolvere il problema. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf index 2fb7cda88a37..31f087586422 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + Wersja zestawu obciążeń {0} ma brakujące manifesty, prawdopodobnie usunięte przez zarządzanie pakietami. Uruchom „dotnet workload repair”, aby to naprawić. {Locked="dotnet workload repair"} diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf index 5770b450720b..2ac97ca62ff2 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf @@ -144,7 +144,7 @@ Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. - Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. + 工作负载集版本 {0} 缺少清单，这些清单可能已被包管理移除。请运行 "dotnet workload repair" 进行修复。 {Locked="dotnet workload repair"} From 490df4279293d07b95b895e4b77827d141f6175e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 2 Feb 2026 08:44:57 +0000 Subject: [PATCH 244/280] Reset files to release/10.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 2 + eng/Version.Details.props | 266 +++++++++---------- eng/Version.Details.xml | 534 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 405 insertions(+), 403 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3f728c95515..ff0d29fb990d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -39,6 +40,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4fd79964ed13..c88cd20c8ed9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,146 +6,146 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26080.106 - 18.3.0-release-26080-106 - 18.3.0-release-26080-106 - 7.3.0-preview.1.8106 - 10.0.200-alpha.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 10.0.0-preview.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 15.2.200-servicing.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 + 10.0.0-preview.26076.108 + 18.3.0-preview-26076-108 + 18.3.0-preview-26076-108 + 7.3.0-preview.1.7708 + 10.0.300-alpha.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-preview.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 15.2.300-servicing.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.26080.106 - 18.3.0-release-26080-106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 18.3.0-release-26080-106 - 18.3.0-release-26080-106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 + 10.0.0-preview.26076.108 + 18.3.0-release-26076-108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 18.3.0-release-26076-108 + 18.3.0-release-26076-108 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.0-preview.1.25612.105 - 2.2.2 - 10.0.2 - 10.0.2 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 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.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 10.0.1 + 10.0.1 10.0.0-rtm.25523.111 10.0.0-rtm.25523.111 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 3.2.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 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-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 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 - 2.1.0-preview.26078.2 - 4.1.0-preview.26078.2 + 2.1.0-preview.25571.1 + 4.1.0-preview.25571.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4eaea204e36b..e8d4d98820b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,53 +528,53 @@ - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/global.json b/global.json index 40412918e292..d197f033377b 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26080.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From a9de56f825bbd04f85ee80b41750ecf31ec12953 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 2 Feb 2026 14:08:33 +0000 Subject: [PATCH 245/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4fd79964ed13..65fb27b05fa9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26080.106 - 18.3.0-release-26080-106 - 18.3.0-release-26080-106 - 7.3.0-preview.1.8106 - 10.0.200-alpha.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 10.0.0-preview.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 10.0.0-beta.26080.106 - 15.2.200-servicing.26080.106 - 5.3.0-2.26080.106 - 5.3.0-2.26080.106 + 10.0.0-preview.26102.104 + 18.3.0-release-26102-104 + 18.3.0-release-26102-104 + 7.3.0-preview.1.10304 + 10.0.200-alpha.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 10.0.0-preview.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 10.0.0-beta.26102.104 + 15.2.200-servicing.26102.104 + 5.3.0-2.26102.104 + 5.3.0-2.26102.104 10.0.0-preview.7.25377.103 - 10.0.0-preview.26080.106 - 18.3.0-release-26080-106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-alpha.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 10.0.200-preview.26080.106 - 18.3.0-release-26080-106 - 18.3.0-release-26080-106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 - 7.3.0-preview.1.8106 + 10.0.0-preview.26102.104 + 18.3.0-release-26102-104 + 10.0.200-alpha.26102.104 + 10.0.200-alpha.26102.104 + 10.0.200-alpha.26102.104 + 10.0.200-alpha.26102.104 + 10.0.200-alpha.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 10.0.200-preview.26102.104 + 18.3.0-release-26102-104 + 18.3.0-release-26102-104 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 + 7.3.0-preview.1.10304 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4eaea204e36b..0ceeb0ab2b40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f - + https://github.com/dotnet/dotnet - de9bfaf8960ed96e5a0b08694d069d797569ee9e + c719613934ad1102a920dfda535cd1a7bf06151f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index 40412918e292..23de3d1032f1 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26080.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26080.106", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26102.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26102.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 2eb9ecad95cdf70a8ce927f47fb090b1a9eb2472 Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 29 Jan 2026 15:33:35 -0500 Subject: [PATCH 246/280] Keep template_feed/../content/../.gitattributes in archives Some consumers of the VMR source build consume the `git archive` generated source tarball. Without this change, the source tarball doesn't include the content/../.gitattributes file, which makes `dotnet new gitattributes` non-functional. Fixes: https://github.com/dotnet/sdk/issues/52307 --- .gitattributes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitattributes b/.gitattributes index a7c35ea1b75a..3888fbfbf5bd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -71,3 +71,8 @@ *.verified.zsh text eol=lf working-tree-encoding=UTF-8 *.verified.nu text eol=lf working-tree-encoding=UTF-8 *.verified.fish text eol=lf working-tree-encoding=UTF-8 + +############################################################################### +# Ensure files are included in git archive +############################################################################### +/template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Gitattributes/.gitattributes -export-ignore From 5a22127dbc1b0c6466337c559bf02cf0f81da918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Mon, 2 Feb 2026 15:23:04 -0800 Subject: [PATCH 247/280] Style cleanup (#52751) --- Directory.Packages.props | 1 + eng/Version.Details.props | 1 + eng/Version.Details.xml | 5 +++++ eng/Versions.props | 3 ++- .../Microsoft.DotNet.HotReload.Client.Package.csproj | 1 + src/BuiltInTools/Watch/Build/FileItem.cs | 3 +-- src/BuiltInTools/Watch/Build/ProjectGraphFactory.cs | 4 ++-- src/BuiltInTools/Watch/Build/ProjectNodeMap.cs | 3 +-- src/BuiltInTools/Watch/Context/DotNetWatchContext.cs | 1 - src/BuiltInTools/Watch/FileWatcher/FileWatcher.cs | 2 +- .../Watch/FileWatcher/PollingDirectoryWatcher.cs | 7 ++----- src/BuiltInTools/Watch/HotReload/CompilationHandler.cs | 5 ++--- .../Watch/HotReload/HotReloadDotNetWatcher.cs | 8 ++++---- src/BuiltInTools/Watch/HotReload/HotReloadEventSource.cs | 1 - .../Watch/Microsoft.DotNet.HotReload.Watch.csproj | 2 +- src/BuiltInTools/Watch/Process/ProcessRunner.cs | 3 +-- src/BuiltInTools/Watch/Process/ProcessSpec.cs | 5 ++--- src/BuiltInTools/Watch/Process/RunningProject.cs | 3 +-- src/BuiltInTools/Watch/Utilities/PathUtilities.cs | 2 +- .../FileLevelDirectiveHelpers.cs | 3 +-- .../LaunchSettings/LaunchSettings.cs | 1 - 21 files changed, 30 insertions(+), 34 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1a83625bdc29..a44ed722182f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -55,6 +55,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c88cd20c8ed9..d6708ed330ab 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -101,6 +101,7 @@ This file should be imported by eng/Versions.props 10.0.0-rtm.25523.111 10.0.1 10.0.1 + 10.0.1 10.0.1 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8d4d98820b8..cde5e4dcbb9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -440,6 +440,11 @@ fad253f51b461736dfd3cd9c15977bb7493becef + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/eng/Versions.props b/eng/Versions.props index 705bbfc33b22..051cd561557f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,6 +80,7 @@ 9.0.0 2.0.0-preview.1.24427.4 9.0.0 + 9.0.0 4.5.1 9.0.0 4.5.5 @@ -142,7 +143,7 @@ 10.0.100 - + diff --git a/src/BuiltInTools/Watch/Process/ProcessRunner.cs b/src/BuiltInTools/Watch/Process/ProcessRunner.cs index 4734b844fdce..2cfba7ade091 100644 --- a/src/BuiltInTools/Watch/Process/ProcessRunner.cs +++ b/src/BuiltInTools/Watch/Process/ProcessRunner.cs @@ -1,7 +1,6 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - using System.Diagnostics; using Microsoft.Extensions.Logging; diff --git a/src/BuiltInTools/Watch/Process/ProcessSpec.cs b/src/BuiltInTools/Watch/Process/ProcessSpec.cs index b3e1eaa1a6a6..15e4f1a12eb1 100644 --- a/src/BuiltInTools/Watch/Process/ProcessSpec.cs +++ b/src/BuiltInTools/Watch/Process/ProcessSpec.cs @@ -1,7 +1,6 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - namespace Microsoft.DotNet.Watch { internal sealed class ProcessSpec @@ -14,10 +13,10 @@ internal sealed class ProcessSpec public Action? OnOutput { get; set; } public ProcessExitAction? OnExit { get; set; } public CancellationToken CancelOutputCapture { get; set; } - public bool UseShellExecute { get; set; } = false; + public bool UseShellExecute { get; set; } /// - /// True if the process is a user application, false if it is a helper process (e.g. dotnet build). + /// True if the process is a user application, false if it is a helper process (e.g. dotnet build). /// public bool IsUserApplication { get; set; } diff --git a/src/BuiltInTools/Watch/Process/RunningProject.cs b/src/BuiltInTools/Watch/Process/RunningProject.cs index d94c90fbf6e5..c4d63e953a22 100644 --- a/src/BuiltInTools/Watch/Process/RunningProject.cs +++ b/src/BuiltInTools/Watch/Process/RunningProject.cs @@ -1,7 +1,6 @@ -// Licensed to the .NET Foundation under one or more agreements. +// Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. - using System.Collections.Immutable; using System.Diagnostics; using Microsoft.Build.Graph; diff --git a/src/BuiltInTools/Watch/Utilities/PathUtilities.cs b/src/BuiltInTools/Watch/Utilities/PathUtilities.cs index e7f21ea13ac6..d8395337dc8a 100644 --- a/src/BuiltInTools/Watch/Utilities/PathUtilities.cs +++ b/src/BuiltInTools/Watch/Utilities/PathUtilities.cs @@ -5,7 +5,7 @@ namespace Microsoft.DotNet.Watch; internal static class PathUtilities { - public static readonly IEqualityComparer OSSpecificPathComparer = Path.DirectorySeparatorChar == '\\' ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; + public static readonly IEqualityComparer OSSpecificPathComparer = Path.DirectorySeparatorChar == '\\' ? StringComparer.OrdinalIgnoreCase : StringComparer.Ordinal; public static readonly StringComparison OSSpecificPathComparison = Path.DirectorySeparatorChar == '\\' ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal; public static string ExecutableExtension diff --git a/src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs b/src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs index 8457183e2cba..681843c6cbc8 100644 --- a/src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs +++ b/src/Cli/Microsoft.DotNet.FileBasedPrograms/FileLevelDirectiveHelpers.cs @@ -159,9 +159,8 @@ public static void FindLeadingDirectives( if (CSharpDirective.Parse(context) is { } directive) { // If the directive is already present, report an error. - if (deduplicated.ContainsKey(directive)) + if (deduplicated.TryGetValue(directive, out var existingDirective)) { - var existingDirective = deduplicated[directive]; var typeAndName = $"#:{existingDirective.GetType().Name.ToLowerInvariant()} {existingDirective.Name}"; reportError(sourceFile, directive.Info.Span, string.Format(FileBasedProgramsResources.DuplicateDirective, typeAndName)); } diff --git a/src/Microsoft.DotNet.ProjectTools/LaunchSettings/LaunchSettings.cs b/src/Microsoft.DotNet.ProjectTools/LaunchSettings/LaunchSettings.cs index 5e22df2e18d7..ae1c60161b27 100644 --- a/src/Microsoft.DotNet.ProjectTools/LaunchSettings/LaunchSettings.cs +++ b/src/Microsoft.DotNet.ProjectTools/LaunchSettings/LaunchSettings.cs @@ -20,7 +20,6 @@ public static class LaunchSettings public static IEnumerable SupportedProfileTypes => s_providers.Keys; - public static string GetPropertiesLaunchSettingsPath(string directoryPath, string propertiesDirectoryName) => Path.Combine(directoryPath, propertiesDirectoryName, "launchSettings.json"); From 58fa0ba5dafbc690a76d9bdc926f323609ff6458 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 3 Feb 2026 02:02:04 +0000 Subject: [PATCH 248/280] Update dependencies from https://github.com/microsoft/testfx build 20260202.3 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26078.2 -> To Version 2.1.0-preview.26102.3 MSTest From Version 4.1.0-preview.26078.2 -> To Version 4.1.0-preview.26102.3 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4fd79964ed13..5cfb312cec2c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26078.2 - 4.1.0-preview.26078.2 + 2.1.0-preview.26102.3 + 4.1.0-preview.26102.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4eaea204e36b..4927799addde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 263532d95929e372f9d2e3688cbaa4ac7288d9df - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + 263532d95929e372f9d2e3688cbaa4ac7288d9df https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From 0505d7e1726bb169e9b4a29274e5656d1d86e3e6 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Tue, 3 Feb 2026 23:50:26 +0000 Subject: [PATCH 249/280] Initial plan From d279bd80c152d9980ea64952cc19f60321ba37c7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 00:01:01 +0000 Subject: [PATCH 250/280] Fix DNX command casting error by using base class Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> --- src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs index f9ffad3e94fe..f33175940357 100644 --- a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Execute; -internal sealed class ToolExecuteCommand : CommandBase +internal sealed class ToolExecuteCommand : CommandBase { const int ERROR_CANCELLED = 1223; // Windows error code for "Operation canceled by user" From cb850190789d8a199b6ab35e19b74d1eb0829843 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 00:30:52 +0000 Subject: [PATCH 251/280] Add parameterized tests for dnx and exec commands Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../EndToEndToolTests.cs | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs b/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs index 3eae1ab6133e..8e6d780533d6 100644 --- a/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs +++ b/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs @@ -266,8 +266,10 @@ public void PackageToolWithAnyRid() .And.Satisfy(SupportAllOfTheseRuntimes([.. expectedRids, "any"])); } - [Fact] - public void InstallAndRunToolFromAnyRid() + [Theory] + [InlineData("exec")] + [InlineData("dnx")] + public void InstallAndRunToolFromAnyRid(string command) { var toolSettings = new TestToolBuilder.TestToolSettings() { @@ -282,7 +284,11 @@ public void InstallAndRunToolFromAnyRid() var testDirectory = _testAssetsManager.CreateTestDirectory(); var homeFolder = Path.Combine(testDirectory.Path, "home"); - new DotnetToolCommand(Log, "exec", toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath) + var testCommand = command == "dnx" + ? new DotnetCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath) + : new DotnetToolCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath); + + testCommand .WithEnvironmentVariables(homeFolder) .WithWorkingDirectory(testDirectory.Path) .Execute() @@ -290,8 +296,10 @@ public void InstallAndRunToolFromAnyRid() .And.HaveStdOutContaining("Hello Tool!"); } - [Fact] - public void InstallAndRunToolFromAnyRidWhenOtherRidsArePresentButIncompatible() + [Theory] + [InlineData("exec")] + [InlineData("dnx")] + public void InstallAndRunToolFromAnyRidWhenOtherRidsArePresentButIncompatible(string command) { var toolSettings = new TestToolBuilder.TestToolSettings() { @@ -310,7 +318,11 @@ .. expectedRids.Select(rid => $"{toolSettings.ToolPackageId}.{rid}.{toolSettings var testDirectory = _testAssetsManager.CreateTestDirectory(); var homeFolder = Path.Combine(testDirectory.Path, "home"); - new DotnetToolCommand(Log, "exec", toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath) + var testCommand = command == "dnx" + ? new DotnetCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath) + : new DotnetToolCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath); + + testCommand .WithEnvironmentVariables(homeFolder) .WithWorkingDirectory(testDirectory.Path) .Execute() From a426e5cd84a88733e8c29e68d29dce2500121ee0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 4 Feb 2026 00:33:33 +0000 Subject: [PATCH 252/280] Refactor tests to extract common arguments Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> --- .../EndToEndToolTests.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs b/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs index 8e6d780533d6..fdbe9eb07ee2 100644 --- a/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs +++ b/test/Microsoft.DotNet.PackageInstall.Tests/EndToEndToolTests.cs @@ -284,9 +284,10 @@ public void InstallAndRunToolFromAnyRid(string command) var testDirectory = _testAssetsManager.CreateTestDirectory(); var homeFolder = Path.Combine(testDirectory.Path, "home"); + string[] args = [command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath]; var testCommand = command == "dnx" - ? new DotnetCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath) - : new DotnetToolCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath); + ? new DotnetCommand(Log, args) + : new DotnetToolCommand(Log, args); testCommand .WithEnvironmentVariables(homeFolder) @@ -318,9 +319,10 @@ .. expectedRids.Select(rid => $"{toolSettings.ToolPackageId}.{rid}.{toolSettings var testDirectory = _testAssetsManager.CreateTestDirectory(); var homeFolder = Path.Combine(testDirectory.Path, "home"); + string[] args = [command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath]; var testCommand = command == "dnx" - ? new DotnetCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath) - : new DotnetToolCommand(Log, command, toolSettings.ToolPackageId, "--verbosity", "diagnostic", "--yes", "--source", toolPackagesPath); + ? new DotnetCommand(Log, args) + : new DotnetToolCommand(Log, args); testCommand .WithEnvironmentVariables(homeFolder) From bed7a7be22fbe352cbb214cf9e340c7fe5185181 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Feb 2026 02:02:34 +0000 Subject: [PATCH 253/280] Update dependencies from https://github.com/microsoft/testfx build 20260203.9 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26102.3 -> To Version 2.1.0-preview.26103.9 MSTest From Version 4.1.0-preview.26102.3 -> To Version 4.1.0-preview.26103.9 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 53ab4b44af5a..20b30150fd9c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26102.3 - 4.1.0-preview.26102.3 + 2.1.0-preview.26103.9 + 4.1.0-preview.26103.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e603fe9d1294..893205a10ad7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 263532d95929e372f9d2e3688cbaa4ac7288d9df + 12bdecdbba87490b64a88a233429805f8704ecbb - + https://github.com/microsoft/testfx - 263532d95929e372f9d2e3688cbaa4ac7288d9df + 12bdecdbba87490b64a88a233429805f8704ecbb https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From aed9a02afc0f14abf79e5c118a87463cefffe2bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Feb 2026 07:48:02 +0000 Subject: [PATCH 254/280] Backflow from https://github.com/dotnet/dotnet / a2bfa46 build 300193 [[ commit created by automation ]] --- src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs index f9ffad3e94fe..f33175940357 100644 --- a/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs +++ b/src/Cli/dotnet/Commands/Tool/Execute/ToolExecuteCommand.cs @@ -19,7 +19,7 @@ namespace Microsoft.DotNet.Cli.Commands.Tool.Execute; -internal sealed class ToolExecuteCommand : CommandBase +internal sealed class ToolExecuteCommand : CommandBase { const int ERROR_CANCELLED = 1223; // Windows error code for "Operation canceled by user" From bc74f4b9914201bdf3688a9c4b7a6a7ad182b709 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Feb 2026 07:48:03 +0000 Subject: [PATCH 255/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 20b30150fd9c..e6b1148b4c74 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26102.104 - 18.3.0-release-26102-104 - 18.3.0-release-26102-104 - 7.3.0-preview.1.10304 - 10.0.200-alpha.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 10.0.0-preview.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 10.0.0-beta.26102.104 - 15.2.200-servicing.26102.104 - 5.3.0-2.26102.104 - 5.3.0-2.26102.104 + 10.0.0-preview.26103.119 + 18.3.0-release-26103-119 + 18.3.0-release-26103-119 + 7.3.0-preview.1.10419 + 10.0.200-alpha.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 10.0.0-preview.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 10.0.0-beta.26103.119 + 15.2.200-servicing.26103.119 + 5.3.0-2.26103.119 + 5.3.0-2.26103.119 10.0.0-preview.7.25377.103 - 10.0.0-preview.26102.104 - 18.3.0-release-26102-104 - 10.0.200-alpha.26102.104 - 10.0.200-alpha.26102.104 - 10.0.200-alpha.26102.104 - 10.0.200-alpha.26102.104 - 10.0.200-alpha.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 10.0.200-preview.26102.104 - 18.3.0-release-26102-104 - 18.3.0-release-26102-104 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 - 7.3.0-preview.1.10304 + 10.0.0-preview.26103.119 + 18.3.0-release-26103-119 + 10.0.200-alpha.26103.119 + 10.0.200-alpha.26103.119 + 10.0.200-alpha.26103.119 + 10.0.200-alpha.26103.119 + 10.0.200-alpha.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 10.0.200-preview.26103.119 + 18.3.0-release-26103-119 + 18.3.0-release-26103-119 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 + 7.3.0-preview.1.10419 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 893205a10ad7..cb66b54d6164 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f - + https://github.com/dotnet/dotnet - c719613934ad1102a920dfda535cd1a7bf06151f + a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index 23de3d1032f1..c206ba47c440 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26102.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26102.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.119", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26103.119", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From bd5d3af9804ba358bf3f2e1be209418bcc949d16 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Wed, 4 Feb 2026 09:04:06 -0600 Subject: [PATCH 256/280] `dotnet run -e FOO=BAR` passes `@(RuntimeEnvironmentVariable)` (#52664) Context: https://github.com/dotnet/sdk/issues/52492 In investigating how to pass implement `dotnet-watch` for mobile, we found that we need to make use of: dotnet run -e FOO=BAR Where `FOO=BAR` is passed as an MSBuild item `@(RuntimeEnvironmentVariable)` to the build, `DeployToDevice` target, and `ComputeRunArguments` target: This is straightforward for the in-process MSBuild target invocations, but for the build step, we need to generate a temporary `.props` file and import using `$(CustomBeforeMicrosoftCommonProps)`. You will have to opt into this behavior by setting `` in your project. The iOS and Android workloads would automatically set this capability. In the iOS & Android workloads, we would handle processing the `@(RuntimeEnvironmentVariable)` item to pass the environment variables to the device/emulator when deploying and running the app. I added a test to verify environment variables are passed through correctly to all targets. --- documentation/specs/dotnet-run-for-maui.md | 93 ++++++++++- .../Microsoft.DotNet.Cli.Utils/Constants.cs | 16 ++ .../Run/EnvironmentVariablesToMSBuild.cs | 147 ++++++++++++++++++ src/Cli/dotnet/Commands/Run/RunCommand.cs | 44 ++++-- .../dotnet/Commands/Run/RunCommandSelector.cs | 45 ++++++ .../DotnetRunDevices/DotnetRunDevices.csproj | 32 +++- .../Run/GivenDotnetRunSelectsDevice.cs | 131 ++++++++++++++++ 7 files changed, 494 insertions(+), 14 deletions(-) create mode 100644 src/Cli/dotnet/Commands/Run/EnvironmentVariablesToMSBuild.cs diff --git a/documentation/specs/dotnet-run-for-maui.md b/documentation/specs/dotnet-run-for-maui.md index 33fd374d8b67..d66d1d67f4a2 100644 --- a/documentation/specs/dotnet-run-for-maui.md +++ b/documentation/specs/dotnet-run-for-maui.md @@ -86,6 +86,7 @@ to subsequent build, deploy, and run steps._ * `build`: unchanged, but is passed `-p:Device` and optionally `-p:RuntimeIdentifier` if the selected device provided a `%(RuntimeIdentifier)` metadata value. + Environment variables from `-e` are passed as `@(RuntimeEnvironmentVariable)` items. * `deploy` @@ -96,12 +97,15 @@ to subsequent build, deploy, and run steps._ `-p:Device` global MSBuild property, and optionally `-p:RuntimeIdentifier` if the selected device provided a `%(RuntimeIdentifier)` metadata value. + * Environment variables from `-e` are passed as `@(RuntimeEnvironmentVariable)` items. + * This step needs to run, even with `--no-build`, as you may have selected a different device. -* `ComputeRunArguments`: unchanged, but is passed `-p:Device` and optionally - `-p:RuntimeIdentifier` if the selected device provided a `%(RuntimeIdentifier)` - metadata value. +* `ComputeRunArguments`: unchanged, but is passed `-p:Device` and + optionally `-p:RuntimeIdentifier` if the selected device provided a + `%(RuntimeIdentifier)` metadata value. Environment variables from + `-e` are passed as `@(RuntimeEnvironmentVariable)` items. * `run`: unchanged. `ComputeRunArguments` should have set a valid `$(RunCommand)` and `$(RunArguments)` using the value supplied by @@ -146,6 +150,89 @@ A new `--device` switch will: * The iOS and Android workloads will know how to interpret `$(Device)` to select an appropriate device, emulator, or simulator. +## Environment Variables + +The `dotnet run` command supports passing environment variables via the +`-e` or `--environment` option: + +```dotnetcli +dotnet run -e FOO=BAR -e ANOTHER=VALUE +``` + +These environment variables are: + +1. **Passed to the running application** - as process environment + variables when the app is launched. + +2. **Passed to MSBuild during build, deploy, and ComputeRunArguments** - + as `@(RuntimeEnvironmentVariable)` items that workloads can consume. + **This behavior is opt-in**: projects must declare the `RuntimeEnvironmentVariableSupport` + project capability to receive these items. + +```xml + + + + +``` + +This allows workloads (iOS, Android, etc.) to access environment +variables during the `build`, `DeployToDevice`, and `ComputeRunArguments` target execution. + +### Opting In + +To receive environment variables as MSBuild items, projects must opt in by declaring +the `RuntimeEnvironmentVariableSupport` project capability: + +```xml + + + +``` + +Mobile workloads (iOS, Android, etc.) should declare this capability in their SDK targets +so that all projects using those workloads automatically opt in. + +Workloads can consume these items in their MSBuild targets: + +```xml + + + + +``` + +### Implementation Details + +For the **build step**, which uses out-of-process MSBuild via `dotnet build`, +environment variables are injected by creating a temporary `.props` file. +The file is created in the project's `$(IntermediateOutputPath)` directory +(e.g., `obj/Debug/net11.0-android/dotnet-run-env.props`). The path is +obtained from the project evaluation performed during target framework and +device selection. If `IntermediateOutputPath` is not available, the file +falls back to the `obj/` directory. + +The file is passed to MSBuild via the `CustomBeforeMicrosoftCommonProps` property, +ensuring the items are available early in evaluation. +The temporary file is automatically deleted after the build completes. + +The generated props file looks like: + +```xml + + + + + + +``` + +For the **deploy step** (`DeployToDevice` target) and +**ComputeRunArguments target**, which use in-process MSBuild, +environment variables are added directly as +`@(RuntimeEnvironmentVariable)` items to the `ProjectInstance` before +invoking the target. + ## Binary Logs for Device Selection When using `-bl` with `dotnet run`, all MSBuild operations are logged to a single diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Constants.cs b/src/Cli/Microsoft.DotNet.Cli.Utils/Constants.cs index 598d1dfe3483..ee1f84a8a888 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Utils/Constants.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Constants.cs @@ -33,10 +33,26 @@ public static class Constants public const string DeployToDevice = nameof(DeployToDevice); public const string CoreCompile = nameof(CoreCompile); + // MSBuild items + internal const string RuntimeEnvironmentVariable = nameof(RuntimeEnvironmentVariable); + // MSBuild item metadata public const string Identity = nameof(Identity); public const string FullPath = nameof(FullPath); + // MSBuild properties + public const string CustomBeforeMicrosoftCommonProps = nameof(CustomBeforeMicrosoftCommonProps); + public const string IntermediateOutputPath = nameof(IntermediateOutputPath); + + // MSBuild items for project capabilities + public const string ProjectCapability = nameof(ProjectCapability); + + /// + /// Project capability that workloads declare to opt in to receiving environment variables as MSBuild items. + /// When present, 'dotnet run -e' will pass environment variables as @(RuntimeEnvironmentVariable) items. + /// + public const string RuntimeEnvironmentVariableSupport = nameof(RuntimeEnvironmentVariableSupport); + // MSBuild CLI flags /// diff --git a/src/Cli/dotnet/Commands/Run/EnvironmentVariablesToMSBuild.cs b/src/Cli/dotnet/Commands/Run/EnvironmentVariablesToMSBuild.cs new file mode 100644 index 000000000000..7c51ec53f605 --- /dev/null +++ b/src/Cli/dotnet/Commands/Run/EnvironmentVariablesToMSBuild.cs @@ -0,0 +1,147 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System.Collections.ObjectModel; +using System.Xml; +using Microsoft.Build.Execution; +using Microsoft.DotNet.Cli.Utils; + +namespace Microsoft.DotNet.Cli.Commands.Run; + +/// +/// Provides utilities for passing environment variables to MSBuild as items. +/// Environment variables specified via dotnet run -e NAME=VALUE are passed +/// as <RuntimeEnvironmentVariable Include="NAME" Value="VALUE" /> items. +/// +internal static class EnvironmentVariablesToMSBuild +{ + private const string PropsFileName = "dotnet-run-env.props"; + + /// + /// Adds environment variables as MSBuild items to a ProjectInstance. + /// Use this for in-process MSBuild operations (e.g., DeployToDevice target). + /// + /// The MSBuild project instance to add items to. + /// The environment variables to add. + public static void AddAsItems(ProjectInstance projectInstance, IReadOnlyDictionary environmentVariables) + { + foreach (var (name, value) in environmentVariables) + { + projectInstance.AddItem(Constants.RuntimeEnvironmentVariable, name, new Dictionary + { + ["Value"] = value + }); + } + } + + /// + /// Creates a temporary .props file containing environment variables as MSBuild items. + /// Use this for out-of-process MSBuild operations where you need to inject items via + /// CustomBeforeMicrosoftCommonProps property. + /// + /// The full path to the project file. If null or empty, returns null. + /// The environment variables to include. + /// + /// Optional intermediate output path where the file will be created. + /// If null or empty, defaults to "obj" subdirectory of the project directory. + /// + /// The full path to the created props file, or null if no environment variables were specified or projectFilePath is null. + public static string? CreatePropsFile(string? projectFilePath, IReadOnlyDictionary environmentVariables, string? intermediateOutputPath = null) + { + if (string.IsNullOrEmpty(projectFilePath) || environmentVariables.Count == 0) + { + return null; + } + + string projectDirectory = Path.GetDirectoryName(projectFilePath) ?? ""; + + // Normalize path separators - MSBuild may return paths with backslashes on non-Windows + string normalized = intermediateOutputPath?.Replace('\\', Path.DirectorySeparatorChar) ?? ""; + string objDir = string.IsNullOrEmpty(normalized) + ? Path.Combine(projectDirectory, Constants.ObjDirectoryName) + : Path.IsPathRooted(normalized) + ? normalized + : Path.Combine(projectDirectory, normalized); + Directory.CreateDirectory(objDir); + + // Ensure we return a full path for MSBuild property usage + string propsFilePath = Path.GetFullPath(Path.Combine(objDir, PropsFileName)); + using (var stream = File.Create(propsFilePath)) + { + WritePropsFileContent(stream, environmentVariables); + } + + return propsFilePath; + } + + /// + /// Deletes the temporary environment variables props file if it exists. + /// + /// The path to the props file to delete. + public static void DeletePropsFile(string? propsFilePath) + { + if (propsFilePath is not null && File.Exists(propsFilePath)) + { + try + { + File.Delete(propsFilePath); + } + catch (Exception ex) + { + // Best effort cleanup - don't fail the build if we can't delete the temp file + Reporter.Verbose.WriteLine($"Failed to delete temporary props file '{propsFilePath}': {ex.Message}"); + } + } + } + + /// + /// Adds the props file property to the MSBuild arguments. + /// This uses CustomBeforeMicrosoftCommonProps to inject the props file early in evaluation. + /// + /// The base MSBuild arguments. + /// The path to the props file (from ). + /// The MSBuild arguments with the props file property added, or the original args if propsFilePath is null. + public static MSBuildArgs AddPropsFileToArgs(MSBuildArgs msbuildArgs, string? propsFilePath) + { + if (propsFilePath is null) + { + return msbuildArgs; + } + + // Add the props file via CustomBeforeMicrosoftCommonProps. + // This ensures the items are available early in evaluation, similar to how we add items + // directly to ProjectInstance for in-process target invocations. + var additionalProperties = new ReadOnlyDictionary(new Dictionary + { + [Constants.CustomBeforeMicrosoftCommonProps] = propsFilePath + }); + + return msbuildArgs.CloneWithAdditionalProperties(additionalProperties); + } + + /// + /// Writes the content of the .props file containing environment variables as items. + /// + private static void WritePropsFileContent(Stream stream, IReadOnlyDictionary environmentVariables) + { + using var writer = XmlWriter.Create(stream, new XmlWriterSettings + { + OmitXmlDeclaration = true, + Indent = true + }); + + writer.WriteStartElement("Project"); + writer.WriteStartElement("ItemGroup"); + + foreach (var (name, value) in environmentVariables) + { + writer.WriteStartElement(Constants.RuntimeEnvironmentVariable); + writer.WriteAttributeString("Include", name); + writer.WriteAttributeString("Value", value); + writer.WriteEndElement(); + } + + writer.WriteEndElement(); // ItemGroup + writer.WriteEndElement(); // Project + } +} diff --git a/src/Cli/dotnet/Commands/Run/RunCommand.cs b/src/Cli/dotnet/Commands/Run/RunCommand.cs index 66e3e05af9ae..92ce418923a1 100644 --- a/src/Cli/dotnet/Commands/Run/RunCommand.cs +++ b/src/Cli/dotnet/Commands/Run/RunCommand.cs @@ -156,7 +156,7 @@ public int Execute() { // Pre-run evaluation: Handle target framework and device selection for project-based scenarios using var selector = ProjectFileFullPath is not null - ? new RunCommandSelector(ProjectFileFullPath, Interactive, MSBuildArgs, logger) + ? new RunCommandSelector(ProjectFileFullPath, Interactive, MSBuildArgs, EnvironmentVariables, logger) : null; if (selector is not null && !TrySelectTargetFrameworkAndDeviceIfNeeded(selector)) { @@ -186,7 +186,7 @@ public int Execute() Reporter.Output.WriteLine(CliCommandStrings.RunCommandBuilding); } - EnsureProjectIsBuilt(out projectFactory, out cachedRunProperties, out projectBuilder); + EnsureProjectIsBuilt(out projectFactory, out cachedRunProperties, out projectBuilder, selector?.IntermediateOutputPath, selector?.HasRuntimeEnvironmentVariableSupport ?? false); } else if (EntryPointFileFullPath is not null && launchProfileParseResult.Profile is not ExecutableLaunchProfile) { @@ -472,7 +472,7 @@ internal LaunchProfileParseResult ReadLaunchProfileSettings() return LaunchSettings.ReadProfileSettingsFromFile(launchSettingsPath, LaunchProfile); } - private void EnsureProjectIsBuilt(out Func? projectFactory, out RunProperties? cachedRunProperties, out VirtualProjectBuildingCommand? projectBuilder) + private void EnsureProjectIsBuilt(out Func? projectFactory, out RunProperties? cachedRunProperties, out VirtualProjectBuildingCommand? projectBuilder, string? intermediateOutputPath, bool hasRuntimeEnvironmentVariableSupport) { int buildResult; if (EntryPointFileFullPath is not null) @@ -489,11 +489,28 @@ private void EnsureProjectIsBuilt(out Func? projectFactory = null; cachedRunProperties = null; projectBuilder = null; - buildResult = new RestoringCommand( - MSBuildArgs.CloneWithExplicitArgs([ProjectFileFullPath, .. MSBuildArgs.OtherMSBuildArgs]), - NoRestore || _restoreDoneForDeviceSelection, - advertiseWorkloadUpdates: false - ).Execute(); + + // Create temporary props file for environment variables only if the project has opted in. + // This avoids invalidating incremental builds for projects that don't consume the items. + // Use IntermediateOutputPath from earlier project evaluation (via RunCommandSelector), defaulting to "obj" if not available. + string? envPropsFile = hasRuntimeEnvironmentVariableSupport + ? EnvironmentVariablesToMSBuild.CreatePropsFile(ProjectFileFullPath, EnvironmentVariables, intermediateOutputPath) + : null; + try + { + var buildArgs = MSBuildArgs.CloneWithExplicitArgs([ProjectFileFullPath, .. MSBuildArgs.OtherMSBuildArgs]); + buildArgs = EnvironmentVariablesToMSBuild.AddPropsFileToArgs(buildArgs, envPropsFile); + buildResult = new RestoringCommand( + buildArgs, + NoRestore || _restoreDoneForDeviceSelection, + advertiseWorkloadUpdates: false + ).Execute(); + } + finally + { + // Clean up temporary props file + EnvironmentVariablesToMSBuild.DeletePropsFile(envPropsFile); + } } if (buildResult != 0) @@ -575,7 +592,7 @@ private ICommand GetTargetCommandForProject(ProjectLaunchProfile? launchSettings var project = EvaluateProject(ProjectFileFullPath, projectFactory, MSBuildArgs, logger); ValidatePreconditions(project); - InvokeRunArgumentsTarget(project, NoBuild, logger, MSBuildArgs); + InvokeRunArgumentsTarget(project, NoBuild, logger, MSBuildArgs, EnvironmentVariables); var runProperties = RunProperties.FromProject(project).WithApplicationArguments(ApplicationArgs); command = CreateCommandFromRunProperties(runProperties); @@ -663,8 +680,15 @@ static ICommand CreateCommandForCscBuiltProgram(string entryPointFileFullPath, s return command; } - static void InvokeRunArgumentsTarget(ProjectInstance project, bool noBuild, FacadeLogger? binaryLogger, MSBuildArgs buildArgs) + static void InvokeRunArgumentsTarget(ProjectInstance project, bool noBuild, FacadeLogger? binaryLogger, MSBuildArgs buildArgs, IReadOnlyDictionary environmentVariables) { + // Only add environment variables as MSBuild items if the project has opted in via capability + if (project.GetItems(Constants.ProjectCapability) + .Any(item => string.Equals(item.EvaluatedInclude, Constants.RuntimeEnvironmentVariableSupport, StringComparison.OrdinalIgnoreCase))) + { + EnvironmentVariablesToMSBuild.AddAsItems(project, environmentVariables); + } + List loggersForBuild = [ CommonRunHelpers.GetConsoleLogger( buildArgs.CloneWithExplicitArgs([$"--verbosity:{LoggerVerbosity.Quiet.ToString().ToLowerInvariant()}", ..buildArgs.OtherMSBuildArgs]) diff --git a/src/Cli/dotnet/Commands/Run/RunCommandSelector.cs b/src/Cli/dotnet/Commands/Run/RunCommandSelector.cs index b2016b765bf4..982fa2c65e93 100644 --- a/src/Cli/dotnet/Commands/Run/RunCommandSelector.cs +++ b/src/Cli/dotnet/Commands/Run/RunCommandSelector.cs @@ -28,6 +28,7 @@ internal sealed class RunCommandSelector : IDisposable private readonly FacadeLogger? _binaryLogger; private readonly bool _isInteractive; private readonly MSBuildArgs _msbuildArgs; + private readonly IReadOnlyDictionary _environmentVariables; private ProjectCollection? _collection; private Microsoft.Build.Evaluation.Project? _project; @@ -38,20 +39,58 @@ internal sealed class RunCommandSelector : IDisposable /// public bool HasValidProject { get; private set; } + /// + /// Gets the IntermediateOutputPath property from the evaluated project. + /// This will evaluate the project if it hasn't been evaluated yet. + /// Returns null if the project cannot be evaluated or the property is not set. + /// + public string? IntermediateOutputPath + { + get + { + if (OpenProjectIfNeeded(out var projectInstance)) + { + return projectInstance.GetPropertyValue(Constants.IntermediateOutputPath); + } + return null; + } + } + + /// + /// Gets whether the project has opted in to receiving environment variables as MSBuild items. + /// When true, 'dotnet run -e' will pass environment variables as @(RuntimeEnvironmentVariable) items + /// via CustomBeforeMicrosoftCommonProps. + /// + public bool HasRuntimeEnvironmentVariableSupport + { + get + { + if (OpenProjectIfNeeded(out var projectInstance)) + { + return projectInstance.GetItems(Constants.ProjectCapability) + .Any(item => string.Equals(item.EvaluatedInclude, Constants.RuntimeEnvironmentVariableSupport, StringComparison.OrdinalIgnoreCase)); + } + return false; + } + } + /// Path to the project file to evaluate /// Whether to prompt the user for selections /// MSBuild arguments containing properties and verbosity settings + /// Environment variables to pass to MSBuild targets as items /// Optional binary logger for MSBuild operations. The logger will not be disposed by this class. public RunCommandSelector( string projectFilePath, bool isInteractive, MSBuildArgs msbuildArgs, + IReadOnlyDictionary environmentVariables, FacadeLogger? binaryLogger = null) { _projectFilePath = projectFilePath; _globalProperties = CommonRunHelpers.GetGlobalPropertiesFromArgs(msbuildArgs); _isInteractive = isInteractive; _msbuildArgs = msbuildArgs; + _environmentVariables = environmentVariables; _binaryLogger = binaryLogger; } @@ -488,6 +527,12 @@ public bool TryDeployToDevice() return true; } + // Add environment variables as items before building the target, only if opted in + if (HasRuntimeEnvironmentVariableSupport) + { + EnvironmentVariablesToMSBuild.AddAsItems(projectInstance, _environmentVariables); + } + // Build the DeployToDevice target var buildResult = projectInstance.Build( targets: [Constants.DeployToDevice], diff --git a/test/TestAssets/TestProjects/DotnetRunDevices/DotnetRunDevices.csproj b/test/TestAssets/TestProjects/DotnetRunDevices/DotnetRunDevices.csproj index 04ce32c6db1d..8c8991768558 100644 --- a/test/TestAssets/TestProjects/DotnetRunDevices/DotnetRunDevices.csproj +++ b/test/TestAssets/TestProjects/DotnetRunDevices/DotnetRunDevices.csproj @@ -3,8 +3,22 @@ Exe net9.0;$(CurrentTargetFramework) + + false + + + + + + + + + @@ -49,9 +63,25 @@ + + + + + + + + + + - + + + diff --git a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs index c2c1948b12a5..68ac24240d3e 100644 --- a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs +++ b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs @@ -376,4 +376,135 @@ public void ItPassesRuntimeIdentifierToDeployToDeviceTarget() .And.HaveStdOutContaining($"Device: {deviceId}") .And.HaveStdOutContaining($"RuntimeIdentifier: {rid}"); } + + [Fact] + public void ItPassesEnvironmentVariablesToTargets() + { + var testInstance = _testAssetsManager.CopyTestAsset("DotnetRunDevices", identifier: "EnvVarTargets") + .WithSource(); + + string deviceId = "test-device-1"; + string buildBinlogPath = Path.Combine(testInstance.Path, "msbuild.binlog"); + string runBinlogPath = Path.Combine(testInstance.Path, "msbuild-dotnet-run.binlog"); + + var result = new DotnetCommand(Log, "run") + .WithWorkingDirectory(testInstance.Path) + .Execute("--framework", ToolsetInfo.CurrentTargetFramework, "--device", deviceId, + "-e", "FOO=BAR", "-e", "ANOTHER=VALUE", + "-bl"); + + result.Should().Pass(); + + // Verify the binlog files were created + File.Exists(buildBinlogPath).Should().BeTrue("the build binlog file should be created"); + File.Exists(runBinlogPath).Should().BeTrue("the run binlog file should be created"); + + // Verify environment variables were passed to Build target (out-of-process build) + AssertTargetInBinlog(buildBinlogPath, "_LogRuntimeEnvironmentVariableDuringBuild", + targets => + { + targets.Should().NotBeEmpty("_LogRuntimeEnvironmentVariableDuringBuild target should have executed"); + var messages = targets.First().FindChildrenRecursive(); + var envVarMessage = messages.FirstOrDefault(m => m.Text?.Contains("Build: RuntimeEnvironmentVariable=") == true); + envVarMessage.Should().NotBeNull("the Build target should have logged the environment variables"); + envVarMessage.Text.Should().Contain("FOO=BAR").And.Contain("ANOTHER=VALUE"); + }); + + // Verify environment variables were passed to ComputeRunArguments target (in-process) + AssertTargetInBinlog(runBinlogPath, "_LogRuntimeEnvironmentVariableDuringComputeRunArguments", + targets => + { + targets.Should().NotBeEmpty("_LogRuntimeEnvironmentVariableDuringComputeRunArguments target should have executed"); + var messages = targets.First().FindChildrenRecursive(); + var envVarMessage = messages.FirstOrDefault(m => m.Text?.Contains("ComputeRunArguments: RuntimeEnvironmentVariable=") == true); + envVarMessage.Should().NotBeNull("the ComputeRunArguments target should have logged the environment variables"); + envVarMessage.Text.Should().Contain("FOO=BAR").And.Contain("ANOTHER=VALUE"); + }); + + // Verify environment variables were passed to DeployToDevice target (in-process) + AssertTargetInBinlog(runBinlogPath, "DeployToDevice", + targets => + { + targets.Should().NotBeEmpty("DeployToDevice target should have executed"); + var messages = targets.First().FindChildrenRecursive(); + var envVarMessage = messages.FirstOrDefault(m => m.Text?.Contains("DeployToDevice: RuntimeEnvironmentVariable=") == true); + envVarMessage.Should().NotBeNull("the DeployToDevice target should have logged the environment variables"); + envVarMessage.Text.Should().Contain("FOO=BAR").And.Contain("ANOTHER=VALUE"); + }); + + // Verify the props file was created in the correct IntermediateOutputPath location + string tempPropsFile = Path.Combine(testInstance.Path, "obj", "Debug", ToolsetInfo.CurrentTargetFramework, "dotnet-run-env.props"); + var build = BinaryLog.ReadBuild(buildBinlogPath); + var propsFile = build.SourceFiles?.FirstOrDefault(f => f.FullPath.EndsWith("dotnet-run-env.props", StringComparison.OrdinalIgnoreCase)); + propsFile.Should().NotBeNull("dotnet-run-env.props should be embedded in the binlog"); + propsFile.FullPath.Should().Be(tempPropsFile, "the props file should be in the IntermediateOutputPath"); + File.Exists(tempPropsFile).Should().BeFalse("the temporary props file should be deleted after build"); + } + + [Fact] + public void ItDoesNotPassEnvironmentVariablesToTargetsWithoutOptIn() + { + var testInstance = _testAssetsManager.CopyTestAsset("DotnetRunDevices", identifier: "EnvVarNoOptIn") + .WithSource(); + + string deviceId = "test-device-1"; + string buildBinlogPath = Path.Combine(testInstance.Path, "msbuild.binlog"); + string runBinlogPath = Path.Combine(testInstance.Path, "msbuild-dotnet-run.binlog"); + + // Run with EnableRuntimeEnvironmentVariableSupport=false to opt out of the capability + var result = new DotnetCommand(Log, "run") + .WithWorkingDirectory(testInstance.Path) + .Execute("--framework", ToolsetInfo.CurrentTargetFramework, "--device", deviceId, + "-e", "FOO=BAR", "-e", "ANOTHER=VALUE", + "-p:EnableRuntimeEnvironmentVariableSupport=false", + "-bl"); + + result.Should().Pass(); + + // Verify the binlog files were created + File.Exists(buildBinlogPath).Should().BeTrue("the build binlog file should be created"); + File.Exists(runBinlogPath).Should().BeTrue("the run binlog file should be created"); + + // Verify _LogRuntimeEnvironmentVariableDuringBuild target did NOT execute (condition failed due to no items) + AssertTargetInBinlog(buildBinlogPath, "_LogRuntimeEnvironmentVariableDuringBuild", + targets => + { + // The target should either not execute, or execute with no environment variable message + if (targets.Any()) + { + var messages = targets.First().FindChildrenRecursive(); + var envVarMessage = messages.FirstOrDefault(m => m.Text?.Contains("Build: RuntimeEnvironmentVariable=") == true); + envVarMessage.Should().BeNull("the Build target should NOT have logged the environment variables when not opted in"); + } + }); + + // Verify _LogRuntimeEnvironmentVariableDuringComputeRunArguments target did NOT log env vars + AssertTargetInBinlog(runBinlogPath, "_LogRuntimeEnvironmentVariableDuringComputeRunArguments", + targets => + { + if (targets.Any()) + { + var messages = targets.First().FindChildrenRecursive(); + var envVarMessage = messages.FirstOrDefault(m => m.Text?.Contains("ComputeRunArguments: RuntimeEnvironmentVariable=") == true); + envVarMessage.Should().BeNull("the ComputeRunArguments target should NOT have logged the environment variables when not opted in"); + } + }); + + // Verify DeployToDevice target did NOT log actual env var values + AssertTargetInBinlog(runBinlogPath, "DeployToDevice", + targets => + { + targets.Should().NotBeEmpty("DeployToDevice target should have executed"); + var messages = targets.First().FindChildrenRecursive(); + // The message may appear (target has no condition) but should NOT contain actual env var values + var envVarMessage = messages.FirstOrDefault(m => m.Text?.Contains("FOO=BAR") == true || m.Text?.Contains("ANOTHER=VALUE") == true); + envVarMessage.Should().BeNull("the DeployToDevice target should NOT have logged the actual environment variable values when not opted in"); + }); + + // Verify no props file was created (since opt-in is false) + string tempPropsFile = Path.Combine(testInstance.Path, "obj", "Debug", ToolsetInfo.CurrentTargetFramework, "dotnet-run-env.props"); + var build = BinaryLog.ReadBuild(buildBinlogPath); + var propsFile = build.SourceFiles?.FirstOrDefault(f => f.FullPath.EndsWith("dotnet-run-env.props", StringComparison.OrdinalIgnoreCase)); + propsFile.Should().BeNull("dotnet-run-env.props should NOT be created when not opted in"); + } } From 336ce78675c84d0e919bade5c2ec9484a74cdef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 4 Feb 2026 15:14:56 +0000 Subject: [PATCH 257/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e6b1148b4c74..7948c1a3ef52 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26103.119 - 18.3.0-release-26103-119 - 18.3.0-release-26103-119 - 7.3.0-preview.1.10419 - 10.0.200-alpha.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 10.0.0-preview.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 10.0.0-beta.26103.119 - 15.2.200-servicing.26103.119 - 5.3.0-2.26103.119 - 5.3.0-2.26103.119 + 10.0.0-preview.26104.104 + 18.3.0-release-26104-104 + 18.3.0-release-26104-104 + 7.3.0-preview.1.10504 + 10.0.200-alpha.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 10.0.0-preview.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 10.0.0-beta.26104.104 + 15.2.200-servicing.26104.104 + 5.3.0-2.26104.104 + 5.3.0-2.26104.104 10.0.0-preview.7.25377.103 - 10.0.0-preview.26103.119 - 18.3.0-release-26103-119 - 10.0.200-alpha.26103.119 - 10.0.200-alpha.26103.119 - 10.0.200-alpha.26103.119 - 10.0.200-alpha.26103.119 - 10.0.200-alpha.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 10.0.200-preview.26103.119 - 18.3.0-release-26103-119 - 18.3.0-release-26103-119 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 - 7.3.0-preview.1.10419 + 10.0.0-preview.26104.104 + 18.3.0-release-26104-104 + 10.0.200-alpha.26104.104 + 10.0.200-alpha.26104.104 + 10.0.200-alpha.26104.104 + 10.0.200-alpha.26104.104 + 10.0.200-alpha.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 10.0.200-preview.26104.104 + 18.3.0-release-26104-104 + 18.3.0-release-26104-104 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 + 7.3.0-preview.1.10504 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb66b54d6164..cde4f27f887f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d - + https://github.com/dotnet/dotnet - a2bfa4671c2a489b874fb53ff7d5ad54cbd9c80f + 20147765f76aa0f620a8759e7365cab61a47f03d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index c206ba47c440..3d6353222095 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.119", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26103.119", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26104.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26104.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 33536e3815d3d324ae67d3f6d9b2d5f2d181f3ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 5 Feb 2026 02:03:07 +0000 Subject: [PATCH 258/280] Update dependencies from https://github.com/microsoft/testfx build 20260204.5 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26103.9 -> To Version 2.1.0-preview.26104.5 MSTest From Version 4.1.0-preview.26103.9 -> To Version 4.1.0-preview.26104.5 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7948c1a3ef52..cd6c0e33e31c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26103.9 - 4.1.0-preview.26103.9 + 2.1.0-preview.26104.5 + 4.1.0-preview.26104.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cde4f27f887f..e153b27b6a7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 12bdecdbba87490b64a88a233429805f8704ecbb + a2c4911469efabcce5f79d6814ebc6e6f36b7d76 - + https://github.com/microsoft/testfx - 12bdecdbba87490b64a88a233429805f8704ecbb + a2c4911469efabcce5f79d6814ebc6e6f36b7d76 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From d47e7c390760abff71fe40109a451e6911c5e671 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Feb 2026 02:02:22 +0000 Subject: [PATCH 259/280] Update dependencies from https://github.com/microsoft/testfx build 20260205.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26104.5 -> To Version 2.1.0-preview.26105.1 MSTest From Version 4.1.0-preview.26104.5 -> To Version 4.1.0-preview.26105.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index cd6c0e33e31c..3ad9ae1e45d5 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26104.5 - 4.1.0-preview.26104.5 + 2.1.0-preview.26105.1 + 4.1.0-preview.26105.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e153b27b6a7a..3ef4943a7b7f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - a2c4911469efabcce5f79d6814ebc6e6f36b7d76 + 649edbcc0fa7db4e72b10718deb05680e94f7cfa - + https://github.com/microsoft/testfx - a2c4911469efabcce5f79d6814ebc6e6f36b7d76 + 649edbcc0fa7db4e72b10718deb05680e94f7cfa https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From b3e23d7a32e4beb9e61e334eca594c1f220a45a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 6 Feb 2026 14:21:20 +0000 Subject: [PATCH 260/280] Update dependencies --- eng/Version.Details.props | 122 +++++++++---------- eng/Version.Details.xml | 246 +++++++++++++++++++------------------- global.json | 4 +- 3 files changed, 186 insertions(+), 186 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3ad9ae1e45d5..433e6d4bcb44 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26104.104 - 18.3.0-release-26104-104 - 18.3.0-release-26104-104 - 7.3.0-preview.1.10504 - 10.0.200-alpha.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 10.0.0-preview.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 10.0.0-beta.26104.104 - 15.2.200-servicing.26104.104 - 5.3.0-2.26104.104 - 5.3.0-2.26104.104 + 10.0.0-preview.26106.102 + 18.3.0-release-26106-102 + 18.3.0-release-26106-102 + 7.3.0-preview.1.10702 + 10.0.200-alpha.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 10.0.0-preview.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 10.0.0-beta.26106.102 + 15.2.200-servicing.26106.102 + 5.3.0-2.26106.102 + 5.3.0-2.26106.102 10.0.0-preview.7.25377.103 - 10.0.0-preview.26104.104 - 18.3.0-release-26104-104 - 10.0.200-alpha.26104.104 - 10.0.200-alpha.26104.104 - 10.0.200-alpha.26104.104 - 10.0.200-alpha.26104.104 - 10.0.200-alpha.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 10.0.200-preview.26104.104 - 18.3.0-release-26104-104 - 18.3.0-release-26104-104 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 - 7.3.0-preview.1.10504 + 10.0.0-preview.26106.102 + 18.3.0-release-26106-102 + 10.0.200-alpha.26106.102 + 10.0.200-alpha.26106.102 + 10.0.200-alpha.26106.102 + 10.0.200-alpha.26106.102 + 10.0.200-alpha.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 10.0.200-preview.26106.102 + 18.3.0-release-26106-102 + 18.3.0-release-26106-102 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 + 7.3.0-preview.1.10702 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ef4943a7b7f..0e12e23f6763 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d - + https://github.com/dotnet/dotnet - 20147765f76aa0f620a8759e7365cab61a47f03d + c8bc46f9ed494cfc09ab38965d72b6a29d50a90d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/global.json b/global.json index 3d6353222095..55f97ce8896a 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26104.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26104.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26106.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26106.102", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From efe76179724df247481d4a77e650715fa4569dc4 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com> Date: Fri, 6 Feb 2026 19:33:20 +0100 Subject: [PATCH 261/280] Refactor VSHostObject credential extraction for COM compatibility and out-of-process execution (#52856) --- .../Microsoft.NET.Build.Containers.csproj | 1 - .../Tasks/CreateNewImage.cs | 32 +++++ .../Tasks/CreateNewImageToolTask.cs | 4 +- .../VSHostObject.cs | 111 +++++++++++++++--- 4 files changed, 128 insertions(+), 20 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj index 4708b24ea62d..4ffaf57f4a43 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj +++ b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj @@ -85,7 +85,6 @@ - diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 777ed43ee10f..124ee9749f45 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -58,6 +58,38 @@ internal async Task ExecuteAsync(CancellationToken cancellationToken) return !Log.HasLoggedErrors; } + bool credentialsSet = false; + VSHostObject hostObj = new(HostObject, Log); + if (hostObj.TryGetCredentials() is (string userName, string pass)) + { + // Set credentials for the duration of this operation. + // These will be cleared in the finally block to minimize exposure. + Environment.SetEnvironmentVariable(ContainerHelpers.HostObjectUser, userName); + Environment.SetEnvironmentVariable(ContainerHelpers.HostObjectPass, pass); + credentialsSet = true; + } + else + { + Log.LogMessage(MessageImportance.Low, Resource.GetString(nameof(Strings.HostObjectNotDetected))); + } + + try + { + return await ExecuteAsyncCore(logger, msbuildLoggerFactory, cancellationToken).ConfigureAwait(false); + } + finally + { + // Clear credentials from environment to minimize exposure window. + if (credentialsSet) + { + Environment.SetEnvironmentVariable(ContainerHelpers.HostObjectUser, null); + Environment.SetEnvironmentVariable(ContainerHelpers.HostObjectPass, null); + } + } + } + + private async Task ExecuteAsyncCore(ILogger logger, ILoggerFactory msbuildLoggerFactory, CancellationToken cancellationToken) + { RegistryMode sourceRegistryMode = BaseRegistry.Equals(OutputRegistry, StringComparison.InvariantCultureIgnoreCase) ? RegistryMode.PullFromOutput : RegistryMode.Pull; Registry? sourceRegistry = IsLocalPull ? null : new Registry(BaseRegistry, logger, sourceRegistryMode); SourceImageReference sourceImageReference = new(sourceRegistry, BaseImageName, BaseImageTag, BaseImageDigest); diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs index 5381d2afa590..8bcec281ff38 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImageToolTask.cs @@ -63,8 +63,8 @@ private string DotNetPath /// protected override ProcessStartInfo GetProcessStartInfo(string pathToTool, string commandLineCommands, string responseFileSwitch) { - VSHostObject hostObj = new(HostObject as System.Collections.Generic.IEnumerable); - if (hostObj.ExtractCredentials(out string user, out string pass, (string s) => Log.LogWarning(s))) + VSHostObject hostObj = new(HostObject, Log); + if (hostObj.TryGetCredentials() is (string user, string pass)) { extractionInfo = (true, user, pass); } diff --git a/src/Containers/Microsoft.NET.Build.Containers/VSHostObject.cs b/src/Containers/Microsoft.NET.Build.Containers/VSHostObject.cs index f65843f5ae39..89ea5b16ceae 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/VSHostObject.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/VSHostObject.cs @@ -1,44 +1,121 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. +using System.Reflection; +using System.Text.Json; using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; namespace Microsoft.NET.Build.Containers.Tasks; -internal sealed class VSHostObject +internal sealed class VSHostObject(ITaskHost? hostObject, TaskLoggingHelper log) { private const string CredentialItemSpecName = "MsDeployCredential"; private const string UserMetaDataName = "UserName"; private const string PasswordMetaDataName = "Password"; - IEnumerable? _hostObject; - public VSHostObject(IEnumerable? hostObject) + private readonly ITaskHost? _hostObject = hostObject; + private readonly TaskLoggingHelper _log = log; + + /// + /// Tries to extract credentials from the host object. + /// + /// A tuple of (username, password) if credentials were found with non-empty username, null otherwise. + public (string username, string password)? TryGetCredentials() { - _hostObject = hostObject; + if (_hostObject is null) + { + return null; + } + + IEnumerable? taskItems = GetTaskItems(); + if (taskItems is null) + { + _log.LogMessage(MessageImportance.Low, "No task items found in host object."); + return null; + } + + ITaskItem? credentialItem = taskItems.FirstOrDefault(p => p.ItemSpec == CredentialItemSpecName); + if (credentialItem is null) + { + return null; + } + + string username = credentialItem.GetMetadata(UserMetaDataName); + if (string.IsNullOrEmpty(username)) + { + return null; + } + + string password = credentialItem.GetMetadata(PasswordMetaDataName); + return (username, password); } - public bool ExtractCredentials(out string username, out string password, Action logMethod) + private IEnumerable? GetTaskItems() { - bool retVal = false; - username = password = string.Empty; - if (_hostObject != null) + try { - ITaskItem credentialItem = _hostObject.FirstOrDefault(p => p.ItemSpec == CredentialItemSpecName); - if (credentialItem != null) + // This call mirrors the behavior of Microsoft.WebTools.Publish.MSDeploy.VSMsDeployTaskHostObject.QueryAllTaskItems. + // Expected contract: + // - Instance method on the host object named "QueryAllTaskItems". + // - Signature: string QueryAllTaskItems(). + // - Returns a JSON array of objects with the shape: + // [{ "ItemSpec": "", "Metadata": { "": "", ... } }, ...] + // The JSON is deserialized into TaskItemDto records and converted to ITaskItem instances. + // Only UserName and Password metadata are extracted to avoid conflicts with reserved MSBuild metadata. + string? rawTaskItems = (string?)_hostObject!.GetType().InvokeMember( + "QueryAllTaskItems", + BindingFlags.InvokeMethod, + null, + _hostObject, + null); + + if (!string.IsNullOrEmpty(rawTaskItems)) { - retVal = true; - username = credentialItem.GetMetadata(UserMetaDataName); - if (!string.IsNullOrEmpty(username)) + List? dtos = JsonSerializer.Deserialize>(rawTaskItems); + if (dtos is not null && dtos.Count > 0) { - password = credentialItem.GetMetadata(PasswordMetaDataName); + _log.LogMessage(MessageImportance.Low, "Successfully retrieved task items via QueryAllTaskItems."); + return dtos.Select(ConvertToTaskItem).ToList(); } - else + } + + _log.LogMessage(MessageImportance.Low, "QueryAllTaskItems returned null or empty result."); + } + catch (Exception ex) + { + _log.LogMessage(MessageImportance.Low, "Exception trying to call QueryAllTaskItems: {0}", ex.Message); + } + + // Fallback: try to use the host object directly as IEnumerable (legacy behavior). + if (_hostObject is IEnumerable enumerableHost) + { + _log.LogMessage(MessageImportance.Low, "Falling back to IEnumerable host object."); + return enumerableHost; + } + + return null; + + static TaskItem ConvertToTaskItem(TaskItemDto dto) + { + TaskItem taskItem = new(dto.ItemSpec ?? string.Empty); + if (dto.Metadata is not null) + { + if (dto.Metadata.TryGetValue(UserMetaDataName, out string? userName)) { - logMethod("HostObject credentials not detected. Falling back to Docker credential retrieval."); + taskItem.SetMetadata(UserMetaDataName, userName); + } + + if (dto.Metadata.TryGetValue(PasswordMetaDataName, out string? password)) + { + taskItem.SetMetadata(PasswordMetaDataName, password); } } + + return taskItem; } - return retVal; } + + private readonly record struct TaskItemDto(string? ItemSpec, Dictionary? Metadata); } From bb7d62960f0d320c333d08f30db7c52af0003cc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 6 Feb 2026 14:52:29 -0800 Subject: [PATCH 262/280] Add .code-workspace files for all solutions (#52839) --- TemplateEngine.code-workspace | 10 ++++++++++ cli.code-workspace | 10 ++++++++++ containers.code-workspace | 10 ++++++++++ sdk.code-workspace | 10 ++++++++++ source-build.code-workspace | 10 ++++++++++ tasks.code-workspace | 10 ++++++++++ 6 files changed, 60 insertions(+) create mode 100644 TemplateEngine.code-workspace create mode 100644 cli.code-workspace create mode 100644 containers.code-workspace create mode 100644 sdk.code-workspace create mode 100644 source-build.code-workspace create mode 100644 tasks.code-workspace diff --git a/TemplateEngine.code-workspace b/TemplateEngine.code-workspace new file mode 100644 index 000000000000..a0cf99055cd9 --- /dev/null +++ b/TemplateEngine.code-workspace @@ -0,0 +1,10 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "dotnet.defaultSolution": "TemplateEngine.slnf" + } + } diff --git a/cli.code-workspace b/cli.code-workspace new file mode 100644 index 000000000000..4e3fcba684cd --- /dev/null +++ b/cli.code-workspace @@ -0,0 +1,10 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "dotnet.defaultSolution": "cli.slnf" + } + } diff --git a/containers.code-workspace b/containers.code-workspace new file mode 100644 index 000000000000..b7441acdeb5b --- /dev/null +++ b/containers.code-workspace @@ -0,0 +1,10 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "dotnet.defaultSolution": "containers.slnf" + } + } diff --git a/sdk.code-workspace b/sdk.code-workspace new file mode 100644 index 000000000000..22494f2d1d58 --- /dev/null +++ b/sdk.code-workspace @@ -0,0 +1,10 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "dotnet.defaultSolution": "sdk.slnx" + } + } diff --git a/source-build.code-workspace b/source-build.code-workspace new file mode 100644 index 000000000000..55d94da909d0 --- /dev/null +++ b/source-build.code-workspace @@ -0,0 +1,10 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "dotnet.defaultSolution": "source-build.slnf" + } + } diff --git a/tasks.code-workspace b/tasks.code-workspace new file mode 100644 index 000000000000..67a217bc7698 --- /dev/null +++ b/tasks.code-workspace @@ -0,0 +1,10 @@ +{ + "folders": [ + { + "path": "." + } + ], + "settings": { + "dotnet.defaultSolution": "tasks.slnf" + } + } From 1eac263250057e3079ba2c754161d812978581f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Fri, 6 Feb 2026 15:52:11 -0800 Subject: [PATCH 263/280] Lock around access to s_dynamicSymbols (#52887) --- .../DynamicSymbolExtensions.cs | 56 +++++++++++-------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/src/System.CommandLine.StaticCompletions/DynamicSymbolExtensions.cs b/src/System.CommandLine.StaticCompletions/DynamicSymbolExtensions.cs index c59d18c7bec1..18c7275540da 100644 --- a/src/System.CommandLine.StaticCompletions/DynamicSymbolExtensions.cs +++ b/src/System.CommandLine.StaticCompletions/DynamicSymbolExtensions.cs @@ -6,6 +6,8 @@ namespace System.CommandLine.StaticCompletions; /// public static class DynamicSymbolExtensions { + private static readonly Lock s_guard = new(); + /// /// The state that is used to track which symbols are dynamic. /// @@ -18,38 +20,44 @@ public static class DynamicSymbolExtensions /// public bool IsDynamic { - get => s_dynamicSymbols.GetValueOrDefault(option, false); - set => s_dynamicSymbols[option] = value; - } - - /// - /// Mark this option as requiring dynamic completions. - /// - /// - public Option RequiresDynamicCompletion() - { - option.IsDynamic = true; - return option; + get + { + lock (s_guard) + { + return s_dynamicSymbols.GetValueOrDefault(option, false); + } + } + set + { + lock (s_guard) + { + s_dynamicSymbols[option] = value; + } + } } } extension(Argument argument) { - /// Indicates whether this argument requires a dynamic call into the dotnet process to compute completions. - public bool IsDynamic - { - get => s_dynamicSymbols.GetValueOrDefault(argument, false); - set => s_dynamicSymbols[argument] = value; - } - /// - /// Mark this argument as requiring dynamic completions. + /// Indicates whether this argument requires a dynamic call into the dotnet process to compute completions. /// - /// - public Argument RequiresDynamicCompletion() + public bool IsDynamic { - argument.IsDynamic = true; - return argument; + get + { + lock (s_guard) + { + return s_dynamicSymbols.GetValueOrDefault(argument, false); + } + } + set + { + lock (s_guard) + { + s_dynamicSymbols[argument] = value; + } + } } } } From e0e2623eb200bd7dde3303c3d0bfa5f013ad67a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 7 Feb 2026 02:03:10 +0000 Subject: [PATCH 264/280] Update dependencies from https://github.com/microsoft/testfx build 20260206.5 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26105.1 -> To Version 2.1.0-preview.26106.5 MSTest From Version 4.1.0-preview.26105.1 -> To Version 4.1.0-preview.26106.5 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 433e6d4bcb44..511fa6bd0b00 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26105.1 - 4.1.0-preview.26105.1 + 2.1.0-preview.26106.5 + 4.1.0-preview.26106.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0e12e23f6763..c631b9ddbe77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 649edbcc0fa7db4e72b10718deb05680e94f7cfa + a02044d021b6dff22b94655166e50b6819f9989d - + https://github.com/microsoft/testfx - 649edbcc0fa7db4e72b10718deb05680e94f7cfa + a02044d021b6dff22b94655166e50b6819f9989d https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From a5d1968186ade70b93994b61969e51d58ae56b3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 8 Feb 2026 02:01:52 +0000 Subject: [PATCH 265/280] Update dependencies from https://github.com/microsoft/testfx build 20260207.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26105.1 -> To Version 2.1.0-preview.26107.1 MSTest From Version 4.1.0-preview.26105.1 -> To Version 4.1.0-preview.26107.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 511fa6bd0b00..d5aa176e5c98 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26106.5 - 4.1.0-preview.26106.5 + 2.1.0-preview.26107.1 + 4.1.0-preview.26107.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c631b9ddbe77..b5ff3f1473b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - a02044d021b6dff22b94655166e50b6819f9989d + 46578cb4ef47e5ac64818305e50851bcd4fbb4b8 - + https://github.com/microsoft/testfx - a02044d021b6dff22b94655166e50b6819f9989d + 46578cb4ef47e5ac64818305e50851bcd4fbb4b8 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From e219380610f8df0c106201d65e8ee3d0e80b4a1e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Feb 2026 02:02:38 +0000 Subject: [PATCH 266/280] Update dependencies from https://github.com/microsoft/testfx build 20260208.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26105.1 -> To Version 2.1.0-preview.26108.2 MSTest From Version 4.1.0-preview.26105.1 -> To Version 4.1.0-preview.26108.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d5aa176e5c98..b0670b6f0c64 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -144,8 +144,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26107.1 - 4.1.0-preview.26107.1 + 2.1.0-preview.26108.2 + 4.1.0-preview.26108.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5ff3f1473b9..1455e9dd2f61 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -564,13 +564,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 46578cb4ef47e5ac64818305e50851bcd4fbb4b8 + 8d0f926788049a72e5292c827020e87bb454d371 - + https://github.com/microsoft/testfx - 46578cb4ef47e5ac64818305e50851bcd4fbb4b8 + 8d0f926788049a72e5292c827020e87bb454d371 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet From dc14e8cc20f51154c5d4bd3435781bcd9d407dcf Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 9 Feb 2026 15:18:52 -0800 Subject: [PATCH 267/280] Update release branch version in CI configuration --- .vsts-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 5520cb455b24..0e68e2255b28 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -5,7 +5,7 @@ trigger: branches: include: - main - - release/10.0.2* + - release/10.0.3* - internal/release/* - exp/* From d24cb617f158802fb2b1ae4e246eb37b42ddb75c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 9 Feb 2026 23:19:28 +0000 Subject: [PATCH 268/280] Reset files to release/10.0.3xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 2 + eng/Version.Details.props | 267 +++++++++---------- eng/Version.Details.xml | 539 +++++++++++++++++++------------------- global.json | 6 +- 4 files changed, 411 insertions(+), 403 deletions(-) diff --git a/NuGet.config b/NuGet.config index f3f728c95515..ff0d29fb990d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -39,6 +40,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b0670b6f0c64..d6708ed330ab 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,146 +6,147 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26106.102 - 18.3.0-release-26106-102 - 18.3.0-release-26106-102 - 7.3.0-preview.1.10702 - 10.0.200-alpha.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 10.0.0-preview.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 10.0.0-beta.26106.102 - 15.2.200-servicing.26106.102 - 5.3.0-2.26106.102 - 5.3.0-2.26106.102 + 10.0.0-preview.26076.108 + 18.3.0-preview-26076-108 + 18.3.0-preview-26076-108 + 7.3.0-preview.1.7708 + 10.0.300-alpha.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-preview.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 10.0.0-beta.26076.108 + 15.2.300-servicing.26076.108 + 5.3.0-2.26076.108 + 5.3.0-2.26076.108 10.0.0-preview.7.25377.103 - 10.0.0-preview.26106.102 - 18.3.0-release-26106-102 - 10.0.200-alpha.26106.102 - 10.0.200-alpha.26106.102 - 10.0.200-alpha.26106.102 - 10.0.200-alpha.26106.102 - 10.0.200-alpha.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 10.0.200-preview.26106.102 - 18.3.0-release-26106-102 - 18.3.0-release-26106-102 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 - 7.3.0-preview.1.10702 + 10.0.0-preview.26076.108 + 18.3.0-release-26076-108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.300-alpha.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 10.0.200-preview.26076.108 + 18.3.0-release-26076-108 + 18.3.0-release-26076-108 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 + 7.3.0-preview.1.7708 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.0-preview.1.25612.105 - 2.2.2 - 10.0.2 - 10.0.2 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 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.25569.105 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1 + 2.0.0-preview.1.25569.105 + 2.2.1-beta.25569.105 + 10.0.1 + 10.0.1 10.0.0-rtm.25523.111 10.0.0-rtm.25523.111 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 3.2.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 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-servicing.25569.105 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 3.2.1-servicing.25569.105 + 10.0.1 + 10.0.1-servicing.25569.105 + 10.0.1 + 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 - 2.1.0-preview.26108.2 - 4.1.0-preview.26108.2 + 2.1.0-preview.25571.1 + 4.1.0-preview.25571.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1455e9dd2f61..cde5e4dcbb9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + fad253f51b461736dfd3cd9c15977bb7493becef + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,53 +533,53 @@ - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://github.com/dotnet/dotnet - c8bc46f9ed494cfc09ab38965d72b6a29d50a90d + 3b3cc2b93b356d46a6fb36768479ea53515fc2cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef - + https://github.com/microsoft/testfx - 8d0f926788049a72e5292c827020e87bb454d371 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://github.com/microsoft/testfx - 8d0f926788049a72e5292c827020e87bb454d371 + 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + fad253f51b461736dfd3cd9c15977bb7493becef diff --git a/global.json b/global.json index 55f97ce8896a..d197f033377b 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "10.0.101", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26106.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26106.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From a087a43a171159327092d5738c4a84381c51f45c Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Tue, 10 Feb 2026 06:30:53 -0600 Subject: [PATCH 269/280] [release/10.0.3xx] [wasm] Embed HotReload in WebAssembly SDK (#52881) --- build/RunTestsOnHelix.cmd | 3 +- build/RunTestsOnHelix.sh | 3 +- ...otNet.HotReload.WebAssembly.Browser.csproj | 15 +- src/WasmSdk/Sdk/Sdk.targets | 53 +- ...Microsoft.NET.Sdk.WebAssembly.Tasks.csproj | 11 +- ...ootJsonManifest.Build.staticwebassets.json | 269 ++-- ...iesAreCopiedToBuildOutput.Build.files.json | 2 + ...edToBuildOutput.Build.staticwebassets.json | 323 ++--- ...duleTargetPaths.Build.staticwebassets.json | 419 +++--- ...izeBlazorInitialization.Publish.files.json | 15 - ...nitialization.Publish.staticwebassets.json | 797 +---------- ...tBuildAndPublishModules.Publish.files.json | 15 - ...ublishModules.Publish.staticwebassets.json | 797 +---------- ...izeBlazorInitialization.Publish.files.json | 12 - ...nitialization.Publish.staticwebassets.json | 797 +---------- ...nBlazorBootJsonManifest.Publish.files.json | 15 - ...tJsonManifest.Publish.staticwebassets.json | 797 +---------- ...Assets_BuildMinimal_Works.Build.files.json | 2 + ...ldMinimal_Works.Build.staticwebassets.json | 295 ++--- ...ld_Hosted_Works.Build.staticwebassets.json | 419 +++--- ...ts_PublishMinimal_Works.Publish.files.json | 15 - ...Minimal_Works.Publish.staticwebassets.json | 801 +---------- ...mentationFiles_AsAssets.Publish.files.json | 21 - ...iles_AsAssets.Publish.staticwebassets.json | 1169 ++--------------- ...ts_Publish_Hosted_Works.Publish.files.json | 21 - ..._Hosted_Works.Publish.staticwebassets.json | 1169 ++--------------- .../StaticWebAssetsBaselineFactory.cs | 31 + .../Properties/launchSettings.json | 2 +- .../Properties/launchSettings.json | 2 +- 29 files changed, 1366 insertions(+), 6924 deletions(-) diff --git a/build/RunTestsOnHelix.cmd b/build/RunTestsOnHelix.cmd index 3dc68bb7f8af..04b5ce4c846b 100644 --- a/build/RunTestsOnHelix.cmd +++ b/build/RunTestsOnHelix.cmd @@ -33,10 +33,9 @@ set DOTNET_SDK_TEST_ASSETS_DIRECTORY=%TestExecutionDirectory%\TestAssets REM call dotnet new so the first run message doesn't interfere with the first test dotnet new --debug:ephemeral-hive -REM We downloaded a special zip of files to the .nuget folder so add that as a source +REM List current NuGet sources and, if test packages are present, add them as a local source dotnet nuget list source --configfile %TestExecutionDirectory%\nuget.config PowerShell -ExecutionPolicy ByPass "dotnet nuget locals all -l | ForEach-Object { $_.Split(' ')[1]} | Where-Object{$_ -like '*cache'} | Get-ChildItem -Recurse -File -Filter '*.dat' | Measure" -dotnet nuget add source %DOTNET_ROOT%\.nuget --configfile %TestExecutionDirectory%\nuget.config if exist %TestExecutionDirectory%\Testpackages dotnet nuget add source %TestExecutionDirectory%\Testpackages --name testpackages --configfile %TestExecutionDirectory%\nuget.config dotnet nuget remove source dotnet6-transport --configfile %TestExecutionDirectory%\nuget.config diff --git a/build/RunTestsOnHelix.sh b/build/RunTestsOnHelix.sh index 640138d7d8f7..e23b665a1b63 100644 --- a/build/RunTestsOnHelix.sh +++ b/build/RunTestsOnHelix.sh @@ -20,9 +20,8 @@ export DOTNET_SDK_TEST_ASSETS_DIRECTORY=$TestExecutionDirectory/TestAssets # call dotnet new so the first run message doesn't interfere with the first test dotnet new --debug:ephemeral-hive -# We downloaded a special zip of files to the .nuget folder so add that as a source +# Add the local test packages directory as a NuGet source for this test run dotnet nuget list source --configfile $TestExecutionDirectory/NuGet.config -dotnet nuget add source $DOTNET_ROOT/.nuget --configfile $TestExecutionDirectory/NuGet.config dotnet nuget add source $TestExecutionDirectory/Testpackages --configfile $TestExecutionDirectory/NuGet.config #Remove feeds not needed for tests dotnet nuget remove source dotnet6-transport --configfile $TestExecutionDirectory/NuGet.config diff --git a/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj b/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj index 1cad23202de5..a0d40707e07a 100644 --- a/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj +++ b/src/BuiltInTools/HotReloadAgent.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.csproj @@ -1,26 +1,19 @@ - + - $(SdkTargetFramework) + net10.0 false false preview true - - - true - true - true - Microsoft.DotNet.HotReload.WebAssembly.Browser - HotReload package for WebAssembly - - $(NoWarn);NU5128 + + diff --git a/src/WasmSdk/Sdk/Sdk.targets b/src/WasmSdk/Sdk/Sdk.targets index bddb0ca2d2bd..d566696af777 100644 --- a/src/WasmSdk/Sdk/Sdk.targets +++ b/src/WasmSdk/Sdk/Sdk.targets @@ -16,15 +16,60 @@ Copyright (c) .NET Foundation. All rights reserved. - <_WasmEnableHotReload>$(WasmEnableHotReload) <_WasmEnableHotReload Condition="'$(_WasmEnableHotReload)' == '' and '$(Configuration)' != 'Debug'">false <_WasmEnableHotReload Condition="'$(_WasmEnableHotReload)' == '' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '10.0'))">true - - - + + + <_WasmHotReloadTfm Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(TargetFrameworkVersion)', '10.0'))">net10.0 + <_WasmHotReloadPath Condition="'$(_WasmHotReloadTfm)' != ''">$([MSBuild]::NormalizeDirectory($(MSBuildThisFileDirectory), '..', 'hotreload', $(_WasmHotReloadTfm))) + <_WasmHotReloadIntermediatePath>$(IntermediateOutputPath)hotreload\ + + + + + + + + PreserveNewest + Never + + <_WasmHotReloadModule Include="$(_WasmHotReloadIntermediatePath)Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js"> + _framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js + + <_WasmHotReloadModule Update="@(_WasmHotReloadModule)"> + %(Identity) + + + + + + + + + + diff --git a/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj b/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj index f4c9bb3ee99d..dd1dbc5142dd 100644 --- a/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj +++ b/src/WasmSdk/Tasks/Microsoft.NET.Sdk.WebAssembly.Tasks.csproj @@ -1,4 +1,4 @@ - + $(RepoRoot)\src\WasmSdk\ @@ -39,6 +39,11 @@ + + true + false + TargetFramework;TargetFrameworks + true targets @@ -47,6 +52,10 @@ true Sdk + + true + hotreload + diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json index fe73bd7957a6..957c98679c27 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json @@ -4777,29 +4777,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "SourceId": "blazorwasm-minimal", @@ -4961,6 +4938,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "SourceId": "blazorwasm-minimal", @@ -9631,13 +9631,13 @@ "LastWriteTime": "0001-01-01T00:00:00+00:00" }, { - "Identity": "${ProjectPath}\\wwwroot\\blazorwasm-minimal.lib.module.js", + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", "SourceId": "blazorwasm-minimal", - "SourceType": "Discovered", - "ContentRoot": "${ProjectPath}\\wwwroot\\", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\", "BasePath": "/", - "RelativePath": "blazorwasm-minimal.lib.module.js", - "AssetKind": "All", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetKind": "Build", "AssetMode": "All", "AssetRole": "Primary", "AssetMergeBehavior": "", @@ -9649,40 +9649,40 @@ "Integrity": "__integrity__", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\blazorwasm-minimal.lib.module.js", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, { - "Identity": "${ProjectPath}\\wwwroot\\css\\app.css", + "Identity": "${ProjectPath}\\wwwroot\\blazorwasm-minimal.lib.module.js", "SourceId": "blazorwasm-minimal", "SourceType": "Discovered", "ContentRoot": "${ProjectPath}\\wwwroot\\", "BasePath": "/", - "RelativePath": "css/app.css", + "RelativePath": "blazorwasm-minimal.lib.module.js", "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", "AssetMergeBehavior": "", "AssetMergeSource": "", "RelatedAsset": "", - "AssetTraitName": "", - "AssetTraitValue": "", + "AssetTraitName": "JSModule", + "AssetTraitValue": "JSLibraryModule", "Fingerprint": "__fingerprint__", "Integrity": "__integrity__", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\css\\app.css", + "OriginalItemSpec": "wwwroot\\blazorwasm-minimal.lib.module.js", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, { - "Identity": "${ProjectPath}\\wwwroot\\index.html", + "Identity": "${ProjectPath}\\wwwroot\\css\\app.css", "SourceId": "blazorwasm-minimal", "SourceType": "Discovered", "ContentRoot": "${ProjectPath}\\wwwroot\\", "BasePath": "/", - "RelativePath": "index.html", + "RelativePath": "css/app.css", "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", @@ -9695,30 +9695,30 @@ "Integrity": "__integrity__", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\index.html", + "OriginalItemSpec": "wwwroot\\css\\app.css", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", + "Identity": "${ProjectPath}\\wwwroot\\index.html", + "SourceId": "blazorwasm-minimal", + "SourceType": "Discovered", + "ContentRoot": "${ProjectPath}\\wwwroot\\", + "BasePath": "/", + "RelativePath": "index.html", "AssetKind": "All", "AssetMode": "All", "AssetRole": "Primary", "AssetMergeBehavior": "", "AssetMergeSource": "", "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", + "AssetTraitName": "", + "AssetTraitValue": "", "Fingerprint": "__fingerprint__", "Integrity": "__integrity__", "CopyToOutputDirectory": "Never", "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", + "OriginalItemSpec": "wwwroot\\index.html", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" } @@ -17408,8 +17408,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", + "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17426,7 +17426,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "application/wasm" }, { "Name": "ETag", @@ -17449,8 +17449,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", + "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17473,7 +17473,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "application/wasm" }, { "Name": "ETag", @@ -17489,10 +17489,6 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, { "Name": "integrity", "Value": "__integrity__" @@ -17500,16 +17496,12 @@ { "Name": "original-resource", "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" } ] }, { - "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17549,8 +17541,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17600,8 +17592,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17641,8 +17633,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17692,8 +17684,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17733,8 +17725,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17784,8 +17776,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17825,8 +17817,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17876,8 +17868,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17917,8 +17909,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17968,8 +17960,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", + "Route": "_framework/Microsoft.CSharp.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -18009,8 +18001,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", + "Route": "_framework/Microsoft.CSharp.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -18060,8 +18052,8 @@ ] }, { - "Route": "_framework/Microsoft.CSharp.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "Selectors": [], "ResponseHeaders": [ { @@ -18078,7 +18070,7 @@ }, { "Name": "Content-Type", - "Value": "application/wasm" + "Value": "text/javascript" }, { "Name": "ETag", @@ -18101,8 +18093,8 @@ ] }, { - "Route": "_framework/Microsoft.CSharp.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -18125,7 +18117,7 @@ }, { "Name": "Content-Type", - "Value": "application/wasm" + "Value": "text/javascript" }, { "Name": "ETag", @@ -36860,8 +36852,8 @@ ] }, { - "Route": "blazorwasm-minimal.lib.module.js", - "AssetFile": "${ProjectPath}\\wwwroot\\blazorwasm-minimal.lib.module.js", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", "Selectors": [], "ResponseHeaders": [ { @@ -36890,23 +36882,15 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, { "Name": "integrity", "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" } ] }, { - "Route": "css/app.css", - "AssetFile": "${ProjectPath}\\wwwroot\\css\\app.css", + "Route": "blazorwasm-minimal.lib.module.js", + "AssetFile": "${ProjectPath}\\wwwroot\\blazorwasm-minimal.lib.module.js", "Selectors": [], "ResponseHeaders": [ { @@ -36919,7 +36903,7 @@ }, { "Name": "Content-Type", - "Value": "text/css" + "Value": "text/javascript" }, { "Name": "ETag", @@ -36936,51 +36920,22 @@ ], "EndpointProperties": [ { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "index.html", - "AssetFile": "${ProjectPath}\\wwwroot\\index.html", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/html" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" + "Name": "dependency-group", + "Value": "js-initializer" }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ { "Name": "integrity", "Value": "__integrity__" + }, + { + "Name": "script-type", + "Value": "module" } ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", + "Route": "css/app.css", + "AssetFile": "${ProjectPath}\\wwwroot\\css\\app.css", "Selectors": [], "ResponseHeaders": [ { @@ -36993,7 +36948,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "text/css" }, { "Name": "ETag", @@ -37009,28 +36964,20 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, { "Name": "integrity", "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" } ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", + "Route": "index.html", + "AssetFile": "${ProjectPath}\\wwwroot\\index.html", "Selectors": [], "ResponseHeaders": [ { "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" + "Value": "no-cache" }, { "Name": "Content-Length", @@ -37038,7 +36985,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "text/html" }, { "Name": "ETag", @@ -37054,25 +37001,9 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, { "Name": "integrity", "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" } ] } diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json index 36188a7e33e2..ce358b8aec11 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json @@ -253,6 +253,7 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.CSharp.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.wasm.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Configuration.Abstractions.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Configuration.Binder.wasm.gz", @@ -491,6 +492,7 @@ "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\zh-Hant\\Microsoft.CodeAnalysis.resources.wasm.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\custom-service-worker-assets.js.gz", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\serviceworkers\\my-service-worker.js.gz", + "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\my-service-worker.js.build", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json index ddbbbfe0dbae..2ba7b6a2e608 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json @@ -5750,29 +5750,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "SourceId": "blazorwasm", @@ -5980,6 +5957,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "SourceId": "blazorwasm", @@ -11546,6 +11546,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "SourceId": "blazorwasm", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "JSModule", + "AssetTraitValue": "JSLibraryModule", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", "SourceId": "blazorwasm", @@ -11752,29 +11775,6 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ @@ -21034,8 +21034,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", + "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21052,7 +21052,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "application/wasm" }, { "Name": "ETag", @@ -21075,8 +21075,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", + "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21099,7 +21099,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "application/wasm" }, { "Name": "ETag", @@ -21115,10 +21115,6 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, { "Name": "integrity", "Value": "__integrity__" @@ -21126,16 +21122,12 @@ { "Name": "original-resource", "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" } ] }, { - "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21175,8 +21167,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21226,8 +21218,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21267,8 +21259,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21318,8 +21310,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21359,8 +21351,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21410,8 +21402,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21451,8 +21443,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21502,8 +21494,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21543,8 +21535,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21594,8 +21586,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", + "Route": "_framework/Microsoft.CSharp.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21635,8 +21627,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", + "Route": "_framework/Microsoft.CSharp.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21686,8 +21678,8 @@ ] }, { - "Route": "_framework/Microsoft.CSharp.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "Route": "_framework/Microsoft.CodeAnalysis.CSharp.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.CSharp.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21727,8 +21719,8 @@ ] }, { - "Route": "_framework/Microsoft.CSharp.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "Route": "_framework/Microsoft.CodeAnalysis.CSharp.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.CSharp.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21778,8 +21770,8 @@ ] }, { - "Route": "_framework/Microsoft.CodeAnalysis.CSharp.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.CSharp.wasm.gz", + "Route": "_framework/Microsoft.CodeAnalysis.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21819,8 +21811,8 @@ ] }, { - "Route": "_framework/Microsoft.CodeAnalysis.CSharp.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.CSharp.wasm.gz", + "Route": "_framework/Microsoft.CodeAnalysis.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21870,8 +21862,8 @@ ] }, { - "Route": "_framework/Microsoft.CodeAnalysis.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.wasm.gz", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "Selectors": [], "ResponseHeaders": [ { @@ -21888,7 +21880,7 @@ }, { "Name": "Content-Type", - "Value": "application/wasm" + "Value": "text/javascript" }, { "Name": "ETag", @@ -21911,8 +21903,8 @@ ] }, { - "Route": "_framework/Microsoft.CodeAnalysis.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CodeAnalysis.wasm.gz", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21935,7 +21927,7 @@ }, { "Name": "Content-Type", - "Value": "application/wasm" + "Value": "text/javascript" }, { "Name": "ETag", @@ -44249,6 +44241,43 @@ } ] }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "custom-service-worker-assets.js", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", @@ -44691,104 +44720,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json index 62c87d9c4926..b70ed50747e0 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JSModules_ManifestIncludesModuleTargetPaths.Build.staticwebassets.json @@ -46,29 +46,6 @@ } ], "Assets": [ - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\blazorhosted.modules.json.gz", "SourceId": "blazorhosted", @@ -5106,6 +5083,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "SourceId": "blazorwasm", @@ -9867,6 +9867,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "JSModule", + "AssetTraitValue": "JSLibraryModule", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", "SourceId": "blazorwasm", @@ -10142,132 +10165,9 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "blazorhosted.modules.json.gz", "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\blazorhosted.modules.json.gz", @@ -18890,6 +18790,98 @@ } ] }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "original-resource", + "Value": "__original-resource__" + } + ] + }, { "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", @@ -37966,6 +37958,43 @@ } ] }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "custom-service-worker-assets.js", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", @@ -38598,104 +38627,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json index 5784df2e02a0..33ac5ec7cafa 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.files.json @@ -2,9 +2,6 @@ "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.br", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -125,9 +122,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -326,8 +320,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Private.CoreLib.wasm.br", @@ -430,7 +422,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Linq.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Memory.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Http.wasm", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.CoreLib.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.Uri.wasm", @@ -458,9 +449,6 @@ "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.br", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -581,9 +569,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index 056f5a7cfad6..deaec923473e 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -177,29 +177,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", "SourceId": "blazorwasm-minimal", @@ -407,29 +384,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "SourceId": "blazorwasm-minimal", @@ -2270,52 +2224,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm-minimal", @@ -4731,29 +4639,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm-minimal", @@ -5374,29 +5259,6 @@ "OriginalItemSpec": "wwwroot\\index.html", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ @@ -5659,106 +5521,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/blazor.webassembly.js.gz", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -6595,106 +6357,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.br", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", @@ -12441,192 +12103,8 @@ ] }, { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12676,8 +12154,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12717,8 +12195,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12768,8 +12246,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12809,8 +12287,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12860,8 +12338,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12901,8 +12379,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12952,8 +12430,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12993,8 +12471,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13044,8 +12522,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13085,8 +12563,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13136,8 +12614,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13177,8 +12655,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13228,8 +12706,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13269,8 +12747,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13320,8 +12798,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13361,8 +12839,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13412,8 +12890,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13453,8 +12931,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13504,8 +12982,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13545,8 +13023,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13596,8 +13074,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13637,8 +13115,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13688,8 +13166,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13729,8 +13207,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13780,8 +13258,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13821,8 +13299,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13872,8 +13350,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13913,8 +13391,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13964,8 +13442,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14005,8 +13483,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14056,8 +13534,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14097,8 +13575,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14148,8 +13626,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14189,8 +13667,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21669,43 +21147,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -22712,104 +22153,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json index d24f87704683..52d41eca596b 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.files.json @@ -1,7 +1,4 @@ [ - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -122,9 +119,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -321,8 +315,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Private.CoreLib.wasm.br", @@ -424,7 +416,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Linq.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Memory.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Http.wasm", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.CoreLib.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.Uri.wasm", @@ -449,9 +440,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\blazorwasm-minimal.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\netstandard.wasm", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -572,9 +560,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json index 364bf71213a5..e88d9f4ca556 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_CanHaveDifferentBuildAndPublishModules.Publish.staticwebassets.json @@ -177,29 +177,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", "SourceId": "blazorwasm-minimal", @@ -361,29 +338,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "SourceId": "blazorwasm-minimal", @@ -2224,52 +2178,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm-minimal", @@ -4662,29 +4570,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm-minimal", @@ -5305,29 +5190,6 @@ "OriginalItemSpec": "wwwroot\\index.html", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ @@ -5590,106 +5452,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/blazor.webassembly.js.gz", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -6342,106 +6104,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.br", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", @@ -12188,192 +11850,8 @@ ] }, { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12423,8 +11901,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12464,8 +11942,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12515,8 +11993,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12556,8 +12034,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12607,8 +12085,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12648,8 +12126,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12699,8 +12177,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12740,8 +12218,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12791,8 +12269,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12832,8 +12310,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12883,8 +12361,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12924,8 +12402,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12975,8 +12453,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13016,8 +12494,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13067,8 +12545,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13108,8 +12586,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13159,8 +12637,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13200,8 +12678,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13251,8 +12729,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13292,8 +12770,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13343,8 +12821,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13384,8 +12862,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13435,8 +12913,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13476,8 +12954,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13527,8 +13005,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13568,8 +13046,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13619,8 +13097,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13660,8 +13138,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13711,8 +13189,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13752,8 +13230,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13803,8 +13281,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13844,8 +13322,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13895,8 +13373,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13936,8 +13414,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21379,43 +20857,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -22422,104 +21863,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json index 91531b2e8c8c..85d26b013737 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.files.json @@ -5,9 +5,6 @@ "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.br", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.br", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.gz", @@ -137,9 +134,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -263,9 +257,6 @@ "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.br", "${OutputPath}\\wwwroot\\_bin\\publish.extension.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.br", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.gz", @@ -395,9 +386,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json index a32e09aa5828..a44482a27aa8 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/JsModules_Hosted_CanCustomizeBlazorInitialization.Publish.staticwebassets.json @@ -46,52 +46,6 @@ } ], "Assets": [ - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", "SourceId": "blazorhosted", @@ -2484,52 +2438,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm", @@ -5106,29 +5014,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm", @@ -5887,232 +5772,9 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "blazorhosted.modules.json.br", "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", @@ -13580,192 +13242,8 @@ ] }, { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13815,8 +13293,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13856,8 +13334,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13907,8 +13385,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13948,8 +13426,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13999,8 +13477,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14040,8 +13518,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14091,8 +13569,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14132,8 +13610,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14183,8 +13661,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14224,8 +13702,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14275,8 +13753,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14316,8 +13794,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14367,8 +13845,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14408,8 +13886,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14459,8 +13937,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14500,8 +13978,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14551,8 +14029,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14592,8 +14070,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14643,8 +14121,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14684,8 +14162,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14735,8 +14213,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14776,8 +14254,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14827,8 +14305,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14868,8 +14346,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14919,8 +14397,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14960,8 +14438,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -15011,8 +14489,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -15052,8 +14530,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -15103,8 +14581,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -15144,8 +14622,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -15195,8 +14673,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -15236,8 +14714,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -15287,8 +14765,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -15328,8 +14806,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -23287,43 +22765,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -24772,104 +24213,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json index d24f87704683..52d41eca596b 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.files.json @@ -1,7 +1,4 @@ [ - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -122,9 +119,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -321,8 +315,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Private.CoreLib.wasm.br", @@ -424,7 +416,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Linq.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Memory.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Http.wasm", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.CoreLib.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.Uri.wasm", @@ -449,9 +440,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\blazorwasm-minimal.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\netstandard.wasm", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -572,9 +560,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json index 8a5ffd77118f..51081628f6c8 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Publish_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Publish.staticwebassets.json @@ -177,29 +177,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", "SourceId": "blazorwasm-minimal", @@ -361,29 +338,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "SourceId": "blazorwasm-minimal", @@ -2224,52 +2178,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm-minimal", @@ -4662,29 +4570,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm-minimal", @@ -5305,29 +5190,6 @@ "OriginalItemSpec": "wwwroot\\index.html", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ @@ -5590,106 +5452,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/blazor.webassembly.js.gz", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -6342,106 +6104,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.br", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", @@ -12188,192 +11850,8 @@ ] }, { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12423,8 +11901,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12464,8 +11942,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12515,8 +11993,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12556,8 +12034,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12607,8 +12085,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12648,8 +12126,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12699,8 +12177,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12740,8 +12218,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12791,8 +12269,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12832,8 +12310,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -12883,8 +12361,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12924,8 +12402,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12975,8 +12453,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13016,8 +12494,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13067,8 +12545,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13108,8 +12586,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13159,8 +12637,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13200,8 +12678,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13251,8 +12729,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13292,8 +12770,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13343,8 +12821,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13384,8 +12862,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13435,8 +12913,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13476,8 +12954,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13527,8 +13005,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13568,8 +13046,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13619,8 +13097,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13660,8 +13138,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13711,8 +13189,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13752,8 +13230,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13803,8 +13281,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13844,8 +13322,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13895,8 +13373,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13936,8 +13414,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -21379,43 +20857,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -22422,104 +21863,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json index b16bbbb0ba71..f4ee3f0e961f 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.files.json @@ -213,6 +213,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Configuration.Abstractions.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.Extensions.Configuration.Binder.wasm.gz", @@ -415,6 +416,7 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\netstandard.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\blazorwasm-minimal#[.{fingerprint=__fingerprint__}]!.bundle.scp.css.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\blazorwasm-minimal#[.{fingerprint=__fingerprint__}]?.styles.css.gz", + "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json index 002f2f85ed28..7850e1b62294 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_BuildMinimal_Works.Build.staticwebassets.json @@ -4777,29 +4777,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "SourceId": "blazorwasm-minimal", @@ -4961,6 +4938,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "SourceId": "blazorwasm-minimal", @@ -9676,6 +9676,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "SourceId": "blazorwasm-minimal", + "SourceType": "Computed", + "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "JSModule", + "AssetTraitValue": "JSLibraryModule", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", "SourceId": "blazorwasm-minimal", @@ -9790,29 +9813,6 @@ "OriginalItemSpec": "wwwroot\\index.html", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ @@ -17500,8 +17500,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", + "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17518,7 +17518,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "application/wasm" }, { "Name": "ETag", @@ -17541,8 +17541,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", + "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17565,7 +17565,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "application/wasm" }, { "Name": "ETag", @@ -17581,10 +17581,6 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, { "Name": "integrity", "Value": "__integrity__" @@ -17592,16 +17588,12 @@ { "Name": "original-resource", "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" } ] }, { - "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17641,8 +17633,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17692,8 +17684,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17733,8 +17725,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Forms.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Forms.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17784,8 +17776,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17825,8 +17817,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.Web.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.Web.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17876,8 +17868,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -17917,8 +17909,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.WebAssembly.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.WebAssembly.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Components.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -17968,8 +17960,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -18009,8 +18001,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Components.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Components.wasm.gz", + "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -18060,8 +18052,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", + "Route": "_framework/Microsoft.CSharp.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -18101,8 +18093,8 @@ ] }, { - "Route": "_framework/Microsoft.AspNetCore.Metadata.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.AspNetCore.Metadata.wasm.gz", + "Route": "_framework/Microsoft.CSharp.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -18152,8 +18144,8 @@ ] }, { - "Route": "_framework/Microsoft.CSharp.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "Selectors": [], "ResponseHeaders": [ { @@ -18170,7 +18162,7 @@ }, { "Name": "Content-Type", - "Value": "application/wasm" + "Value": "text/javascript" }, { "Name": "ETag", @@ -18193,8 +18185,8 @@ ] }, { - "Route": "_framework/Microsoft.CSharp.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.CSharp.wasm.gz", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -18217,7 +18209,7 @@ }, { "Name": "Content-Type", - "Value": "application/wasm" + "Value": "text/javascript" }, { "Name": "ETag", @@ -37344,8 +37336,8 @@ ] }, { - "Route": "blazorwasm-minimal.styles.css", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", "Selectors": [], "ResponseHeaders": [ { @@ -37358,7 +37350,7 @@ }, { "Name": "Content-Type", - "Value": "text/css" + "Value": "text/javascript" }, { "Name": "ETag", @@ -37381,54 +37373,9 @@ ] }, { - "Route": "blazorwasm-minimal.__fingerprint__.styles.css", + "Route": "blazorwasm-minimal.styles.css", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/css" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "blazorwasm-minimal.styles.css" - } - ] - }, - { - "Route": "blazorwasm-minimal.bundle.scp.css", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css", - "Selectors": [], "ResponseHeaders": [ { "Name": "Cache-Control", @@ -37463,8 +37410,8 @@ ] }, { - "Route": "blazorwasm-minimal.__fingerprint__.bundle.scp.css", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css", + "Route": "blazorwasm-minimal.__fingerprint__.styles.css", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\bundle\\blazorwasm-minimal.styles.css", "Selectors": [], "ResponseHeaders": [ { @@ -37503,13 +37450,13 @@ }, { "Name": "label", - "Value": "blazorwasm-minimal.bundle.scp.css" + "Value": "blazorwasm-minimal.styles.css" } ] }, { - "Route": "appsettings.development.json", - "AssetFile": "${ProjectPath}\\wwwroot\\appsettings.development.json", + "Route": "blazorwasm-minimal.bundle.scp.css", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css", "Selectors": [], "ResponseHeaders": [ { @@ -37522,7 +37469,7 @@ }, { "Name": "Content-Type", - "Value": "application/json" + "Value": "text/css" }, { "Name": "ETag", @@ -37545,13 +37492,13 @@ ] }, { - "Route": "css/app.css", - "AssetFile": "${ProjectPath}\\wwwroot\\css\\app.css", + "Route": "blazorwasm-minimal.__fingerprint__.bundle.scp.css", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\scopedcss\\projectbundle\\blazorwasm-minimal.bundle.scp.css", "Selectors": [], "ResponseHeaders": [ { "Name": "Cache-Control", - "Value": "no-cache" + "Value": "max-age=31536000, immutable" }, { "Name": "Content-Length", @@ -37575,15 +37522,23 @@ } ], "EndpointProperties": [ + { + "Name": "fingerprint", + "Value": "__fingerprint__" + }, { "Name": "integrity", "Value": "__integrity__" + }, + { + "Name": "label", + "Value": "blazorwasm-minimal.bundle.scp.css" } ] }, { - "Route": "index.html", - "AssetFile": "${ProjectPath}\\wwwroot\\index.html", + "Route": "appsettings.development.json", + "AssetFile": "${ProjectPath}\\wwwroot\\appsettings.development.json", "Selectors": [], "ResponseHeaders": [ { @@ -37596,7 +37551,7 @@ }, { "Name": "Content-Type", - "Value": "text/html" + "Value": "application/json" }, { "Name": "ETag", @@ -37619,8 +37574,8 @@ ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", + "Route": "css/app.css", + "AssetFile": "${ProjectPath}\\wwwroot\\css\\app.css", "Selectors": [], "ResponseHeaders": [ { @@ -37633,7 +37588,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "text/css" }, { "Name": "ETag", @@ -37649,28 +37604,20 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, { "Name": "integrity", "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" } ] }, { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", + "Route": "index.html", + "AssetFile": "${ProjectPath}\\wwwroot\\index.html", "Selectors": [], "ResponseHeaders": [ { "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" + "Value": "no-cache" }, { "Name": "Content-Length", @@ -37678,7 +37625,7 @@ }, { "Name": "Content-Type", - "Value": "text/javascript" + "Value": "text/html" }, { "Name": "ETag", @@ -37694,25 +37641,9 @@ } ], "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, { "Name": "integrity", "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" } ] } diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json index df1cf77076b2..836bc8cebda0 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Build_Hosted_Works.Build.staticwebassets.json @@ -46,29 +46,6 @@ } ], "Assets": [ - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\blazorhosted.modules.json.gz", "SourceId": "blazorhosted", @@ -5106,6 +5083,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Alternative", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetTraitName": "Content-Encoding", + "AssetTraitValue": "gzip", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "SourceId": "blazorwasm", @@ -9844,6 +9844,29 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, + { + "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "SourceId": "blazorwasm", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\", + "BasePath": "/", + "RelativePath": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetKind": "Build", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "JSModule", + "AssetTraitValue": "JSLibraryModule", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", "SourceId": "blazorwasm", @@ -10050,132 +10073,9 @@ "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "blazorhosted.modules.json.gz", "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\blazorhosted.modules.json.gz", @@ -18798,6 +18698,98 @@ } ] }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js.gz", + "Selectors": [ + { + "Name": "Content-Encoding", + "Value": "gzip", + "Quality": "__quality__" + } + ], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Encoding", + "Value": "gzip" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + }, + { + "Name": "original-resource", + "Value": "__original-resource__" + } + ] + }, { "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\Microsoft.DotNet.HotReload.WebAssembly.Browser.wasm.gz", @@ -37774,6 +37766,43 @@ } ] }, + { + "Route": "_framework/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\hotreload\\Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", + "Selectors": [], + "ResponseHeaders": [ + { + "Name": "Cache-Control", + "Value": "no-cache" + }, + { + "Name": "Content-Length", + "Value": "__content-length__" + }, + { + "Name": "Content-Type", + "Value": "text/javascript" + }, + { + "Name": "ETag", + "Value": "__etag__" + }, + { + "Name": "Last-Modified", + "Value": "__last-modified__" + }, + { + "Name": "Vary", + "Value": "Accept-Encoding" + } + ], + "EndpointProperties": [ + { + "Name": "integrity", + "Value": "__integrity__" + } + ] + }, { "Route": "custom-service-worker-assets.js", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\service-worker\\custom-service-worker-assets.js.build", @@ -38216,104 +38245,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json index 79893c4eed05..45d07ddf93ee 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.files.json @@ -1,7 +1,4 @@ [ - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -122,9 +119,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -326,8 +320,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.gz", "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Private.CoreLib.wasm.br", @@ -433,7 +425,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Linq.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Memory.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Http.wasm", - "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.CoreLib.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Private.Uri.wasm", @@ -458,9 +449,6 @@ "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\blazorwasm-minimal.wasm", "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\netstandard.wasm", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "${OutputPath}\\wwwroot\\_framework\\Microsoft.AspNetCore.Authorization.wasm.gz", @@ -581,9 +569,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json index f5c4925a8860..3df4ae6c405d 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_PublishMinimal_Works.Publish.staticwebassets.json @@ -177,29 +177,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", "SourceId": "blazorwasm-minimal", @@ -407,29 +384,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", "SourceId": "blazorwasm-minimal", @@ -2270,52 +2224,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm-minimal", @@ -4800,29 +4708,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm-minimal", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm-minimal", @@ -5443,29 +5328,6 @@ "OriginalItemSpec": "wwwroot\\index.html", "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" } ], "Endpoints": [ @@ -5728,106 +5590,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/blazor.webassembly.js.gz", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\_framework\\blazor.webassembly.js.gz", @@ -6872,106 +6634,6 @@ } ] }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, { "Route": "_framework/Microsoft.AspNetCore.Authorization.wasm.br", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\Microsoft.AspNetCore.Authorization.wasm.br", @@ -12677,192 +12339,8 @@ ] }, { - "Route": "_framework/System.Console.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -12902,8 +12380,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -12953,8 +12431,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -12994,8 +12472,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13045,8 +12523,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13086,8 +12564,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13137,8 +12615,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13178,8 +12656,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13229,8 +12707,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13270,8 +12748,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13321,8 +12799,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13362,8 +12840,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13413,8 +12891,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13454,8 +12932,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13505,8 +12983,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13546,8 +13024,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13597,8 +13075,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13638,8 +13116,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13689,8 +13167,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13730,8 +13208,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13781,8 +13259,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13822,8 +13300,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13873,8 +13351,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13914,8 +13392,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13965,8 +13443,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14006,8 +13484,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14057,8 +13535,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14098,8 +13576,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14149,8 +13627,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14190,8 +13668,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14241,8 +13719,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14282,8 +13760,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14333,8 +13811,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14374,8 +13852,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14425,8 +13903,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14466,8 +13944,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -22465,43 +21943,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -23500,104 +22941,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json index a8300e6e676c..01623dd907b2 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.files.json @@ -2,9 +2,6 @@ "${OutputPath}\\wwwroot\\Fake-License.txt", "${OutputPath}\\wwwroot\\Fake-License.txt.br", "${OutputPath}\\wwwroot\\Fake-License.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.br", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.gz", @@ -134,9 +131,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -233,9 +227,6 @@ "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.br", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.gz", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.br", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.gz", "${OutputPath}\\wwwroot\\blazorwasm.styles.css", "${OutputPath}\\wwwroot\\blazorwasm.styles.css.br", "${OutputPath}\\wwwroot\\blazorwasm.styles.css.gz", @@ -251,15 +242,9 @@ "${OutputPath}\\wwwroot\\serviceworkers\\my-service-worker.js", "${OutputPath}\\wwwroot\\serviceworkers\\my-service-worker.js.br", "${OutputPath}\\wwwroot\\serviceworkers\\my-service-worker.js.gz", - "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", "${OutputPath}\\wwwroot\\Fake-License.txt", "${OutputPath}\\wwwroot\\Fake-License.txt.br", "${OutputPath}\\wwwroot\\Fake-License.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.br", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.gz", @@ -389,9 +374,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -488,9 +470,6 @@ "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.br", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.gz", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.br", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.gz", "${OutputPath}\\wwwroot\\blazorwasm#[.{fingerprint=__fingerprint__}]?.styles.css.br", "${OutputPath}\\wwwroot\\blazorwasm#[.{fingerprint=__fingerprint__}]?.styles.css.gz", "${OutputPath}\\wwwroot\\blazorwasm#[.{fingerprint}]?.styles.css", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json index de7af2fbe716..bfe21a04cedf 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_DoesNotIncludeXmlDocumentationFiles_AsAssets.Publish.staticwebassets.json @@ -46,121 +46,6 @@ } ], "Assets": [ - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "SourceId": "blazorhosted", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "blazorhosted.modules.json.br", - "AssetKind": "Publish", - "AssetMode": "CurrentProject", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\blazorhosted.modules.json.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "SourceId": "blazorhosted", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "blazorhosted.modules.json.gz", - "AssetKind": "Publish", - "AssetMode": "CurrentProject", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\blazorhosted.modules.json.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "SourceId": "blazorhosted", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\", - "BasePath": "/", - "RelativePath": "blazorhosted.modules.json", - "AssetKind": "Publish", - "AssetMode": "CurrentProject", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSModuleManifest", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\LinkToWebRoot\\css\\app.css", "SourceId": "blazorwasm", @@ -2438,52 +2323,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm", @@ -5060,29 +4899,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm", @@ -5780,491 +5596,47 @@ "ContentRoot": "${ProjectPath}\\razorclasslibrary\\wwwroot\\", "BasePath": "_content/RazorClassLibrary", "RelativePath": "styles.css", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "", - "AssetTraitValue": "", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\styles.css", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\razorclasslibrary\\wwwroot\\wwwroot\\exampleJsInterop.js", - "SourceId": "RazorClassLibrary", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\razorclasslibrary\\wwwroot\\", - "BasePath": "_content/RazorClassLibrary", - "RelativePath": "wwwroot/exampleJsInterop.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "", - "AssetTraitValue": "", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - } - ], - "Endpoints": [ - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "blazorhosted.modules.json.br", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "blazorhosted.modules.json", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "blazorhosted.modules.json.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "blazorhosted.modules.json", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "wwwroot\\styles.css", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" }, { - "Route": "blazorhosted.modules.json", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, + "Identity": "${ProjectPath}\\razorclasslibrary\\wwwroot\\wwwroot\\exampleJsInterop.js", + "SourceId": "RazorClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\razorclasslibrary\\wwwroot\\", + "BasePath": "_content/RazorClassLibrary", + "RelativePath": "wwwroot/exampleJsInterop.js", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + } + ], + "Endpoints": [ { "Route": "css/app.css", "AssetFile": "${ProjectPath}\\blazorwasm\\LinkToWebRoot\\css\\app.css", @@ -13386,192 +12758,8 @@ ] }, { - "Route": "_framework/System.Console.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13611,8 +12799,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13662,8 +12850,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13703,8 +12891,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13754,8 +12942,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13795,8 +12983,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13846,8 +13034,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13887,8 +13075,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13938,8 +13126,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13979,8 +13167,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14030,8 +13218,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14071,8 +13259,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14122,8 +13310,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14163,8 +13351,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14214,8 +13402,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14255,8 +13443,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14306,8 +13494,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14347,8 +13535,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14398,8 +13586,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14439,8 +13627,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14490,8 +13678,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14531,8 +13719,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14582,8 +13770,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14623,8 +13811,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14674,8 +13862,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14715,8 +13903,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14766,8 +13954,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14807,8 +13995,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14858,8 +14046,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14899,8 +14087,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14950,8 +14138,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14991,8 +14179,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -15042,8 +14230,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -15083,8 +14271,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -15134,8 +14322,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -15175,8 +14363,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -23279,43 +22467,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -24719,104 +23870,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json index a8300e6e676c..01623dd907b2 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.files.json @@ -2,9 +2,6 @@ "${OutputPath}\\wwwroot\\Fake-License.txt", "${OutputPath}\\wwwroot\\Fake-License.txt.br", "${OutputPath}\\wwwroot\\Fake-License.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.br", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.gz", @@ -134,9 +131,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -233,9 +227,6 @@ "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.br", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.gz", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.br", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.gz", "${OutputPath}\\wwwroot\\blazorwasm.styles.css", "${OutputPath}\\wwwroot\\blazorwasm.styles.css.br", "${OutputPath}\\wwwroot\\blazorwasm.styles.css.gz", @@ -251,15 +242,9 @@ "${OutputPath}\\wwwroot\\serviceworkers\\my-service-worker.js", "${OutputPath}\\wwwroot\\serviceworkers\\my-service-worker.js.br", "${OutputPath}\\wwwroot\\serviceworkers\\my-service-worker.js.gz", - "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", "${OutputPath}\\wwwroot\\Fake-License.txt", "${OutputPath}\\wwwroot\\Fake-License.txt.br", "${OutputPath}\\wwwroot\\Fake-License.txt.gz", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "${OutputPath}\\wwwroot\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.br", "${OutputPath}\\wwwroot\\_content\\RazorClassLibrary\\styles.css.gz", @@ -389,9 +374,6 @@ "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.Net.Http.wasm.gz", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.br", - "${OutputPath}\\wwwroot\\_framework\\System.Net.Primitives.wasm.gz", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.br", "${OutputPath}\\wwwroot\\_framework\\System.ObjectModel.wasm.gz", @@ -488,9 +470,6 @@ "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.br", "${OutputPath}\\wwwroot\\_framework\\netstandard.wasm.gz", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.br", - "${OutputPath}\\wwwroot\\blazorhosted.modules.json.gz", "${OutputPath}\\wwwroot\\blazorwasm#[.{fingerprint=__fingerprint__}]?.styles.css.br", "${OutputPath}\\wwwroot\\blazorwasm#[.{fingerprint=__fingerprint__}]?.styles.css.gz", "${OutputPath}\\wwwroot\\blazorwasm#[.{fingerprint}]?.styles.css", diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json index de7af2fbe716..bfe21a04cedf 100644 --- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json +++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/StaticWebAssets_Publish_Hosted_Works.Publish.staticwebassets.json @@ -46,121 +46,6 @@ } ], "Assets": [ - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "SourceId": "blazorhosted", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "blazorhosted.modules.json.br", - "AssetKind": "Publish", - "AssetMode": "CurrentProject", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\blazorhosted.modules.json.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "SourceId": "blazorhosted", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "blazorhosted.modules.json.gz", - "AssetKind": "Publish", - "AssetMode": "CurrentProject", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\blazorhosted.modules.json.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "SourceId": "blazorhosted", - "SourceType": "Computed", - "ContentRoot": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\", - "BasePath": "/", - "RelativePath": "blazorhosted.modules.json", - "AssetKind": "Publish", - "AssetMode": "CurrentProject", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSModuleManifest", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\LinkToWebRoot\\css\\app.css", "SourceId": "blazorwasm", @@ -2438,52 +2323,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.br", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "br", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.br", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm.gz", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Alternative", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "AssetTraitName": "Content-Encoding", - "AssetTraitValue": "gzip", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\_framework\\System.Net.Primitives.wasm.gz", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.ObjectModel.wasm.br", "SourceId": "blazorwasm", @@ -5060,29 +4899,6 @@ "FileLength": -1, "LastWriteTime": "0001-01-01T00:00:00+00:00" }, - { - "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "SourceId": "blazorwasm", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\publish\\wwwroot\\", - "BasePath": "/", - "RelativePath": "_framework/System.Net.Primitives.wasm", - "AssetKind": "Publish", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "WasmResource", - "AssetTraitValue": "runtime", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, { "Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", "SourceId": "blazorwasm", @@ -5780,491 +5596,47 @@ "ContentRoot": "${ProjectPath}\\razorclasslibrary\\wwwroot\\", "BasePath": "_content/RazorClassLibrary", "RelativePath": "styles.css", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "", - "AssetTraitValue": "", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\styles.css", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${ProjectPath}\\razorclasslibrary\\wwwroot\\wwwroot\\exampleJsInterop.js", - "SourceId": "RazorClassLibrary", - "SourceType": "Project", - "ContentRoot": "${ProjectPath}\\razorclasslibrary\\wwwroot\\", - "BasePath": "_content/RazorClassLibrary", - "RelativePath": "wwwroot/exampleJsInterop.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "", - "AssetTraitValue": "", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - }, - { - "Identity": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "SourceId": "Microsoft.DotNet.HotReload.WebAssembly.Browser", - "SourceType": "Package", - "ContentRoot": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\", - "BasePath": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser", - "RelativePath": "Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetKind": "All", - "AssetMode": "All", - "AssetRole": "Primary", - "AssetMergeBehavior": "", - "AssetMergeSource": "", - "RelatedAsset": "", - "AssetTraitName": "JSModule", - "AssetTraitValue": "JSLibraryModule", - "Fingerprint": "__fingerprint__", - "Integrity": "__integrity__", - "CopyToOutputDirectory": "Never", - "CopyToPublishDirectory": "PreserveNewest", - "OriginalItemSpec": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "FileLength": -1, - "LastWriteTime": "0001-01-01T00:00:00+00:00" - } - ], - "Endpoints": [ - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\_content\\Microsoft.DotNet.HotReload.WebAssembly.Browser\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "blazorhosted.modules.json.br", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "blazorhosted.modules.json", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "blazorhosted.modules.json.gz", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "blazorhosted.modules.json", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\compressed\\publish\\blazorhosted.modules.json.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "wwwroot\\styles.css", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" }, { - "Route": "blazorhosted.modules.json", - "AssetFile": "${ProjectPath}\\blazorhosted\\obj\\Debug\\${Tfm}\\jsmodules\\jsmodules.publish.manifest.json", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/json" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, + "Identity": "${ProjectPath}\\razorclasslibrary\\wwwroot\\wwwroot\\exampleJsInterop.js", + "SourceId": "RazorClassLibrary", + "SourceType": "Project", + "ContentRoot": "${ProjectPath}\\razorclasslibrary\\wwwroot\\", + "BasePath": "_content/RazorClassLibrary", + "RelativePath": "wwwroot/exampleJsInterop.js", + "AssetKind": "All", + "AssetMode": "All", + "AssetRole": "Primary", + "AssetMergeBehavior": "", + "AssetMergeSource": "", + "RelatedAsset": "", + "AssetTraitName": "", + "AssetTraitValue": "", + "Fingerprint": "__fingerprint__", + "Integrity": "__integrity__", + "CopyToOutputDirectory": "Never", + "CopyToPublishDirectory": "PreserveNewest", + "OriginalItemSpec": "wwwroot\\wwwroot\\exampleJsInterop.js", + "FileLength": -1, + "LastWriteTime": "0001-01-01T00:00:00+00:00" + } + ], + "Endpoints": [ { "Route": "css/app.css", "AssetFile": "${ProjectPath}\\blazorwasm\\LinkToWebRoot\\css\\app.css", @@ -13386,192 +12758,8 @@ ] }, { - "Route": "_framework/System.Console.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "br", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "br" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, - { - "Route": "_framework/System.Console.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", - "Selectors": [ - { - "Name": "Content-Encoding", - "Value": "gzip", - "Quality": "__quality__" - } - ], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Encoding", - "Value": "gzip" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "original-resource", - "Value": "__original-resource__" - } - ] - }, - { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13611,8 +12799,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13662,8 +12850,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13703,8 +12891,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", + "Route": "_framework/System.Console.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Console.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13754,8 +12942,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13795,8 +12983,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -13846,8 +13034,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -13887,8 +13075,8 @@ ] }, { - "Route": "_framework/System.Diagnostics.Tracing.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", + "Route": "_framework/System.Diagnostics.DiagnosticSource.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.DiagnosticSource.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -13938,8 +13126,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -13979,8 +13167,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14030,8 +13218,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14071,8 +13259,8 @@ ] }, { - "Route": "_framework/System.IO.FileSystem.Watcher.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", + "Route": "_framework/System.Diagnostics.Tracing.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Diagnostics.Tracing.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14122,8 +13310,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14163,8 +13351,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14214,8 +13402,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14255,8 +13443,8 @@ ] }, { - "Route": "_framework/System.IO.Pipelines.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", + "Route": "_framework/System.IO.FileSystem.Watcher.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.FileSystem.Watcher.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14306,8 +13494,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14347,8 +13535,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14398,8 +13586,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14439,8 +13627,8 @@ ] }, { - "Route": "_framework/System.Linq.Expressions.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", + "Route": "_framework/System.IO.Pipelines.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.IO.Pipelines.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14490,8 +13678,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14531,8 +13719,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14582,8 +13770,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14623,8 +13811,8 @@ ] }, { - "Route": "_framework/System.Linq.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", + "Route": "_framework/System.Linq.Expressions.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.Expressions.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14674,8 +13862,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14715,8 +13903,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14766,8 +13954,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14807,8 +13995,8 @@ ] }, { - "Route": "_framework/System.Memory.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", + "Route": "_framework/System.Linq.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Linq.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -14858,8 +14046,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -14899,8 +14087,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -14950,8 +14138,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -14991,8 +14179,8 @@ ] }, { - "Route": "_framework/System.Net.Http.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", + "Route": "_framework/System.Memory.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Memory.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -15042,8 +14230,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.br", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm.br", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [], "ResponseHeaders": [ { @@ -15083,8 +14271,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.br", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.br", "Selectors": [ { "Name": "Content-Encoding", @@ -15134,8 +14322,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm.gz", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm.gz", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [], "ResponseHeaders": [ { @@ -15175,8 +14363,8 @@ ] }, { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Primitives.wasm.gz", + "Route": "_framework/System.Net.Http.wasm", + "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\publish\\_framework\\System.Net.Http.wasm.gz", "Selectors": [ { "Name": "Content-Encoding", @@ -23279,43 +22467,6 @@ } ] }, - { - "Route": "_framework/System.Net.Primitives.wasm", - "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.Net.Primitives.wasm", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "application/wasm" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "integrity", - "Value": "__integrity__" - } - ] - }, { "Route": "_framework/System.ObjectModel.wasm", "AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\publish\\System.ObjectModel.wasm", @@ -24719,104 +23870,6 @@ "Value": "__integrity__" } ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "no-cache" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "script-type", - "Value": "module" - } - ] - }, - { - "Route": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "AssetFile": "${RestorePath}\\microsoft.dotnet.hotreload.webassembly.browser\\${PackageVersion}\\staticwebassets\\Microsoft.DotNet.HotReload.WebAssembly.Browser.__fingerprint__.lib.module.js", - "Selectors": [], - "ResponseHeaders": [ - { - "Name": "Cache-Control", - "Value": "max-age=31536000, immutable" - }, - { - "Name": "Content-Length", - "Value": "__content-length__" - }, - { - "Name": "Content-Type", - "Value": "text/javascript" - }, - { - "Name": "ETag", - "Value": "__etag__" - }, - { - "Name": "Last-Modified", - "Value": "__last-modified__" - }, - { - "Name": "Vary", - "Value": "Accept-Encoding" - } - ], - "EndpointProperties": [ - { - "Name": "dependency-group", - "Value": "js-initializer" - }, - { - "Name": "fingerprint", - "Value": "__fingerprint__" - }, - { - "Name": "integrity", - "Value": "__integrity__" - }, - { - "Name": "label", - "Value": "_content/Microsoft.DotNet.HotReload.WebAssembly.Browser/Microsoft.DotNet.HotReload.WebAssembly.Browser.lib.module.js" - }, - { - "Name": "script-type", - "Value": "module" - } - ] } ] } \ No newline at end of file diff --git a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssetsBaselineFactory.cs b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssetsBaselineFactory.cs index 8d0a563a0b83..bf33b8a5b711 100644 --- a/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssetsBaselineFactory.cs +++ b/test/Microsoft.NET.Sdk.StaticWebAssets.Tests/StaticWebAssetsBaselineFactory.cs @@ -302,6 +302,8 @@ var processed when file.StartsWith('$') => processed, TemplatizeNugetPath(restorePath, fromPackage), var fromProject when projectPath is not null && file.StartsWith(projectPath, StringComparison.OrdinalIgnoreCase) => TemplatizeProjectPath(projectPath, fromProject, runtimeIdentifier), + var fromWebAssemblySdk when file.Replace('\\', '/').Contains("/Sdks/Microsoft.NET.Sdk.WebAssembly", StringComparison.OrdinalIgnoreCase) => + TemplatizeWebAssemblySdkPath(fromWebAssemblySdk), _ => ReplaceSegments(file, (i, segments) => i switch { @@ -314,6 +316,35 @@ var processed when file.StartsWith('$') => processed, return ReplaceFileName(updated).Replace('/', '\\'); } + private string TemplatizeWebAssemblySdkPath(string file) + { + var normalized = file.Replace('\\', '/'); + var marker = "/Sdks/Microsoft.NET.Sdk.WebAssembly"; + var idx = normalized.IndexOf(marker, StringComparison.OrdinalIgnoreCase); + if (idx < 0) + { + return file; + } + + // Replace everything up to and including the SDK folder with the token + var remainder = normalized.Substring(idx + marker.Length); + if (remainder.StartsWith('/')) + { + remainder = remainder[1..]; + } + + var templated = "${WebAssemblySdkPath}" + (string.IsNullOrEmpty(remainder) ? string.Empty : "/" + remainder); + + // Replace filename hashes if any + templated = ReplaceSegments(templated, (i, segments) => i switch + { + _ when i == segments.Length - 1 => RemovePossibleHash(segments[i]), + _ => segments[i] + }); + + return templated; + } + private static string ReplaceFileName(string path) { var directory = Path.GetDirectoryName(path); diff --git a/test/TestAssets/TestProjects/WatchBlazorWasm/Properties/launchSettings.json b/test/TestAssets/TestProjects/WatchBlazorWasm/Properties/launchSettings.json index dc7b2f31b4b3..38b39f84b3d4 100644 --- a/test/TestAssets/TestProjects/WatchBlazorWasm/Properties/launchSettings.json +++ b/test/TestAssets/TestProjects/WatchBlazorWasm/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "http": { "commandName": "Project", - "dotnetRunMessages": "true", + "dotnetRunMessages": true, "launchBrowser": true, "applicationUrl": "http://localhost:5000", "environmentVariables": { diff --git a/test/TestAssets/TestProjects/WatchBlazorWasmHosted/blazorhosted/Properties/launchSettings.json b/test/TestAssets/TestProjects/WatchBlazorWasmHosted/blazorhosted/Properties/launchSettings.json index dc7b2f31b4b3..38b39f84b3d4 100644 --- a/test/TestAssets/TestProjects/WatchBlazorWasmHosted/blazorhosted/Properties/launchSettings.json +++ b/test/TestAssets/TestProjects/WatchBlazorWasmHosted/blazorhosted/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "http": { "commandName": "Project", - "dotnetRunMessages": "true", + "dotnetRunMessages": true, "launchBrowser": true, "applicationUrl": "http://localhost:5000", "environmentVariables": { From 31812eb9c57af75da8e77989dcf857ed8cd97b7b Mon Sep 17 00:00:00 2001 From: Youssef Victor Date: Tue, 10 Feb 2026 15:12:48 +0100 Subject: [PATCH 270/280] Improve MTP dotnet test error reporting (#52911) --- .../dotnet/Commands/CliCommandStrings.resx | 61 ++++++++++--------- .../Commands/Test/MTP/MSBuildHandler.cs | 42 +++++-------- .../Commands/Test/MTP/MSBuildUtility.cs | 29 +++++---- .../MicrosoftTestingPlatformTestCommand.cs | 5 +- .../Commands/xlf/CliCommandStrings.cs.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.de.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.es.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.fr.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.it.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.ja.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.ko.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.pl.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.pt-BR.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.ru.xlf | 9 ++- .../Commands/xlf/CliCommandStrings.tr.xlf | 9 ++- .../xlf/CliCommandStrings.zh-Hans.xlf | 9 ++- .../xlf/CliCommandStrings.zh-Hant.xlf | 9 ++- ...tBuildsAndRunsTestsWithDifferentOptions.cs | 2 +- 18 files changed, 155 insertions(+), 101 deletions(-) diff --git a/src/Cli/dotnet/Commands/CliCommandStrings.resx b/src/Cli/dotnet/Commands/CliCommandStrings.resx index d08950ce5624..01c897cf2d9d 100644 --- a/src/Cli/dotnet/Commands/CliCommandStrings.resx +++ b/src/Cli/dotnet/Commands/CliCommandStrings.resx @@ -1,17 +1,17 @@  - @@ -241,7 +241,7 @@ Paths searched: '{1}', '{2}'. The provided solution file has an invalid extension: {0}. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. + Build failed with exit code: {0}. Specify either the project, solution, directory, or test modules option. @@ -1579,4 +1579,7 @@ Proceed? Workload set version {0} has missing manifests likely removed by package management. Run "dotnet workload repair" to fix this. {0} is the workload set version. {Locked="dotnet workload repair"} - \ No newline at end of file + + No test projects were found. + + diff --git a/src/Cli/dotnet/Commands/Test/MTP/MSBuildHandler.cs b/src/Cli/dotnet/Commands/Test/MTP/MSBuildHandler.cs index 724e49b4330f..cb36ef2fdac8 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/MSBuildHandler.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/MSBuildHandler.cs @@ -12,7 +12,6 @@ internal sealed class MSBuildHandler(BuildOptions buildOptions) private readonly BuildOptions _buildOptions = buildOptions; private readonly ConcurrentBag _testApplications = []; - private bool _areTestingPlatformApplications = true; public bool RunMSBuild() { @@ -23,65 +22,56 @@ public bool RunMSBuild() return false; } - (IEnumerable projects, bool restored) = GetProjectsProperties(projectOrSolutionFilePath, isSolution); + (IEnumerable projects, int buildExitCode) = isSolution ? + MSBuildUtility.GetProjectsFromSolution(projectOrSolutionFilePath, _buildOptions) : + MSBuildUtility.GetProjectsFromProject(projectOrSolutionFilePath, _buildOptions); - InitializeTestApplications(projects); + LogProjectProperties(projects); - if (!restored || _testApplications.IsEmpty) + if (buildExitCode != 0) { - Reporter.Error.WriteLine(string.Format(CliCommandStrings.CmdMSBuildProjectsPropertiesErrorDescription, ExitCode.GenericFailure)); + Reporter.Error.WriteLine(string.Format(CliCommandStrings.CmdMSBuildProjectsPropertiesErrorDescription, buildExitCode)); return false; } - return true; + return InitializeTestApplications(projects); } - private void InitializeTestApplications(IEnumerable moduleGroups) + private bool InitializeTestApplications(IEnumerable moduleGroups) { // If one test app has IsTestingPlatformApplication set to false (VSTest and not MTP), then we will not run any of the test apps IEnumerable vsTestTestProjects = moduleGroups.SelectMany(group => group.GetVSTestAndNotMTPModules()); if (vsTestTestProjects.Any()) { - _areTestingPlatformApplications = false; - Reporter.Error.WriteLine( string.Format( CliCommandStrings.CmdUnsupportedVSTestTestApplicationsDescription, string.Join(Environment.NewLine, vsTestTestProjects.Select(module => Path.GetFileName(module.ProjectFullPath))).Red().Bold())); - return; + return false; } foreach (ParallelizableTestModuleGroupWithSequentialInnerModules moduleGroup in moduleGroups) { _testApplications.Add(moduleGroup); } - } - public bool EnqueueTestApplications(TestApplicationActionQueue queue) - { - if (!_areTestingPlatformApplications) + if (_testApplications.IsEmpty) { + Reporter.Error.WriteLine(CliCommandStrings.CmdTestNoTestProjectsFound); return false; } - foreach (var testApp in _testApplications) - { - queue.Enqueue(testApp); - } return true; } - private (IEnumerable Projects, bool Restored) GetProjectsProperties(string solutionOrProjectFilePath, bool isSolution) + public void EnqueueTestApplications(TestApplicationActionQueue queue) { - (IEnumerable projects, bool isBuiltOrRestored) = isSolution ? - MSBuildUtility.GetProjectsFromSolution(solutionOrProjectFilePath, _buildOptions) : - MSBuildUtility.GetProjectsFromProject(solutionOrProjectFilePath, _buildOptions); - - LogProjectProperties(projects); - - return (projects, isBuiltOrRestored); + foreach (var testApp in _testApplications) + { + queue.Enqueue(testApp); + } } private static void LogProjectProperties(IEnumerable moduleGroups) diff --git a/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs b/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs index b70103ad3203..684ccdf26032 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/MSBuildUtility.cs @@ -26,13 +26,13 @@ internal static class MSBuildUtility [UnsafeAccessor(UnsafeAccessorKind.Method, Name = "ProjectShouldBuild")] static extern bool ProjectShouldBuild(SolutionFile solutionFile, string projectFile); - public static (IEnumerable Projects, bool IsBuiltOrRestored) GetProjectsFromSolution(string solutionFilePath, BuildOptions buildOptions) + public static (IEnumerable Projects, int BuildExitCode) GetProjectsFromSolution(string solutionFilePath, BuildOptions buildOptions) { - bool isBuiltOrRestored = BuildOrRestoreProjectOrSolution(solutionFilePath, buildOptions); + int buildExitCode = BuildOrRestoreProjectOrSolution(solutionFilePath, buildOptions); - if (!isBuiltOrRestored) + if (buildExitCode != 0) { - return (Array.Empty(), isBuiltOrRestored); + return (Array.Empty(), buildExitCode); } var msbuildArgs = MSBuildArgs.AnalyzeMSBuildArguments(buildOptions.MSBuildArgs, CommonOptions.CreatePropertyOption(), CommonOptions.CreateRestorePropertyOption(), CommonOptions.CreateMSBuildTargetOption(), CommonOptions.CreateVerbosityOption(), CommonOptions.CreateNoLogoOption()); @@ -73,16 +73,16 @@ public static (IEnumerable Projects, bool IsBuiltOrRestored) GetProjectsFromProject(string projectFilePath, BuildOptions buildOptions) + public static (IEnumerable Projects, int BuildExitCode) GetProjectsFromProject(string projectFilePath, BuildOptions buildOptions) { - bool isBuiltOrRestored = BuildOrRestoreProjectOrSolution(projectFilePath, buildOptions); + int buildExitCode = BuildOrRestoreProjectOrSolution(projectFilePath, buildOptions); - if (!isBuiltOrRestored) + if (buildExitCode != 0) { - return (Array.Empty(), isBuiltOrRestored); + return (Array.Empty(), buildExitCode); } FacadeLogger? logger = LoggerUtility.DetermineBinlogger([.. buildOptions.MSBuildArgs], dotnetTestVerb); @@ -94,7 +94,7 @@ public static (IEnumerable projects = SolutionAndProjectUtility.GetProjectProperties(projectFilePath, collection, evaluationContext, buildOptions, configuration: null, platform: null); logger?.ReallyShutdown(); collection.UnloadAllProjects(); - return (projects, isBuiltOrRestored); + return (projects, buildExitCode); } public static BuildOptions GetBuildOptions(ParseResult parseResult) @@ -142,12 +142,13 @@ public static BuildOptions GetBuildOptions(ParseResult parseResult) msbuildArgs); } - private static bool BuildOrRestoreProjectOrSolution(string filePath, BuildOptions buildOptions) + private static int BuildOrRestoreProjectOrSolution(string filePath, BuildOptions buildOptions) { if (buildOptions.HasNoBuild) { - return true; + return 0; } + List msbuildArgs = [.. buildOptions.MSBuildArgs, filePath]; if (buildOptions.Verbosity is null) @@ -163,9 +164,7 @@ private static bool BuildOrRestoreProjectOrSolution(string filePath, BuildOption CommonOptions.CreateVerbosityOption(), CommonOptions.CreateNoLogoOption()); - int result = new RestoringCommand(parsedMSBuildArgs, buildOptions.HasNoRestore).Execute(); - - return result == (int)BuildResultCode.Success; + return new RestoringCommand(parsedMSBuildArgs, buildOptions.HasNoRestore).Execute(); } private static ConcurrentBag GetProjectsProperties( diff --git a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs index 2883069e62e3..cbafd675d4ad 100644 --- a/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs +++ b/src/Cli/dotnet/Commands/Test/MTP/MicrosoftTestingPlatformTestCommand.cs @@ -71,10 +71,7 @@ private int RunInternal(ParseResult parseResult, bool isHelp) // be slowing us down unnecessarily. // Alternatively, if we can enqueue right after every project evaluation without waiting all evaluations to be done, we can enqueue early. actionQueue = new TestApplicationActionQueue(degreeOfParallelism, buildOptions, testOptions, _output, OnHelpRequested); - if (!msBuildHandler.EnqueueTestApplications(actionQueue)) - { - return ExitCode.GenericFailure; - } + msBuildHandler.EnqueueTestApplications(actionQueue); } actionQueue.EnqueueCompleted(); diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf index 5407644f4ab0..96ac26732352 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf @@ -57,6 +57,11 @@ Autoři Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Prohledané cesty: „{1}“, „{2}“. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - Získání vlastností projektů pomocí nástroje MSBuild nebylo správně spuštěno s ukončovacím kódem: {0}. + Build failed with exit code: {0}. + Získání vlastností projektů pomocí nástroje MSBuild nebylo správně spuštěno s ukončovacím kódem: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf index aaa2d6319a5e..eed6dac077de 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf @@ -57,6 +57,11 @@ Autoren Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Durchsuchte Pfade: "{1}", "{2}". - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - Das Abrufen von Projekteigenschaften mit MSBuild wurde nicht ordnungsgemäß ausgeführt. Exitcode: {0}. + Build failed with exit code: {0}. + Das Abrufen von Projekteigenschaften mit MSBuild wurde nicht ordnungsgemäß ausgeführt. Exitcode: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf index c440abeff7a9..084706cc6041 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf @@ -57,6 +57,11 @@ Autores Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Rutas de acceso buscadas: "{1}", "{2}". - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - La obtención de propiedades de proyectos con MSBuild no se ejecutó correctamente con el código de salida: {0}. + Build failed with exit code: {0}. + La obtención de propiedades de proyectos con MSBuild no se ejecutó correctamente con el código de salida: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf index 55fbe9045a29..f00181ccaf44 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf @@ -57,6 +57,11 @@ Auteurs Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Les chemins d’accès ont recherché : « {1} », « {2} ». - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - L’obtention des propriétés des projets avec MSBuild ne s’est pas exécutée correctement avec le code de sortie : {0}. + Build failed with exit code: {0}. + L’obtention des propriétés des projets avec MSBuild ne s’est pas exécutée correctement avec le code de sortie : {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf index 35d44065f8e0..6b25c7604741 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf @@ -57,6 +57,11 @@ Autori Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Percorsi cercati: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - Il recupero delle proprietà dei progetti con MSBuild non è stato eseguito correttamente, con il codice di uscita: {0}. + Build failed with exit code: {0}. + Il recupero delle proprietà dei progetti con MSBuild non è stato eseguito correttamente, con il codice di uscita: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf index e3664a1b2f4b..97b72f1baca5 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf @@ -57,6 +57,11 @@ 作成者 Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Paths searched: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - MSBuild でのプロジェクトプロパティの取得が正しく実行されませんでした。終了コード: {0}。 + Build failed with exit code: {0}. + MSBuild でのプロジェクトプロパティの取得が正しく実行されませんでした。終了コード: {0}。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf index f3a7db80abfa..6db3d54f6f5c 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf @@ -57,6 +57,11 @@ 작성자 Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Paths searched: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - MSBuild를 사용하여 프로젝트 가져오기 속성이 종료 코드에서 제대로 실행되지 않았습니다. {0}. + Build failed with exit code: {0}. + MSBuild를 사용하여 프로젝트 가져오기 속성이 종료 코드에서 제대로 실행되지 않았습니다. {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf index 6080a1f1f39d..15978c7d8337 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf @@ -57,6 +57,11 @@ Autorzy Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Przeszukane ścieżki: „{1}”, „{2}”. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - Pobieranie właściwości projektów za pomocą programu MSBuild nie zostało poprawnie wykonane z kodem zakończenia: {0}. + Build failed with exit code: {0}. + Pobieranie właściwości projektów za pomocą programu MSBuild nie zostało poprawnie wykonane z kodem zakończenia: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf index a0152563b4b2..86b2f578497e 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf @@ -57,6 +57,11 @@ Autores Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Caminhos pesquisados: "{1}", "{2}". - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - As propriedades de obtenção de projetos com o MSBuild não foram executadas corretamente com o código de saída: {0}. + Build failed with exit code: {0}. + As propriedades de obtenção de projetos com o MSBuild não foram executadas corretamente com o código de saída: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf index 4f130a68df25..3837e6b57781 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf @@ -57,6 +57,11 @@ Авторы Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Paths searched: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - Получение свойств проектов с помощью MSBuild сработало не так, как ожидалось, код завершения: {0}. + Build failed with exit code: {0}. + Получение свойств проектов с помощью MSBuild сработало не так, как ожидалось, код завершения: {0}. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf index ccde0dd5aa8f..70b2c1973af4 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf @@ -57,6 +57,11 @@ Yazarlar Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Aranan yollar: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - MSBuild ile proje özelliklerini al işlemi {0} çıkış koduyla çıkarak düzgün şekilde çalışmadı. + Build failed with exit code: {0}. + MSBuild ile proje özelliklerini al işlemi {0} çıkış koduyla çıkarak düzgün şekilde çalışmadı. diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf index 69d1c44280af..8729a011cdf2 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf @@ -57,6 +57,11 @@ 作者 Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Paths searched: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - 使用 MSBuild 获取项目属性未正确执行，退出代码为: {0}。 + Build failed with exit code: {0}. + 使用 MSBuild 获取项目属性未正确执行，退出代码为: {0}。 diff --git a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf index e69ace981799..51ab387f3631 100644 --- a/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf @@ -57,6 +57,11 @@ 作者 Table lable + + No test projects were found. + No test projects were found. + + The device identifier to use for running the application. The device identifier to use for running the application. @@ -220,8 +225,8 @@ Paths searched: '{1}', '{2}'. - Get projects properties with MSBuild didn't execute properly with exit code: {0}. - 使用 MSBuild 取得專案屬性時未正確執行，結束代碼為: {0}。 + Build failed with exit code: {0}. + 使用 MSBuild 取得專案屬性時未正確執行，結束代碼為: {0}。 diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs index d8ba31c264eb..184b840a3654 100644 --- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs +++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithDifferentOptions.cs @@ -479,7 +479,7 @@ public void RunMultiTFMsProjectSolutionWithPreviousFramework_ShouldReturnExitCod // Output looks similar to the following /* error NETSDK1005: Assets file 'path\to\OtherTestProject\obj\project.assets.json' doesn't have a target for 'net9.0'. Ensure that restore has run and that you have included 'net9.0' in the TargetFrameworks for your project. - Get projects properties with MSBuild didn't execute properly with exit code: 1. + Build failed with exit code: 1. */ if (!TestContext.IsLocalized()) { From 22aa46ffcddb7ff81d15bddd401a2afc97ba73c0 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Feb 2026 14:14:45 -0800 Subject: [PATCH 271/280] Update VersionFeature80 and VersionFeature90 values for Feb release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 051cd561557f..093ff5b6a0b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,8 +37,8 @@ 36 20 - 23 - 12 + 24 + 13 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 39cdacfd81966dee9c4ebf359613b788f30e5ef8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 10 Feb 2026 14:16:11 -0800 Subject: [PATCH 272/280] don't update the version feature values in branch flow --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 88999719220f..051cd561557f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,8 +37,8 @@ 36 20 - $([MSBuild]::Add($(VersionFeature), 25)) - $([MSBuild]::Add($(VersionFeature), 14)) + 23 + 12 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 3e70852cf6c9ce2277dc8dfc89cfa1a015e9a455 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Wed, 11 Feb 2026 00:35:50 +0000 Subject: [PATCH 273/280] Support boolean values for --self-contained flag (#52333) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: marcpopMSFT <12663534+marcpopMSFT@users.noreply.github.com> Co-authored-by: Marc Paine Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> Co-authored-by: Chet Husk --- cli.slnf | 3 +- .../ForwardedOptionExtensions.cs | 37 +++++++++++++++---- .../Common/CommonOptions.cs | 6 ++- 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/cli.slnf b/cli.slnf index a300800156bf..630b3b217cc1 100644 --- a/cli.slnf +++ b/cli.slnf @@ -9,7 +9,8 @@ "test\\dotnet-watch.Tests\\dotnet-watch.Tests.csproj", "test\\dotnet.Tests\\dotnet.Tests.csproj", "test\\Microsoft.DotNet.Cli.Utils.Tests\\Microsoft.DotNet.Cli.Utils.Tests.csproj", - "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj" + "test\\Microsoft.NET.TestFramework\\Microsoft.NET.TestFramework.csproj", + "src\\Cli\\Microsoft.DotNet.Cli.Definitions\\Microsoft.DotNet.Cli.Definitions.csproj" ] } } diff --git a/src/Cli/Microsoft.DotNet.Cli.CommandLine/ForwardedOptionExtensions.cs b/src/Cli/Microsoft.DotNet.Cli.CommandLine/ForwardedOptionExtensions.cs index b4a3e9aeb819..be910a51c008 100644 --- a/src/Cli/Microsoft.DotNet.Cli.CommandLine/ForwardedOptionExtensions.cs +++ b/src/Cli/Microsoft.DotNet.Cli.CommandLine/ForwardedOptionExtensions.cs @@ -135,6 +135,34 @@ public Option SetForwardingFunction(Func public Option ForwardAsSingle(Func format) => option.SetForwardingFunction(format); + + /// + /// Configures the Option to only forward if it has an explicitly provided value, and not to forward if the value is implicitly provided (either via a default value or via implicit value inference for zero-arity options). This is useful for options where you only want to forward if the user explicitly provided the option, and not forward if the option just happens to have a value. + /// This is most commonly useful for boolean options with no default value factory, where S.CL will infer a value of 'true' if the option is present and 'false' if it is absent. + /// + public Option IfExplicitlyProvided() + { + if (s_forwardingFunctions.TryGetValue(option, out var existingFunc)) + { + // wrap the existing forwarding function with an additional check to ensure the option's value is explicitly provided + Func> wrapped = pr => + { + if (pr.GetResult(option) is OptionResult r && !r.Implicit) + { + return existingFunc(pr); + } + else + { + return []; + } + }; + lock (s_forwardingFunctions) + { + s_forwardingFunctions[option] = wrapped; + } + } + return option; + } } extension(Option option) @@ -147,19 +175,14 @@ public Option SetForwardingFunction(Func public Option ForwardIfEnabled(string value) => option.SetForwardingFunction((bool o) => o ? [value] : []); /// - /// Forward the boolean option as a string value. This value will be forwarded as long as the option has a OptionResult - which means that + /// Forward the boolean option as an array of string values. This value will be forwarded as long as the option has a OptionResult - which means that /// any implicit value calculation will cause the string value to be forwarded. For boolean options specifically, if the option is zero arity /// and has no default value factory, S.CL will synthesize a true or false value based on whether the option was provided or not, so we need to /// add an additional implicit 'value is true' check to prevent accidentally forwarding the option for flags that are absent.. /// public Option ForwardIfEnabled(string[] value) => option.SetForwardingFunction((bool o) => o ? value : []); - /// - /// Forward the boolean option as a string value. This value will be forwarded as long as the option has a OptionResult - which means that - /// any implicit value calculation will cause the string value to be forwarded. For boolean options specifically, if the option is zero arity - /// and has no default value factory, S.CL will synthesize a true or false value based on whether the option was provided or not, so we need to - /// add an additional implicit 'value is true' check to prevent accidentally forwarding the option for flags that are absent.. - /// + /// public Option ForwardAs(string value) => option.ForwardIfEnabled(value); } diff --git a/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs b/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs index abac7ed2d280..3c9fd451dd28 100644 --- a/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs +++ b/src/Cli/Microsoft.DotNet.Cli.Definitions/Common/CommonOptions.cs @@ -277,9 +277,11 @@ public static Option CreateDisableBuildServersOption() => public static Option CreateSelfContainedOption() => new Option("--self-contained", "--sc") { - Description = CommandDefinitionStrings.SelfContainedOptionDescription + Description = CommandDefinitionStrings.SelfContainedOptionDescription, + Arity = ArgumentArity.ZeroOrOne } - .ForwardIfEnabled([$"--property:SelfContained=true", "--property:_CommandLineDefinedSelfContained=true"]); + .ForwardAsMany(o => [$"--property:SelfContained={(o ? "true" : "false")}", "--property:_CommandLineDefinedSelfContained=true"]) + .IfExplicitlyProvided(); public static Option CreateNoSelfContainedOption() => new Option("--no-self-contained") From d07da7fece7b321cfcce8db9c759a17a1a5b8a27 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 11 Feb 2026 23:06:19 +0000 Subject: [PATCH 274/280] [release/10.0.3xx] Source code updates from dotnet/dotnet (#52941) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tomas Matousek --- .merge_file_JsDg5L | 51 ++++ NuGet.config | 2 - eng/Version.Details.props | 269 ++++++++++--------- eng/Version.Details.xml | 534 +++++++++++++++++++------------------- global.json | 6 +- 5 files changed, 453 insertions(+), 409 deletions(-) create mode 100644 .merge_file_JsDg5L diff --git a/.merge_file_JsDg5L b/.merge_file_JsDg5L new file mode 100644 index 000000000000..8ced53fdb48f --- /dev/null +++ b/.merge_file_JsDg5L @@ -0,0 +1,51 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +#nullable disable + +using System.CommandLine; +using Microsoft.DotNet.Cli.Commands.MSBuild; +using Microsoft.DotNet.Cli.CommandLine; +using Microsoft.DotNet.Cli.Extensions; +using Microsoft.DotNet.Cli.Utils; + +namespace Microsoft.DotNet.Cli.Commands.Store; + +public class StoreCommand : MSBuildForwardingApp +{ + private StoreCommand(IEnumerable msbuildArgs, string msbuildPath = null) + : base(msbuildArgs, msbuildPath) + { + } + + public static StoreCommand FromArgs(string[] args, string msbuildPath = null) + { + var result = Parser.Parse(["dotnet", "store", ..args]); + return FromParseResult(result, msbuildPath); + } + + public static StoreCommand FromParseResult(ParseResult result, string msbuildPath = null) + { + List msbuildArgs = ["--target:ComposeStore"]; + + result.ShowHelpOrErrorIfAppropriate(); + + if (!result.HasOption(StoreCommandParser.ManifestOption)) + { + throw new GracefulException(CliCommandStrings.SpecifyManifests); + } + + msbuildArgs.AddRange(result.OptionValuesToBeForwarded(StoreCommandParser.GetCommand())); + + msbuildArgs.AddRange(result.GetValue(StoreCommandParser.Argument) ?? []); + + return new StoreCommand(msbuildArgs, msbuildPath); + } + + public static int Run(ParseResult parseResult) + { + parseResult.HandleDebugSwitch(); + + return FromParseResult(parseResult).Execute(); + } +} diff --git a/NuGet.config b/NuGet.config index ff0d29fb990d..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -40,7 +39,6 @@ - diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d6708ed330ab..a056dd5cfce8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,142 +6,141 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26076.108 - 18.3.0-preview-26076-108 - 18.3.0-preview-26076-108 - 7.3.0-preview.1.7708 - 10.0.300-alpha.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 10.0.0-preview.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 10.0.0-beta.26076.108 - 15.2.300-servicing.26076.108 - 5.3.0-2.26076.108 - 5.3.0-2.26076.108 + 10.0.0-preview.26103.116 + 18.3.0-preview-26103-116 + 18.3.0-preview-26103-116 + 7.4.0-rc.10416 + 10.0.300-alpha.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 10.0.0-preview.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 10.0.0-beta.26103.116 + 15.2.300-servicing.26103.116 + 5.5.0-2.26103.116 + 5.5.0-2.26103.116 10.0.0-preview.7.25377.103 - 10.0.0-preview.26076.108 - 18.3.0-release-26076-108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.300-alpha.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 10.0.200-preview.26076.108 - 18.3.0-release-26076-108 - 18.3.0-release-26076-108 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 - 7.3.0-preview.1.7708 + 10.0.0-preview.26103.116 + 18.3.0-release-26103-116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.300-alpha.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 10.0.200-preview.26103.116 + 18.3.0-release-26103-116 + 18.3.0-release-26103-116 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 + 7.4.0-rc.10416 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 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.25569.105 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1 - 2.0.0-preview.1.25569.105 - 2.2.1-beta.25569.105 - 10.0.1 - 10.0.1 - 10.0.0-rtm.25523.111 - 10.0.0-rtm.25523.111 - 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-servicing.25569.105 - 10.0.1 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 3.2.1-servicing.25569.105 - 10.0.1 - 10.0.1-servicing.25569.105 - 10.0.1 - 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 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 @@ -243,8 +242,8 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetWebItemTemplates100PackageVersion) $(MicrosoftDotNetWebProjectTemplates100PackageVersion) $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion) $(MicrosoftExtensionsDependencyModelPackageVersion) $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cde5e4dcbb9c..c85ec7c9ebaa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b @@ -445,129 +445,125 @@ fad253f51b461736dfd3cd9c15977bb7493becef - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa - - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - b0f34d51fccc69fd334253924abd8d6853fad7aa + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://github.com/dotnet/dotnet - 3b3cc2b93b356d46a6fb36768479ea53515fc2cd + 9477b510bb25fc69515d2ab188af3b72799929ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b https://github.com/microsoft/testfx @@ -577,9 +573,9 @@ https://github.com/microsoft/testfx 43e592148ac1c7916908477bdffcf2a345affa6d - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + 44525024595742ebe09023abe709df51de65009b diff --git a/global.json b/global.json index d197f033377b..ecba0c109058 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.101", + "dotnet": "10.0.102", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26076.108", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26076.108", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.116", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26103.116", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 081f309c6619d13d4b6dc88b908ec277c7a8822a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Wed, 11 Feb 2026 15:31:28 -0800 Subject: [PATCH 275/280] [dotnet-watch] Misc test and product reliability fixes (#52897) --- src/BuiltInTools/Watch/Build/BuildNames.cs | 1 + .../Watch/Build/EvaluationResult.cs | 8 +- .../Browser/BrowserTests.cs | 22 +- .../HotReload/ApplyDeltaTests.cs | 348 +++++++++--------- 4 files changed, 199 insertions(+), 180 deletions(-) diff --git a/src/BuiltInTools/Watch/Build/BuildNames.cs b/src/BuiltInTools/Watch/Build/BuildNames.cs index 0b2b8d0ccd00..a2d0b790ce0d 100644 --- a/src/BuiltInTools/Watch/Build/BuildNames.cs +++ b/src/BuiltInTools/Watch/Build/BuildNames.cs @@ -22,6 +22,7 @@ internal static class PropertyNames public const string DesignTimeBuild = nameof(DesignTimeBuild); public const string SkipCompilerExecution = nameof(SkipCompilerExecution); public const string ProvideCommandLineArgs = nameof(ProvideCommandLineArgs); + public const string NonExistentFile = nameof(NonExistentFile); } internal static class ItemNames diff --git a/src/BuiltInTools/Watch/Build/EvaluationResult.cs b/src/BuiltInTools/Watch/Build/EvaluationResult.cs index 829f527774e0..cc0566e49b39 100644 --- a/src/BuiltInTools/Watch/Build/EvaluationResult.cs +++ b/src/BuiltInTools/Watch/Build/EvaluationResult.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Immutable; +using System.Diagnostics; using Microsoft.Build.Execution; using Microsoft.Build.Graph; using Microsoft.DotNet.HotReload; @@ -51,7 +52,9 @@ public static ImmutableDictionary GetGlobalBuildOptions(IEnumera .SetItem(PropertyNames.DotNetWatchBuild, "true") .SetItem(PropertyNames.DesignTimeBuild, "true") .SetItem(PropertyNames.SkipCompilerExecution, "true") - .SetItem(PropertyNames.ProvideCommandLineArgs, "true"); + .SetItem(PropertyNames.ProvideCommandLineArgs, "true") + // this will force CoreCompile task to execute and return command line args even if all inputs and outputs are up to date: + .SetItem(PropertyNames.NonExistentFile, "__NonExistentSubDir__\\__NonExistentFile__"); } /// @@ -126,6 +129,9 @@ public static ImmutableDictionary GetGlobalBuildOptions(IEnumera } } + // command line args items should be available: + Debug.Assert(Path.GetExtension(projectInstance.FullPath) != ".csproj" || projectInstance.GetItems("CscCommandLineArgs").Any()); + var projectPath = projectInstance.FullPath; var projectDirectory = Path.GetDirectoryName(projectPath)!; diff --git a/test/dotnet-watch.Tests/Browser/BrowserTests.cs b/test/dotnet-watch.Tests/Browser/BrowserTests.cs index db850da520d2..18511ab7f734 100644 --- a/test/dotnet-watch.Tests/Browser/BrowserTests.cs +++ b/test/dotnet-watch.Tests/Browser/BrowserTests.cs @@ -16,7 +16,7 @@ public async Task LaunchesBrowserOnStart() App.Start(testAsset, [], testFlags: TestFlags.MockBrowser); // check that all app output is printed out: - await App.WaitForOutputLineContaining("Content root path:"); + await App.WaitUntilOutputContains("Content root path:"); Assert.Contains(App.Process.Output, line => line.Contains("Application started. Press Ctrl+C to shut down.")); Assert.Contains(App.Process.Output, line => line.Contains("Hosting environment: Development")); @@ -38,9 +38,9 @@ public async Task BrowserDiagnostics() App.Start(testAsset, ["--urls", url], relativeProjectDirectory: "RazorApp", testFlags: TestFlags.ReadKeyFromStdin); - await App.WaitForOutputLineContaining(MessageDescriptor.ConfiguredToUseBrowserRefresh); - await App.WaitForOutputLineContaining(MessageDescriptor.ConfiguredToLaunchBrowser); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // Verify the browser has been launched. await App.WaitUntilOutputContains($"🧪 Test browser opened at '{url}'."); @@ -60,9 +60,9 @@ public async Task BrowserDiagnostics() var errorMessage = $"{homePagePath}(13,9): error ENC0023: Adding an abstract method or overriding an inherited method requires restarting the application."; var jsonErrorMessage = JsonSerializer.Serialize(errorMessage); - await App.WaitForOutputLineContaining(errorMessage); + await App.WaitUntilOutputContains(errorMessage); - await App.WaitForOutputLineContaining("Do you want to restart your app?"); + await App.WaitUntilOutputContains("Do you want to restart your app?"); await App.WaitUntilOutputContains($$""" 🧪 Received: {"type":"ReportDiagnostics","diagnostics":[{{jsonErrorMessage}}]} @@ -72,7 +72,7 @@ await App.WaitUntilOutputContains($$""" App.SendKey('a'); // browser page is reloaded when the app restarts: - await App.WaitForOutputLineContaining(MessageDescriptor.ReloadingBrowser, $"RazorApp ({tfm})"); + await App.WaitUntilOutputContains(MessageDescriptor.ReloadingBrowser, $"RazorApp ({tfm})"); // browser page was reloaded after the app restarted: await App.WaitUntilOutputContains(""" @@ -82,7 +82,7 @@ await App.WaitUntilOutputContains(""" // no other browser message sent: Assert.Equal(2, App.Process.Output.Count(line => line.Contains("🧪"))); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); App.Process.ClearOutput(); @@ -90,13 +90,13 @@ await App.WaitUntilOutputContains(""" UpdateSourceFile(homePagePath, src => src.Replace("public virtual int F() => 1;", "/* member placeholder */")); errorMessage = $"{homePagePath}(11,5): error ENC0033: Deleting method 'F()' requires restarting the application."; - await App.WaitForOutputLineContaining("[auto-restart] " + errorMessage); + await App.WaitUntilOutputContains("[auto-restart] " + errorMessage); await App.WaitUntilOutputContains($$""" 🧪 Received: {"type":"ReportDiagnostics","diagnostics":["Restarting application to apply changes ..."]} """); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // browser page was reloaded after the app restarted: await App.WaitUntilOutputContains(""" @@ -111,7 +111,7 @@ await App.WaitUntilOutputContains(""" // valid edit: UpdateSourceFile(homePagePath, src => src.Replace("/* member placeholder */", "public int F() => 1;")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains($$""" 🧪 Received: {"type":"ReportDiagnostics","diagnostics":[]} diff --git a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs index 792ced5064af..75b77ee7d96e 100644 --- a/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs +++ b/test/dotnet-watch.Tests/HotReload/ApplyDeltaTests.cs @@ -9,7 +9,7 @@ namespace Microsoft.DotNet.Watch.UnitTests { public class ApplyDeltaTests(ITestOutputHelper logger) : DotNetWatchTestBase(logger) { - [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] + [Fact] public async Task AddSourceFile() { Log("AddSourceFile started"); @@ -21,7 +21,7 @@ public async Task AddSourceFile() App.Start(testAsset, [], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // add a new file: UpdateSourceFile(Path.Combine(dependencyDir, "AnotherLib.cs"), """ @@ -32,7 +32,7 @@ public static void Print() } """); - await App.WaitForOutputLineContaining(MessageDescriptor.ReEvaluationCompleted); + await App.WaitUntilOutputContains(MessageDescriptor.ReEvaluationCompleted); // update existing file: UpdateSourceFile(Path.Combine(dependencyDir, "Foo.cs"), """ @@ -43,7 +43,7 @@ public static void Print() } """); - await App.AssertOutputLineStartsWith("Changed!"); + await App.WaitUntilOutputContains("Changed!"); } [Fact] @@ -56,7 +56,7 @@ public async Task ChangeFileInDependency() App.Start(testAsset, [], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); var newSrc = """ public class Lib @@ -68,12 +68,12 @@ public static void Print() UpdateSourceFile(Path.Combine(dependencyDir, "Foo.cs"), newSrc); - await App.AssertOutputLineStartsWith("Changed!"); + await App.WaitUntilOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); - App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); + await App.WaitUntilOutputContains("Changed!"); } - [Fact(Skip = "https://github.com/dotnet/sdk/issues/52576")] + [Fact] public async Task ProjectChange_UpdateDirectoryBuildPropsThenUpdateSource() { var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") @@ -83,14 +83,15 @@ public async Task ProjectChange_UpdateDirectoryBuildPropsThenUpdateSource() App.Start(testAsset, [], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); UpdateSourceFile( Path.Combine(testAsset.Path, "Directory.Build.props"), src => src.Replace("false", "true")); - await App.WaitForOutputLineContaining(MessageDescriptor.NoCSharpChangesToApply); - App.AssertOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); + await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); + await App.WaitUntilOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); + App.Process.ClearOutput(); var newSrc = """ @@ -107,8 +108,8 @@ public static unsafe void Print() UpdateSourceFile(Path.Combine(dependencyDir, "Foo.cs"), newSrc); - await App.AssertOutputLineStartsWith("Changed!"); await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains("Changed!"); } [Theory] @@ -140,15 +141,15 @@ public static void Print() App.Start(testAsset, ["--non-interactive"], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); await App.WaitUntilOutputContains($"{symbolName} set"); App.Process.ClearOutput(); UpdateSourceFile(buildFilePath, src => src.Replace(symbolName, "")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); - App.AssertOutputContains("dotnet watch ⌚ [auto-restart] error ENC1102: Changing project setting 'DefineConstants'"); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); + await App.WaitUntilOutputContains("dotnet watch ⌚ [auto-restart] error ENC1102: Changing project setting 'DefineConstants'"); await App.WaitUntilOutputContains($"{symbolName} not set"); } @@ -173,7 +174,7 @@ public static void Print() { #if BUILD_CONST_IN_PROPS System.Console.WriteLine("BUILD_CONST_IN_PROPS set"); - #else + #else System.Console.WriteLine("BUILD_CONST_IN_PROPS not set"); #endif } @@ -182,7 +183,7 @@ public static void Print() App.Start(testAsset, [], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); await App.WaitUntilOutputContains("BUILD_CONST_IN_PROPS set"); App.Process.ClearOutput(); @@ -193,10 +194,10 @@ public static void Print() await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains("BUILD_CONST not set"); - App.AssertOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); + await App.WaitUntilOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); } - [Fact(Skip = "https://github.com/dotnet/sdk/issues/49545")] + [Fact] public async Task ProjectChange_DirectoryBuildProps_Delete() { var testAsset = TestAssets.CopyTestAsset("WatchAppWithProjectDeps") @@ -220,19 +221,20 @@ public static void Print() } """); - App.Start(testAsset, [], "AppWithDeps"); + App.Start(testAsset, ["--non-interactive"], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); await App.WaitUntilOutputContains("BUILD_CONST_IN_PROPS set"); + // delete Directory.Build.props that defines BUILD_CONST_IN_PROPS Log($"Deleting {directoryBuildProps}"); File.Delete(directoryBuildProps); - await App.WaitForOutputLineContaining(MessageDescriptor.NoCSharpChangesToApply); - App.AssertOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); + // Project needs to be re-evaluated: + await App.WaitUntilOutputContains(MessageDescriptor.ProjectChangeTriggeredReEvaluation); App.Process.ClearOutput(); - await App.AssertOutputLineStartsWith("BUILD_CONST_IN_PROPS not set"); + await App.WaitUntilOutputContains("BUILD_CONST_IN_PROPS not set"); } [Fact] @@ -256,8 +258,8 @@ public async Task DefaultItemExcludes_DefaultItemsEnabled() App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(new Regex(@"dotnet watch ⌚ Exclusion glob: 'AppData/[*][*]/[*][.][*];bin[/\\]+Debug[/\\]+[*][*];obj[/\\]+Debug[/\\]+[*][*];bin[/\\]+[*][*];obj[/\\]+[*][*]")); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(new Regex(@"dotnet watch ⌚ Exclusion glob: 'AppData/[*][*]/[*][.][*];bin[/\\]+Debug[/\\]+[*][*];obj[/\\]+Debug[/\\]+[*][*];bin[/\\]+[*][*];obj[/\\]+[*][*]")); App.Process.ClearOutput(); UpdateSourceFile(appDataFilePath, """ @@ -297,9 +299,9 @@ public async Task DefaultItemExcludes_DefaultItemsDisabled() App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains($"dotnet watch ⌚ Excluded directory: '{binDir}'"); - App.AssertOutputContains($"dotnet watch ⌚ Excluded directory: '{objDir}'"); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains($"dotnet watch ⌚ Excluded directory: '{binDir}'"); + await App.WaitUntilOutputContains($"dotnet watch ⌚ Excluded directory: '{objDir}'"); App.Process.ClearOutput(); UpdateSourceFile(binDirFilePath, "class X;"); @@ -320,7 +322,7 @@ public async Task ProjectChange_GlobalUsings() App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // missing System.Linq import: UpdateSourceFile(programPath, content => content.Replace(""" @@ -330,7 +332,8 @@ public async Task ProjectChange_GlobalUsings() Console.WriteLine($">>> {typeof(XDocument)}"); """)); - await App.WaitForOutputLineContaining(MessageDescriptor.UnableToApplyChanges); + await App.WaitUntilOutputContains(MessageDescriptor.UnableToApplyChanges); + App.Process.ClearOutput(); UpdateSourceFile(projectPath, content => content.Replace(""" @@ -339,11 +342,11 @@ public async Task ProjectChange_GlobalUsings() """)); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains(">>> System.Xml.Linq.XDocument"); - App.AssertOutputContains(MessageDescriptor.ReEvaluationCompleted); + await App.WaitUntilOutputContains(MessageDescriptor.ReEvaluationCompleted); } [Fact] @@ -362,7 +365,7 @@ public async Task BinaryLogs() App.SuppressVerboseLogging(); App.Start(testAsset, ["--verbose", $"-bl:{binLogPath}"], testFlags: TestFlags.None); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); var expectedLogs = new List() { @@ -383,7 +386,7 @@ public async Task BinaryLogs() """)); - await App.WaitForOutputLineContaining(MessageDescriptor.ReEvaluationCompleted); + await App.WaitUntilOutputContains(MessageDescriptor.ReEvaluationCompleted); // project update triggered restore and DTB: expectedLogs.Add(binLogPathBase + "-dotnet-watch.Restore.WatchHotReloadApp.csproj.2.binlog"); @@ -423,23 +426,24 @@ public async Task AutoRestartOnRudeEdit(bool nonInteractive) App.Start(testAsset, nonInteractive ? ["--non-interactive"] : []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + App.Process.ClearOutput(); // rude edit: adding virtual method UpdateSourceFile(programPath, src => src.Replace("/* member placeholder */", "public virtual void F() {}")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains($"⌚ [auto-restart] {programPath}(39,11): error ENC0023: Adding an abstract method or overriding an inherited method requires restarting the application."); - App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); - App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); + await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); + await App.WaitUntilOutputContains($"⌚ [auto-restart] {programPath}(39,11): error ENC0023: Adding an abstract method or overriding an inherited method requires restarting the application."); + await App.WaitUntilOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); + await App.WaitUntilOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); App.Process.ClearOutput(); // valid edit: UpdateSourceFile(programPath, src => src.Replace("public virtual void F() {}", "public virtual void F() { Console.WriteLine(1); }")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); } [Theory(Skip = "https://github.com/dotnet/sdk/issues/51469")] @@ -458,7 +462,7 @@ public async Task AutoRestartOnRuntimeRudeEdit(bool nonInteractive) File.WriteAllText(programPath, """ using System; using System.Threading; - + var d = C.F(); while (true) @@ -481,23 +485,28 @@ public static Action F() App.Start(testAsset, nonInteractive ? ["--non-interactive"] : []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); await App.WaitUntilOutputContains("System.Int32"); App.Process.ClearOutput(); UpdateSourceFile(programPath, src => src.Replace("Action", "Action")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); - await App.WaitUntilOutputContains("System.Byte"); - - App.AssertOutputContains($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] HotReloadException handler installed."); - App.AssertOutputContains($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] Runtime rude edit detected:"); + // The following agent messages must be reported in order. + // The HotReloadException handler needs to be installed and update handlers invoked and completed before the + // HotReloadException handler may proceed with runtime rude edit processing and application restart. + await App.WaitForOutputLineContaining($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] HotReloadException handler installed."); + await App.WaitForOutputLineContaining($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] Invoking metadata update handlers."); + await App.WaitForOutputLineContaining($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] Updates applied."); + await App.WaitForOutputLineContaining($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] Runtime rude edit detected:"); - App.AssertOutputContains($"dotnet watch ⚠ [WatchHotReloadApp ({tfm})] " + + await App.WaitUntilOutputContains($"dotnet watch ⚠ [WatchHotReloadApp ({tfm})] " + "Attempted to invoke a deleted lambda or local function implementation. " + "This can happen when lambda or local function is deleted while the application is running."); - App.AssertOutputContains(MessageDescriptor.RestartingApplication, $"WatchHotReloadApp ({tfm})"); + await App.WaitUntilOutputContains(MessageDescriptor.RestartingApplication, $"WatchHotReloadApp ({tfm})"); + + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains("System.Byte"); } [Fact] @@ -510,22 +519,22 @@ public async Task AutoRestartOnRudeEditAfterRestartPrompt() App.Start(testAsset, [], testFlags: TestFlags.ReadKeyFromStdin); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); App.Process.ClearOutput(); // rude edit: adding virtual method UpdateSourceFile(programPath, src => src.Replace("/* member placeholder */", "public virtual void F() {}")); // the prompt is printed into stdout while the error is printed into stderr, so they might arrive in any order: - await App.AssertOutputLineStartsWith(" ❔ Do you want to restart your app? Yes (y) / No (n) / Always (a) / Never (v)", failure: _ => false); + await App.WaitUntilOutputContains(" ❔ Do you want to restart your app? Yes (y) / No (n) / Always (a) / Never (v)"); await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains($"❌ {programPath}(39,11): error ENC0023: Adding an abstract method or overriding an inherited method requires restarting the application."); + await App.WaitUntilOutputContains($"❌ {programPath}(39,11): error ENC0023: Adding an abstract method or overriding an inherited method requires restarting the application."); App.Process.ClearOutput(); App.SendKey('a'); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); @@ -534,12 +543,12 @@ public async Task AutoRestartOnRudeEditAfterRestartPrompt() // rude edit: deleting virtual method UpdateSourceFile(programPath, src => src.Replace("public virtual void F() {}", "")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains($"⌚ [auto-restart] {programPath}(39,1): error ENC0033: Deleting method 'F()' requires restarting the application."); - App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); - App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); + await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); + await App.WaitUntilOutputContains($"⌚ [auto-restart] {programPath}(39,1): error ENC0033: Deleting method 'F()' requires restarting the application."); + await App.WaitUntilOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); + await App.WaitUntilOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); } [Theory] @@ -566,25 +575,25 @@ public async Task AutoRestartOnNoEffectEdit(bool nonInteractive) App.Start(testAsset, nonInteractive ? ["--non-interactive"] : []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); App.Process.ClearOutput(); // top-level code change: UpdateSourceFile(programPath, src => src.Replace("Started", "")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains($"⌚ [auto-restart] {programPath}(17,19): warning ENC0118: Changing 'top-level code' might not have any effect until the application is restarted."); - App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); - App.AssertOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); - App.AssertOutputContains(""); + await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); + await App.WaitUntilOutputContains($"⌚ [auto-restart] {programPath}(17,19): warning ENC0118: Changing 'top-level code' might not have any effect until the application is restarted."); + await App.WaitUntilOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exited"); + await App.WaitUntilOutputContains($"[WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Launched"); + await App.WaitUntilOutputContains(""); App.Process.ClearOutput(); // valid edit: UpdateSourceFile(programPath, src => src.Replace("/* member placeholder */", "public void F() {}")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); } /// @@ -604,7 +613,7 @@ public async Task BaselineCompilationError() App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForFileChangeBeforeRestarting); UpdateSourceFile(programPath, """ System.Console.WriteLine(""); @@ -621,7 +630,7 @@ public async Task ChangeFileInFSharpProject() App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForFileChangeBeforeRestarting); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForFileChangeBeforeRestarting); UpdateSourceFile(Path.Combine(testAsset.Path, "Program.fs"), content => content.Replace("Hello World!", "")); @@ -654,17 +663,19 @@ open System.Threading App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + App.Process.ClearOutput(); UpdateSourceFile(sourcePath, content => content.Replace("Waiting", "")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); - await App.AssertOutputLineStartsWith(""); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(""); + App.Process.ClearOutput(); UpdateSourceFile(sourcePath, content => content.Replace("", "")); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); - await App.AssertOutputLineStartsWith(""); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(""); } // Test is timing out on .NET Framework: https://github.com/dotnet/sdk/issues/41669 @@ -676,7 +687,7 @@ public async Task HandleTypeLoadFailure() App.Start(testAsset, [], "App"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); var newSrc = """ class DepSubType : Dep @@ -695,7 +706,7 @@ public static void Print() UpdateSourceFile(Path.Combine(testAsset.Path, "App", "Update.cs"), newSrc); - await App.AssertOutputLineStartsWith("Updated types: Printer"); + await App.WaitUntilOutputContains("Updated types: Printer"); } [Fact] @@ -720,11 +731,11 @@ class AppUpdateHandler App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); UpdateSourceFile(sourcePath, source.Replace("Console.WriteLine(\".\");", "Console.WriteLine(\"\");")); - await App.WaitForOutputLineContaining(""); + await App.WaitUntilOutputContains(""); await App.WaitUntilOutputContains( $"dotnet watch ⚠ [WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Expected to find a static method 'ClearCache', 'UpdateApplication' or 'UpdateContent' on type 'AppUpdateHandler, WatchHotReloadApp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null' but neither exists."); @@ -759,11 +770,11 @@ class AppUpdateHandler App.Start(testAsset, []); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); UpdateSourceFile(sourcePath, source.Replace("Console.WriteLine(\".\");", "Console.WriteLine(\"\");")); - await App.WaitForOutputLineContaining(""); + await App.WaitUntilOutputContains(""); await App.WaitUntilOutputContains($"dotnet watch ⚠ [WatchHotReloadApp ({ToolsetInfo.CurrentTargetFramework})] Exception from 'AppUpdateHandler.ClearCache': System.InvalidOperationException: Bug!"); @@ -799,7 +810,7 @@ public async Task GracefulTermination_Windows() App.Start(testAsset, [], testFlags: TestFlags.ReadKeyFromStdin); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); await App.WaitUntilOutputContains($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] Windows Ctrl+C handling enabled."); @@ -807,7 +818,7 @@ public async Task GracefulTermination_Windows() App.SendControlC(); - await App.WaitForOutputLineContaining("Ctrl+C detected! Performing cleanup..."); + await App.WaitUntilOutputContains("Ctrl+C detected! Performing cleanup..."); await App.WaitUntilOutputContains("exited with exit code 0."); } @@ -830,7 +841,7 @@ public async Task GracefulTermination_Unix() App.Start(testAsset, [], testFlags: TestFlags.ReadKeyFromStdin); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); await App.WaitUntilOutputContains($"dotnet watch 🕵️ [WatchHotReloadApp ({tfm})] Posix signal handlers registered."); @@ -838,7 +849,7 @@ public async Task GracefulTermination_Unix() App.SendControlC(); - await App.WaitForOutputLineContaining("SIGTERM detected! Performing cleanup..."); + await App.WaitUntilOutputContains("SIGTERM detected! Performing cleanup..."); await App.WaitUntilOutputContains("exited with exit code 0."); } @@ -864,21 +875,21 @@ public async Task BlazorWasm(bool projectSpecifiesCapabilities) var port = TestOptions.GetTestPort(); App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); - App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); // Browser is launched based on blazor-devserver output "Now listening on: ...". await App.WaitUntilOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", "")); // Middleware should have been loaded to blazor-devserver before the browser is launched: - App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorWasmHotReloadMiddleware[0]"); - App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserScriptMiddleware[0]"); - App.AssertOutputContains("Middleware loaded. Script /_framework/aspnetcore-browser-refresh.js"); - App.AssertOutputContains("Middleware loaded. Script /_framework/blazor-hotreload.js"); - App.AssertOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserRefreshMiddleware"); - App.AssertOutputContains("Middleware loaded: DOTNET_MODIFIABLE_ASSEMBLIES=debug, __ASPNETCORE_BROWSER_TOOLS=true"); + await App.WaitUntilOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BlazorWasmHotReloadMiddleware[0]"); + await App.WaitUntilOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserScriptMiddleware[0]"); + await App.WaitUntilOutputContains("Middleware loaded. Script /_framework/aspnetcore-browser-refresh.js"); + await App.WaitUntilOutputContains("Middleware loaded. Script /_framework/blazor-hotreload.js"); + await App.WaitUntilOutputContains("dbug: Microsoft.AspNetCore.Watch.BrowserRefresh.BrowserRefreshMiddleware"); + await App.WaitUntilOutputContains("Middleware loaded: DOTNET_MODIFIABLE_ASSEMBLIES=debug, __ASPNETCORE_BROWSER_TOOLS=true"); // shouldn't see any agent messages (agent is not loaded into blazor-devserver): App.AssertOutputDoesNotContain("🕵️"); @@ -889,16 +900,16 @@ public async Task BlazorWasm(bool projectSpecifiesCapabilities) """; UpdateSourceFile(Path.Combine(testAsset.Path, "Pages", "Index.razor"), newSource); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); // check project specified capapabilities: if (projectSpecifiesCapabilities) { - App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddMethodToExistingType Baseline."); + await App.WaitUntilOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddMethodToExistingType Baseline."); } else { - App.AssertOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); + await App.WaitUntilOutputContains("dotnet watch 🔥 Hot reload capabilities: AddExplicitInterfaceImplementation AddFieldRva AddInstanceFieldToExistingType AddMethodToExistingType AddStaticFieldToExistingType Baseline ChangeCustomAttributes GenericAddFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod NewTypeDefinition UpdateParameters."); } } @@ -920,8 +931,8 @@ public async Task BlazorWasm_MSBuildWarning() var port = TestOptions.GetTestPort(); App.Start(testAsset, ["--urls", "http://localhost:" + port], testFlags: TestFlags.MockBrowser); - await App.AssertOutputLineStartsWith("dotnet watch ⚠ msbuild: [Warning] Duplicate source file"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains("dotnet watch ⚠ msbuild: [Warning] Duplicate source file"); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); } [PlatformSpecificFact(TestPlatforms.Windows)] // https://github.com/dotnet/aspnetcore/issues/63759 @@ -933,11 +944,11 @@ public async Task BlazorWasm_Restart() var port = TestOptions.GetTestPort(); App.Start(testAsset, ["--urls", "http://localhost:" + port, "--non-interactive"], testFlags: TestFlags.ReadKeyFromStdin | TestFlags.MockBrowser); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); - App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); - App.AssertOutputContains(MessageDescriptor.PressCtrlRToRestart); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + await App.WaitUntilOutputContains(MessageDescriptor.PressCtrlRToRestart); // Browser is launched based on blazor-devserver output "Now listening on: ...". await App.WaitUntilOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", "")); @@ -958,17 +969,17 @@ public async Task BlazorWasmHosted() var port = TestOptions.GetTestPort(); App.Start(testAsset, ["--urls", "http://localhost:" + port], "blazorhosted", testFlags: TestFlags.MockBrowser); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); - App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); - App.AssertOutputContains(MessageDescriptor.ApplicationKind_BlazorHosted); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + await App.WaitUntilOutputContains(MessageDescriptor.ApplicationKind_BlazorHosted); // client capabilities: - App.AssertOutputContains($"dotnet watch ⌚ [blazorhosted ({tfm})] Project specifies capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType NewTypeDefinition ChangeCustomAttributes AddInstanceFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod UpdateParameters GenericAddFieldToExistingType AddExplicitInterfaceImplementation."); + await App.WaitUntilOutputContains($"dotnet watch ⌚ [blazorhosted ({tfm})] Project specifies capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType NewTypeDefinition ChangeCustomAttributes AddInstanceFieldToExistingType GenericAddMethodToExistingType GenericUpdateMethod UpdateParameters GenericAddFieldToExistingType AddExplicitInterfaceImplementation."); // server capabilities: - App.AssertOutputContains($"dotnet watch ⌚ [blazorhosted ({tfm})] Capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType AddInstanceFieldToExistingType NewTypeDefinition ChangeCustomAttributes UpdateParameters GenericUpdateMethod GenericAddMethodToExistingType GenericAddFieldToExistingType AddFieldRva AddExplicitInterfaceImplementation."); + await App.WaitUntilOutputContains($"dotnet watch ⌚ [blazorhosted ({tfm})] Capabilities: Baseline AddMethodToExistingType AddStaticFieldToExistingType AddInstanceFieldToExistingType NewTypeDefinition ChangeCustomAttributes UpdateParameters GenericUpdateMethod GenericAddMethodToExistingType GenericAddFieldToExistingType AddFieldRva AddExplicitInterfaceImplementation."); } [PlatformSpecificFact(TestPlatforms.Windows)] // https://github.com/dotnet/aspnetcore/issues/63759 @@ -980,11 +991,11 @@ public async Task Razor_Component_ScopedCssAndStaticAssets() var port = TestOptions.GetTestPort(); App.Start(testAsset, ["--urls", "http://localhost:" + port], relativeProjectDirectory: "RazorApp", testFlags: TestFlags.MockBrowser); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); - App.AssertOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); - App.AssertOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); - App.AssertOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", "")); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToUseBrowserRefresh); + await App.WaitUntilOutputContains(MessageDescriptor.ConfiguredToLaunchBrowser); + await App.WaitUntilOutputContains(MessageDescriptor.LaunchingBrowser.GetMessage($"http://localhost:{port}", "")); App.Process.ClearOutput(); var scopedCssPath = Path.Combine(testAsset.Path, "RazorClassLibrary", "Components", "Example.razor.css"); @@ -996,19 +1007,19 @@ public async Task Razor_Component_ScopedCssAndStaticAssets() """; UpdateSourceFile(scopedCssPath, newCss); - await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.StaticAssetsChangesApplied); await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); - App.AssertOutputContains(MessageDescriptor.SendingStaticAssetUpdateRequest.GetMessage("wwwroot/RazorClassLibrary.bundle.scp.css")); + await App.WaitUntilOutputContains(MessageDescriptor.SendingStaticAssetUpdateRequest.GetMessage("wwwroot/RazorClassLibrary.bundle.scp.css")); App.Process.ClearOutput(); var cssPath = Path.Combine(testAsset.Path, "RazorApp", "wwwroot", "app.css"); UpdateSourceFile(cssPath, content => content.Replace("background-color: white;", "background-color: red;")); - await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.StaticAssetsChangesApplied); await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); - App.AssertOutputContains(MessageDescriptor.SendingStaticAssetUpdateRequest.GetMessage("wwwroot/app.css")); + await App.WaitUntilOutputContains(MessageDescriptor.SendingStaticAssetUpdateRequest.GetMessage("wwwroot/app.css")); App.Process.ClearOutput(); } @@ -1034,33 +1045,33 @@ public async Task MauiBlazor() var tfm = $"{ToolsetInfo.CurrentTargetFramework}-{platform}"; App.Start(testAsset, ["-f", tfm]); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // update code file: var razorPath = Path.Combine(testAsset.Path, "Components", "Pages", "Home.razor"); UpdateSourceFile(razorPath, content => content.Replace("Hello, world!", "Updated")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); - App.AssertOutputContains("Microsoft.AspNetCore.Components.HotReload.HotReloadManager.UpdateApplication"); + await App.WaitUntilOutputContains("Microsoft.AspNetCore.Components.HotReload.HotReloadManager.UpdateApplication"); App.Process.ClearOutput(); // update static asset: var cssPath = Path.Combine(testAsset.Path, "wwwroot", "css", "app.css"); UpdateSourceFile(cssPath, content => content.Replace("background-color: white;", "background-color: red;")); - await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); - App.AssertOutputContains("Microsoft.AspNetCore.Components.WebView.StaticContentHotReloadManager.UpdateContent"); - App.AssertOutputContains(MessageDescriptor.NoCSharpChangesToApply); + await App.WaitUntilOutputContains(MessageDescriptor.StaticAssetsChangesApplied); + await App.WaitUntilOutputContains("Microsoft.AspNetCore.Components.WebView.StaticContentHotReloadManager.UpdateContent"); + await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); App.Process.ClearOutput(); // update scoped css: var scopedCssPath = Path.Combine(testAsset.Path, "Components", "Pages", "Counter.razor.css"); UpdateSourceFile(scopedCssPath, content => content.Replace("background-color: green", "background-color: red")); - await App.WaitForOutputLineContaining(MessageDescriptor.StaticAssetsChangesApplied); - App.AssertOutputContains("Microsoft.AspNetCore.Components.WebView.StaticContentHotReloadManager.UpdateContent"); - App.AssertOutputContains(MessageDescriptor.NoCSharpChangesToApply); + await App.WaitUntilOutputContains(MessageDescriptor.StaticAssetsChangesApplied); + await App.WaitUntilOutputContains("Microsoft.AspNetCore.Components.WebView.StaticContentHotReloadManager.UpdateContent"); + await App.WaitUntilOutputContains(MessageDescriptor.NoCSharpChangesToApply); } // Test is timing out on .NET Framework: https://github.com/dotnet/sdk/issues/41669 @@ -1072,7 +1083,7 @@ public async Task HandleMissingAssemblyFailure() App.Start(testAsset, [], "App"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); var newSrc = /* lang=c#-test */""" using System; @@ -1097,7 +1108,7 @@ public static void Print() File.WriteAllText(Path.Combine(testAsset.Path, "App", "Update.cs"), newSrc); - await App.AssertOutputLineStartsWith("Updated types: Printer"); + await App.WaitUntilOutputContains("Updated types: Printer"); } [Theory] @@ -1134,7 +1145,7 @@ public static void PrintFileName([CallerFilePathAttribute] string filePath = nul App.Start(testAsset, [], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // rename the file: if (useMove) @@ -1188,7 +1199,7 @@ public static void PrintDirectoryName([CallerFilePathAttribute] string filePath App.Start(testAsset, ["--non-interactive"], "AppWithDeps"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // rename the directory: if (useMove) @@ -1207,7 +1218,7 @@ public static void PrintDirectoryName([CallerFilePathAttribute] string filePath // dotnet-watch may observe the delete separately from the new file write. // If so, rude edit is reported, the app is auto-restarted and we should observe the final result. - await App.AssertOutputLineStartsWith("> NewSubdir", failure: _ => false); + await App.WaitUntilOutputContains("> NewSubdir"); } [PlatformSpecificFact(TestPlatforms.Windows)] // https://github.com/dotnet/aspnetcore/issues/63759 @@ -1226,18 +1237,18 @@ public async Task Aspire_BuildError_ManualRestart() App.Start(testAsset, ["-lp", "http"], relativeProjectDirectory: "WatchAspire.AppHost", testFlags: TestFlags.ReadKeyFromStdin); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); // check that Aspire server output is logged via dotnet-watch reporter: await App.WaitUntilOutputContains("dotnet watch ⭐ Now listening on:"); // wait until after all DCP sessions have started: await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #3"); - App.AssertOutputContains("dotnet watch ⭐ Session started: #1"); - App.AssertOutputContains("dotnet watch ⭐ Session started: #2"); + await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #1"); + await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #2"); // MigrationService terminated: - App.AssertOutputContains("dotnet watch ⭐ [#1] Sending 'sessionTerminated'"); + await App.WaitUntilOutputContains("dotnet watch ⭐ [#1] Sending 'sessionTerminated'"); // working directory of the service should be it's project directory: await App.WaitUntilOutputContains($"ApiService working directory: '{Path.GetDirectoryName(serviceProjectPath)}'"); @@ -1247,9 +1258,9 @@ public async Task Aspire_BuildError_ManualRestart() serviceSourcePath, serviceSource.Replace("Enumerable.Range(1, 5)", "Enumerable.Range(1, 10)")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); - App.AssertOutputContains("Using Aspire process launcher."); + await App.WaitUntilOutputContains("Using Aspire process launcher."); // Only one browser should be launched (dashboard). The child process shouldn't launch a browser. Assert.Equal(1, App.Process.Output.Count(line => line.StartsWith("dotnet watch ⌚ Launching browser: "))); @@ -1261,24 +1272,24 @@ public async Task Aspire_BuildError_ManualRestart() serviceSource.Replace("record WeatherForecast", "record WeatherForecast2")); // the prompt is printed into stdout while the error is printed into stderr, so they might arrive in any order: - await App.WaitForOutputLineContaining(" ❔ Do you want to restart these projects? Yes (y) / No (n) / Always (a) / Never (v)"); + await App.WaitUntilOutputContains(" ❔ Do you want to restart these projects? Yes (y) / No (n) / Always (a) / Never (v)"); await App.WaitUntilOutputContains(MessageDescriptor.RestartNeededToApplyChanges); - App.AssertOutputContains($"dotnet watch ❌ {serviceSourcePath}(40,1): error ENC0020: Renaming record 'WeatherForecast' requires restarting the application."); - App.AssertOutputContains("dotnet watch ⌚ Affected projects:"); - App.AssertOutputContains("dotnet watch ⌚ WatchAspire.ApiService"); + await App.WaitUntilOutputContains($"dotnet watch ❌ {serviceSourcePath}(40,1): error ENC0020: Renaming record 'WeatherForecast' requires restarting the application."); + await App.WaitUntilOutputContains("dotnet watch ⌚ Affected projects:"); + await App.WaitUntilOutputContains("dotnet watch ⌚ WatchAspire.ApiService"); App.Process.ClearOutput(); App.SendKey('y'); - await App.WaitForOutputLineContaining(MessageDescriptor.FixBuildError); + await App.WaitUntilOutputContains(MessageDescriptor.FixBuildError); - App.AssertOutputContains("Application is shutting down..."); + await App.WaitUntilOutputContains("Application is shutting down..."); - App.AssertOutputContains($"[WatchAspire.ApiService ({tfm})] Exited"); + await App.WaitUntilOutputContains($"[WatchAspire.ApiService ({tfm})] Exited"); - App.AssertOutputContains(MessageDescriptor.Building.GetMessage(serviceProjectPath)); - App.AssertOutputContains("error CS0246: The type or namespace name 'WeatherForecast' could not be found"); + await App.WaitUntilOutputContains(MessageDescriptor.Building.GetMessage(serviceProjectPath)); + await App.WaitUntilOutputContains("error CS0246: The type or namespace name 'WeatherForecast' could not be found"); App.Process.ClearOutput(); // fix build error: @@ -1286,27 +1297,28 @@ public async Task Aspire_BuildError_ManualRestart() serviceSourcePath, serviceSource.Replace("WeatherForecast", "WeatherForecast2")); - await App.WaitForOutputLineContaining(MessageDescriptor.ProjectsRestarted.GetMessage(1)); + await App.WaitUntilOutputContains(MessageDescriptor.ProjectsRestarted.GetMessage(1)); - App.AssertOutputContains(MessageDescriptor.BuildSucceeded.GetMessage(serviceProjectPath)); - App.AssertOutputContains(MessageDescriptor.ProjectsRebuilt); - App.AssertOutputContains($"dotnet watch ⭐ Starting project: {serviceProjectPath}"); + await App.WaitUntilOutputContains(MessageDescriptor.BuildSucceeded.GetMessage(serviceProjectPath)); + await App.WaitUntilOutputContains(MessageDescriptor.ProjectsRebuilt); + await App.WaitUntilOutputContains($"dotnet watch ⭐ Starting project: {serviceProjectPath}"); App.Process.ClearOutput(); App.SendControlC(); - await App.WaitForOutputLineContaining(MessageDescriptor.ShutdownRequested); + await App.WaitUntilOutputContains(MessageDescriptor.ShutdownRequested); await App.WaitUntilOutputContains($"[WatchAspire.ApiService ({tfm})] Exited"); + await App.WaitUntilOutputContains($"[WatchAspire.Web ({tfm})] Exited"); await App.WaitUntilOutputContains($"[WatchAspire.AppHost ({tfm})] Exited"); await App.WaitUntilOutputContains("dotnet watch ⭐ Waiting for server to shutdown ..."); - App.AssertOutputContains("dotnet watch ⭐ Stop session #1"); - App.AssertOutputContains("dotnet watch ⭐ Stop session #2"); - App.AssertOutputContains("dotnet watch ⭐ Stop session #3"); - App.AssertOutputContains("dotnet watch ⭐ [#2] Sending 'sessionTerminated'"); - App.AssertOutputContains("dotnet watch ⭐ [#3] Sending 'sessionTerminated'"); + await App.WaitUntilOutputContains("dotnet watch ⭐ Stop session #1"); + await App.WaitUntilOutputContains("dotnet watch ⭐ Stop session #2"); + await App.WaitUntilOutputContains("dotnet watch ⭐ Stop session #3"); + await App.WaitUntilOutputContains("dotnet watch ⭐ [#2] Sending 'sessionTerminated'"); + await App.WaitUntilOutputContains("dotnet watch ⭐ [#3] Sending 'sessionTerminated'"); } [PlatformSpecificFact(TestPlatforms.Windows)] // https://github.com/dotnet/aspnetcore/issues/63759 @@ -1322,18 +1334,18 @@ public async Task Aspire_NoEffect_AutoRestart() App.Start(testAsset, ["-lp", "http", "--non-interactive"], relativeProjectDirectory: "WatchAspire.AppHost"); - await App.WaitForOutputLineContaining(MessageDescriptor.WaitingForChanges); + await App.WaitUntilOutputContains(MessageDescriptor.WaitingForChanges); + + await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #1"); + await App.WaitUntilOutputContains(MessageDescriptor.Exited, $"WatchAspire.MigrationService ({tfm})"); + await App.WaitUntilOutputContains("dotnet watch ⭐ [#1] Sending 'sessionTerminated'"); + + // migration service output should not be printed to dotnet-watch output, it should be sent via DCP as a notification: + await App.WaitUntilOutputContains("dotnet watch ⭐ [#1] Sending 'serviceLogs': log_message=' Migration complete', is_std_err=False"); // wait until after DCP sessions have been started for all projects: await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #3"); - // other services are waiting for completion of MigrationService: - App.AssertOutputContains("dotnet watch ⭐ Session started: #1"); - App.AssertOutputContains(MessageDescriptor.Exited, $"WatchAspire.MigrationService ({tfm})"); - App.AssertOutputContains("dotnet watch ⭐ [#1] Sending 'sessionTerminated'"); - - // migration service output should not be printed to dotnet-watch output, it hsould be sent via DCP as a notification: - App.AssertOutputContains("dotnet watch ⭐ [#1] Sending 'serviceLogs': log_message=' Migration complete', is_std_err=False"); App.AssertOutputDoesNotContain(new Regex("^ +Migration complete")); App.Process.ClearOutput(); @@ -1341,7 +1353,7 @@ public async Task Aspire_NoEffect_AutoRestart() // no-effect edit: UpdateSourceFile(webSourcePath, src => src.Replace("/* top-level placeholder */", "builder.Services.AddRazorComponents();")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); await App.WaitUntilOutputContains("dotnet watch ⭐ Session started: #3"); await App.WaitUntilOutputContains(MessageDescriptor.ProjectsRestarted.GetMessage(1)); App.AssertOutputDoesNotContain("⚠"); @@ -1355,8 +1367,8 @@ public async Task Aspire_NoEffect_AutoRestart() // lambda body edit: UpdateSourceFile(webSourcePath, src => src.Replace("Hello world!", "")); - await App.WaitForOutputLineContaining(MessageDescriptor.ManagedCodeChangesApplied); - App.AssertOutputContains($"dotnet watch 🕵️ [WatchAspire.Web ({tfm})] Updates applied."); + await App.WaitUntilOutputContains(MessageDescriptor.ManagedCodeChangesApplied); + await App.WaitUntilOutputContains($"dotnet watch 🕵️ [WatchAspire.Web ({tfm})] Updates applied."); App.AssertOutputDoesNotContain(MessageDescriptor.ProjectsRebuilt); App.AssertOutputDoesNotContain(MessageDescriptor.ProjectsRestarted); App.AssertOutputDoesNotContain("⚠"); From a5af8d708ece9f7a7446ceae70d9a83841260d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Matou=C5=A1ek?= Date: Thu, 12 Feb 2026 09:22:35 -0800 Subject: [PATCH 276/280] Disable workspace-based development in settings (#52990) --- .vscode/settings.json | 1 + 1 file changed, 1 insertion(+) diff --git a/.vscode/settings.json b/.vscode/settings.json index 212ebd955c26..d70dda8396c2 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,7 @@ { "dotnet.testWindow.disableAutoDiscovery": true, "dotnet.testWindow.disableBuildOnRun": true, + "dotnet.enableWorkspaceBasedDevelopment": false, "dotnet.defaultSolution": "cli.slnf", "files.associations": { "*.slnf": "json", From f86c2992a4abef2e273640e3f69c77fa447d6146 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 12 Feb 2026 17:24:46 +0000 Subject: [PATCH 277/280] Reset files to main Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 2 + eng/Version.Details.props | 372 +++++----- eng/Version.Details.xml | 692 +++++++++--------- eng/common/SetupNugetSources.ps1 | 17 +- eng/common/SetupNugetSources.sh | 17 +- eng/common/build.sh | 2 +- eng/common/core-templates/job/job.yml | 8 + .../job/publish-build-assets.yml | 18 +- .../core-templates/job/source-build.yml | 4 +- .../core-templates/post-build/post-build.yml | 463 ++++++------ .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild-impl.yml | 34 + .../steps/install-microbuild.yml | 64 +- .../core-templates/steps/source-build.yml | 2 +- .../steps/source-index-stage1-publish.yml | 8 +- eng/common/cross/build-rootfs.sh | 4 +- eng/common/darc-init.sh | 2 +- eng/common/dotnet-install.sh | 2 +- eng/common/dotnet.sh | 2 +- eng/common/generate-sbom-prep.sh | 0 eng/common/internal-feed-operations.sh | 2 +- eng/common/native/install-dependencies.sh | 4 +- eng/common/post-build/redact-logs.ps1 | 3 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 17 +- eng/common/tools.sh | 4 - global.json | 6 +- 27 files changed, 889 insertions(+), 864 deletions(-) create mode 100644 eng/common/core-templates/steps/install-microbuild-impl.yml mode change 100755 => 100644 eng/common/generate-sbom-prep.sh diff --git a/NuGet.config b/NuGet.config index f3f728c95515..4e8eb7f42e2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a056dd5cfce8..bb471782abd7 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,151 +6,174 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26103.116 - 18.3.0-preview-26103-116 - 18.3.0-preview-26103-116 - 7.4.0-rc.10416 - 10.0.300-alpha.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 10.0.0-preview.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 10.0.0-beta.26103.116 - 15.2.300-servicing.26103.116 - 5.5.0-2.26103.116 - 5.5.0-2.26103.116 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 10.0.0-preview.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 18.4.0-preview-26069-105 + 18.4.0-preview-26069-105 + 7.3.0-preview.1.7005 + 11.0.100-preview.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 10.0.0-preview.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 2.0.0-preview.1.26069.105 + 3.0.0-preview.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-beta.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 15.2.100-preview.26069.105 + 11.0.0-preview.1.26069.105 + 5.4.0-2.26069.105 + 5.4.0-2.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 10.0.0-preview.7.25377.103 - 10.0.0-preview.26103.116 - 18.3.0-release-26103-116 - 10.0.300-alpha.26103.116 - 10.0.300-alpha.26103.116 - 10.0.300-alpha.26103.116 - 10.0.300-alpha.26103.116 - 10.0.300-alpha.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 10.0.200-preview.26103.116 - 18.3.0-release-26103-116 - 18.3.0-release-26103-116 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - 7.4.0-rc.10416 - - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.0-preview.1.25612.105 - 2.2.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2-servicing.25612.105 - 3.2.2 - 10.0.2 - 10.0.2-servicing.25612.105 - 10.0.2 - 10.0.2 - 2.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 - 10.0.2 + 10.0.0-preview.26069.105 + 11.0.0-preview.1.26069.105 + 18.3.0-preview-26069-105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.100-preview.26069.105 + 11.0.100-preview.26069.105 + 11.0.100-preview.26069.105 + 11.0.100-preview.26069.105 + 11.0.100-preview.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 11.0.100-preview.1.26069.105 + 18.3.0-preview-26069-105 + 18.3.0-preview-26069-105 + 3.3.0-preview.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 7.3.0-preview.1.7005 + 11.0.0-preview.1.26069.105 + 3.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 + 11.0.0-preview.1.26069.105 2.1.0 - 2.1.0-preview.25571.1 - 4.1.0-preview.25571.1 + 2.2.0-preview.26111.3 + 4.2.0-preview.26111.3 + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -166,20 +189,42 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) + $(MicrosoftDotNetWebItemTemplates110PackageVersion) + $(MicrosoftDotNetWebProjectTemplates110PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) + $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -196,6 +241,10 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -212,57 +261,6 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) - - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) - $(MicrosoftJSInteropPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c85ec7c9ebaa..ea3e45df7f0b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 @@ -68,170 +68,174 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 + + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b - - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b - - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - fad253f51b461736dfd3cd9c15977bb7493becef + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 + + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/dotnet/dotnet - 9477b510bb25fc69515d2ab188af3b72799929ac + ec846aee7f12180381c444dfeeba0c5022e1d110 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 - + https://github.com/microsoft/testfx - 43e592148ac1c7916908477bdffcf2a345affa6d + 55388f9fbe66d30f3aae74453780776ccd0bc1b1 - + https://github.com/microsoft/testfx - 43e592148ac1c7916908477bdffcf2a345affa6d + 55388f9fbe66d30f3aae74453780776ccd0bc1b1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet - 44525024595742ebe09023abe709df51de65009b + + https://github.com/dotnet/dotnet + ec846aee7f12180381c444dfeeba0c5022e1d110 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 65ed3a8adef0..fc8d618014e0 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,7 +1,6 @@ # 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. 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. +# 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. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -174,16 +173,4 @@ 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 b2163abbe71b..b97cc536379d 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,9 +1,8 @@ #!/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. 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. +# 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. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -174,18 +173,6 @@ 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/build.sh b/eng/common/build.sh index 9767bb411a4f..ec3e80d189ea 100755 --- a/eng/common/build.sh +++ b/eng/common/build.sh @@ -92,7 +92,7 @@ runtime_source_feed='' runtime_source_feed_key='' properties=() -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "${1/#--/-}" | tr "[:upper:]" "[:lower:]")" case "$opt" in -help|-h) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index 5ce518406198..748c4f07a64d 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -19,6 +19,8 @@ parameters: # publishing defaults artifacts: '' enableMicrobuild: false + enablePreviewMicrobuild: false + microbuildPluginVersion: 'latest' enableMicrobuildForMacAndLinux: false microbuildUseESRP: true enablePublishBuildArtifacts: false @@ -71,6 +73,8 @@ jobs: templateContext: ${{ parameters.templateContext }} variables: + - name: AllowPtrToDetectTestRunRetryFiles + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' @@ -128,6 +132,8 @@ jobs: - template: /eng/common/core-templates/steps/install-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} microbuildUseESRP: ${{ parameters.microbuildUseESRP }} continueOnError: ${{ parameters.continueOnError }} @@ -153,6 +159,8 @@ jobs: - template: /eng/common/core-templates/steps/cleanup-microbuild.yml parameters: enableMicrobuild: ${{ parameters.enableMicrobuild }} + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildPluginVersion: ${{ parameters.microbuildPluginVersion }} enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3437087c80fc..c9ee8ffd8f1d 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: @@ -91,8 +91,8 @@ jobs: fetchDepth: 3 clean: true - - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: - - ${{ if eq(parameters.publishingVersion, 3) }}: + - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: + - ${{ if eq(parameters.publishingVersion, 3) }}: - task: DownloadPipelineArtifact@2 displayName: Download Asset Manifests inputs: @@ -117,7 +117,7 @@ jobs: flattenFolders: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 # Populate internal runtime variables. @@ -125,7 +125,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: parameters: legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - task: AzureCLI@2 @@ -145,7 +145,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -173,7 +173,7 @@ jobs: artifactName: AssetManifests displayName: 'Publish Merged Manifest' retryCountOnTaskFailure: 10 # for any logs being locked - sbomEnabled: false # we don't need SBOM for logs + sbomEnabled: false # we don't need SBOM for logs - template: /eng/common/core-templates/steps/publish-build-artifacts.yml parameters: @@ -190,7 +190,7 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - + # Darc is targeting 8.0, so make sure it's installed - task: UseDotNet@2 inputs: @@ -218,4 +218,4 @@ jobs: - template: /eng/common/core-templates/steps/publish-logs.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb94..7322e88bea8b 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,10 +60,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals build.ubuntu.2204.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: Azure-Linux-3-Amd64 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 9423d71ca3a2..3bed9cdb49d8 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -1,106 +1,106 @@ parameters: - # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. - # Publishing V1 is no longer supported - # Publishing V2 is no longer supported - # Publishing V3 is the default - - name: publishingInfraVersion - displayName: Which version of publishing should be used to promote the build definition? - type: number - default: 3 - values: - - 3 - - - name: BARBuildId - displayName: BAR Build Id - type: number - default: 0 - - - name: PromoteToChannelIds - displayName: Channel to promote BARBuildId to - type: string - default: '' - - - name: enableSourceLinkValidation - displayName: Enable SourceLink validation - type: boolean - default: false - - - name: enableSigningValidation - displayName: Enable signing validation - type: boolean - default: true - - - name: enableSymbolValidation - displayName: Enable symbol validation - type: boolean - default: false - - - name: enableNugetValidation - displayName: Enable NuGet validation - type: boolean - default: true - - - name: publishInstallersAndChecksums - displayName: Publish installers and checksums - type: boolean - default: true - - - name: requireDefaultChannels - displayName: Fail the build if there are no default channel(s) registrations for the current build - type: boolean - default: false - - - name: SDLValidationParameters - type: object - default: - enable: false - publishGdn: false - continueOnError: false - params: '' - artifactNames: '' - downloadArtifacts: true - - - name: isAssetlessBuild - type: boolean - displayName: Is Assetless Build - default: false - - # These parameters let the user customize the call to sdk-task.ps1 for publishing - # symbols & general artifacts as well as for signing validation - - name: symbolPublishingAdditionalParameters - displayName: Symbol publishing additional parameters - type: string - default: '' - - - name: artifactsPublishingAdditionalParameters - displayName: Artifact publishing additional parameters - type: string - default: '' - - - name: signingValidationAdditionalParameters - displayName: Signing validation additional parameters - type: string - default: '' - - # Which stages should finish execution before post-build stages start - - name: validateDependsOn - type: object - default: - - build - - - name: publishDependsOn - type: object - default: - - Validate - - # Optional: Call asset publishing rather than running in a separate stage - - name: publishAssetsImmediately - type: boolean - default: false - - - name: is1ESPipeline - type: boolean - default: false +# Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. +# Publishing V1 is no longer supported +# Publishing V2 is no longer supported +# Publishing V3 is the default +- name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + +- name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + +- name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + +- name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + +- name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + +- name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + +- name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + +- name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + +- name: requireDefaultChannels + displayName: Fail the build if there are no default channel(s) registrations for the current build + type: boolean + default: false + +- name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + +- name: isAssetlessBuild + type: boolean + displayName: Is Assetless Build + default: false + +# These parameters let the user customize the call to sdk-task.ps1 for publishing +# symbols & general artifacts as well as for signing validation +- name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + +- name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + +- name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + +# Which stages should finish execution before post-build stages start +- name: validateDependsOn + type: object + default: + - build + +- name: publishDependsOn + type: object + default: + - Validate + +# Optional: Call asset publishing rather than running in a separate stage +- name: publishAssetsImmediately + type: boolean + default: false + +- name: is1ESPipeline + type: boolean + default: false stages: - ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: @@ -108,10 +108,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Validate Build Assets variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: NuGet Validation @@ -134,28 +134,28 @@ stages: demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation @@ -169,7 +169,7 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows @@ -177,46 +177,46 @@ stages: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Package Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: PackageArtifacts - checkDownloadedFiles: true - - # This is necessary whenever we want to publish/restore to an AzDO private feed - # Since sdk-task.ps1 tries to restore packages we need to do this authentication here - # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@1 - displayName: 'Authenticate to AzDO Feeds' - - # Signing validation will optionally work with the buildmanifest file which is downloaded from - # Azure DevOps above. - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs - /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' - ${{ parameters.signingValidationAdditionalParameters }} - - - template: /eng/common/core-templates/steps/publish-logs.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} - StageLabel: 'Validation' - JobLabel: 'Signing' - BinlogToolVersion: $(BinlogToolVersion) + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: /eng/common/core-templates/steps/publish-logs.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) - job: displayName: SourceLink Validation @@ -230,7 +230,7 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) image: 1es-windows-2022 os: windows @@ -238,33 +238,33 @@ stages: name: $(DncEngInternalBuildPool) demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: DownloadBuildArtifacts@0 - displayName: Download Blob Artifacts - inputs: - buildType: specific - buildVersionToDownload: specific - project: $(AzDOProjectName) - pipeline: $(AzDOPipelineId) - buildId: $(AzDOBuildId) - artifactName: BlobArtifacts - checkDownloadedFiles: true - - - task: PowerShell@2 - displayName: Validate - inputs: - filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) - -GHCommit $(Build.SourceVersion) - -SourcelinkCliVersion $(SourceLinkCLIVersion) - continueOnError: true + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true - ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: - stage: publish_using_darc @@ -274,10 +274,10 @@ stages: dependsOn: ${{ parameters.validateDependsOn }} displayName: Publish using Darc variables: - - template: /eng/common/core-templates/post-build/common-variables.yml - - template: /eng/common/core-templates/variables/pool-providers.yml - parameters: - is1ESPipeline: ${{ parameters.is1ESPipeline }} + - template: /eng/common/core-templates/post-build/common-variables.yml + - template: /eng/common/core-templates/variables/pool-providers.yml + parameters: + is1ESPipeline: ${{ parameters.is1ESPipeline }} jobs: - job: displayName: Publish Using Darc @@ -291,42 +291,41 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - ${{ if eq(parameters.is1ESPipeline, true) }}: + ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml - parameters: - BARBuildId: ${{ parameters.BARBuildId }} - PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - is1ESPipeline: ${{ parameters.is1ESPipeline }} - - - task: NuGetAuthenticate@1 - - # Populate internal runtime variables. - - template: /eng/common/templates/steps/enable-internal-sources.yml - parameters: - legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - - - template: /eng/common/templates/steps/enable-internal-runtimes.yml - - # Darc is targeting 8.0, so make sure it's installed - - task: UseDotNet@2 - inputs: - version: 8.0.x - - - task: AzureCLI@2 - displayName: Publish Using Darc - inputs: - azureSubscription: "Darc: Maestro Production" - scriptType: ps - scriptLocation: scriptPath - scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: > + - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + is1ESPipeline: ${{ parameters.is1ESPipeline }} + + - task: NuGetAuthenticate@1 + + # Populate internal runtime variables. + - template: /eng/common/templates/steps/enable-internal-sources.yml + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + + - task: UseDotNet@2 + inputs: + version: 8.0.x + + - task: AzureCLI@2 + displayName: Publish Using Darc + inputs: + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(System.AccessToken)' diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index c05f65027979..003f7eae0fa5 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 10.0.0 + PackageVersion: 11.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml new file mode 100644 index 000000000000..da22beb3f60c --- /dev/null +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -0,0 +1,34 @@ +parameters: + - name: microbuildTaskInputs + type: object + default: {} + + - name: microbuildEnv + type: object + default: {} + + - name: enablePreviewMicrobuild + type: boolean + default: false + + - name: condition + type: string + + - name: continueOnError + type: boolean + +steps: +- ${{ if eq(parameters.enablePreviewMicrobuild, true) }}: + - task: MicroBuildSigningPluginPreview@4 + displayName: Install Preview MicroBuild plugin + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} +- ${{ else }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin + inputs: ${{ parameters.microbuildTaskInputs }} + env: ${{ parameters.microbuildEnv }} + continueOnError: ${{ parameters.continueOnError }} + condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 553fce66b940..4f4b56ed2a6b 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -4,6 +4,8 @@ parameters: # Enable install tasks for MicroBuild on Mac and Linux # Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT' enableMicrobuildForMacAndLinux: false + # Enable preview version of MB signing plugin + enablePreviewMicrobuild: false # Determines whether the ESRP service connection information should be passed to the signing plugin. # This overlaps with _SignType to some degree. We only need the service connection for real signing. # It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place. @@ -13,6 +15,8 @@ parameters: microbuildUseESRP: true # Microbuild installation directory microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild + # Microbuild version + microbuildPluginVersion: 'latest' continueOnError: false @@ -69,42 +73,46 @@ steps: # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, # we can avoid including the MB install step if not enabled at all. This avoids a bunch of # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) - inputs: - signType: $(_SignType) - zipSources: false - feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ if eq(parameters.microbuildUseESRP, true) }}: - ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' - ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea - ${{ else }}: - ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca - env: - TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} - SYSTEM_ACCESSTOKEN: $(System.AccessToken) - continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) - - - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: - - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (non-Windows) - inputs: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - workingDirectory: ${{ parameters.microBuildOutputFolder }} + version: ${{ parameters.microbuildPluginVersion }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: - ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: - ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc - env: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca + microbuildEnv: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - template: /eng/common/core-templates/steps/install-microbuild-impl.yml@self + parameters: + enablePreviewMicrobuild: ${{ parameters.enablePreviewMicrobuild }} + microbuildTaskInputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + version: ${{ parameters.microbuildPluginVersion }} + workingDirectory: ${{ parameters.microBuildOutputFolder }} + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + microbuildEnv: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index b9c86c18ae42..acf16ed34963 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -24,7 +24,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey '$(dotnetbuilds-internal-container-read-token-base64)'' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index e9a694afa58e..3ad83b8c3075 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250818.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 + sourceIndexUploadPackageVersion: 2.0.0-20250906.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.sourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 8abfb71f7275..9b7eede4e50f 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -72,7 +72,7 @@ __AlpinePackages+=" krb5-dev" __AlpinePackages+=" openssl-dev" __AlpinePackages+=" zlib-dev" -__FreeBSDBase="13.4-RELEASE" +__FreeBSDBase="13.5-RELEASE" __FreeBSDPkg="1.21.3" __FreeBSDABI="13" __FreeBSDPackages="libunwind" @@ -383,7 +383,7 @@ while :; do ;; freebsd14) __CodeName=freebsd - __FreeBSDBase="14.2-RELEASE" + __FreeBSDBase="14.3-RELEASE" __FreeBSDABI="14" __SkipUnmount=1 ;; diff --git a/eng/common/darc-init.sh b/eng/common/darc-init.sh index e889f439b8dc..9f5ad6b763b5 100755 --- a/eng/common/darc-init.sh +++ b/eng/common/darc-init.sh @@ -5,7 +5,7 @@ darcVersion='' versionEndpoint='https://maestro.dot.net/api/assets/darc-version?api-version=2020-02-20' verbosity='minimal' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --darcversion) diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 7b9d97e3bd4d..61f302bb6775 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -18,7 +18,7 @@ architecture='' runtime='dotnet' runtimeSourceFeed='' runtimeSourceFeedKey='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in -version|-v) diff --git a/eng/common/dotnet.sh b/eng/common/dotnet.sh index 2ef68235675f..f6d24871c1d4 100755 --- a/eng/common/dotnet.sh +++ b/eng/common/dotnet.sh @@ -19,7 +19,7 @@ source $scriptroot/tools.sh InitializeDotNetCli true # install # Invoke acquired SDK with args if they are provided -if [[ $# > 0 ]]; then +if [[ $# -gt 0 ]]; then __dotnetDir=${_InitializeDotNetCli} dotnetPath=${__dotnetDir}/dotnet ${dotnetPath} "$@" diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100755 new mode 100644 diff --git a/eng/common/internal-feed-operations.sh b/eng/common/internal-feed-operations.sh index 9378223ba095..6299e7effd4c 100755 --- a/eng/common/internal-feed-operations.sh +++ b/eng/common/internal-feed-operations.sh @@ -100,7 +100,7 @@ operation='' authToken='' repoName='' -while [[ $# > 0 ]]; do +while [[ $# -gt 0 ]]; do opt="$(echo "$1" | tr "[:upper:]" "[:lower:]")" case "$opt" in --operation) diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index 477a44f335be..11f81cbd40d4 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,9 +27,11 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos" ]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio + elif [ "$ID" = "amzn" ]; then + dnf install -y cmake llvm lld lldb clang python libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "alpine" ]; then apk add build-base cmake bash curl clang llvm-dev lld lldb krb5-dev lttng-ust-dev icu-dev openssl-dev pigz cpio else diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index 472d5bb562c9..fc0218a013d1 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -9,7 +9,8 @@ param( [Parameter(Mandatory=$false)][string] $TokensFilePath, [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, - [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey) + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey +) try { $ErrorActionPreference = 'Stop' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a073..18693ea120d5 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bef4affa4a41..f6bde2683794 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - $env:DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we do not need all ASP.NET packages restored. $env:DOTNET_NOLOGO=1 @@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot - Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot @@ -560,19 +556,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0f..6c121300ac7d 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -115,9 +115,6 @@ function InitializeDotNetCli { local install=$1 - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - export DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we want to control all package sources export DOTNET_NOLOGO=1 @@ -166,7 +163,6 @@ function InitializeDotNetCli { # build steps from using anything other than what we've downloaded. Write-PipelinePrependPath -path "$dotnet_root" - Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value diff --git a/global.json b/global.json index ecba0c109058..8482efeac4a4 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally." }, "tools": { - "dotnet": "10.0.102", + "dotnet": "11.0.100-alpha.1.26064.118", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsPackageVersion)" @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26103.116", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26103.116", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26069.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26069.105", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" From 962656c05abac1a24b513d00bfd245a9cde0afc6 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Thu, 26 Feb 2026 10:49:26 -0500 Subject: [PATCH 278/280] Add dependency for Microsoft.Extensions.DependencyInjection.Abstractions --- eng/Version.Details.props | 4 ++++ eng/Version.Details.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 62455eb5a450..b65f3b5842ff 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,6 +142,8 @@ This file should be imported by eng/Versions.props 11.0.0-preview.3.26118.109 2.1.0 + + 11.0.0-preview.3.26118.109 2.2.0-preview.26113.4 4.2.0-preview.26113.4 @@ -285,6 +287,8 @@ This file should be imported by eng/Versions.props $(SystemWindowsExtensionsPackageVersion) $(NETStandardLibraryRefPackageVersion) + + $(MicrosoftExtensionsDependencyInjectionAbstractionsPackageVersion) $(MicrosoftTestingPlatformPackageVersion) $(MSTestPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63afd64257bd..8982c3338809 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -527,6 +527,10 @@ https://github.com/dotnet/dotnet 4c0aa722933ea491006247bbc0a484fa3c28cd14 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 4c0aa722933ea491006247bbc0a484fa3c28cd14 + From 3b13938d42d52b3451cdfdc7b840a06b7749a716 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 4 Mar 2026 17:00:20 -0800 Subject: [PATCH 279/280] Fix build failures: AOT-safe JSON serialization and test field naming - Replace JsonSerializer.Serialize(T, JsonSerializerOptions) with source-generated SlnfJsonSerializerContext in SlnfFileHelper.cs to fix IL2026/IL3050 trim/AOT errors - Replace _testAssetsManager with TestAssetsManager (base class property) in test files Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/Cli/dotnet/SlnfFileHelper.cs | 24 +++++++------------ .../Run/GivenDotnetRunSelectsDevice.cs | 4 ++-- .../Solution/Add/GivenDotnetSlnAdd.cs | 6 ++--- .../Repair/GivenDotnetWorkloadRepair.cs | 2 +- .../Update/GivenDotnetWorkloadUpdate.cs | 2 +- 5 files changed, 15 insertions(+), 23 deletions(-) diff --git a/src/Cli/dotnet/SlnfFileHelper.cs b/src/Cli/dotnet/SlnfFileHelper.cs index 87d93b75d3d5..daa762049fad 100644 --- a/src/Cli/dotnet/SlnfFileHelper.cs +++ b/src/Cli/dotnet/SlnfFileHelper.cs @@ -11,6 +11,10 @@ namespace Microsoft.DotNet.Cli; +[JsonSourceGenerationOptions(WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.Never)] +[JsonSerializable(typeof(SlnfFileHelper.SlnfRoot))] +internal partial class SlnfJsonSerializerContext : JsonSerializerContext; + /// /// Utilities for working with solution filter (.slnf) files /// @@ -41,7 +45,7 @@ public static string NormalizePathSeparatorsToBackslash(string path) return path.Replace(Path.DirectorySeparatorChar, '\\'); } - private class SlnfSolution + internal class SlnfSolution { [JsonPropertyName("path")] public string Path { get; set; } @@ -50,7 +54,7 @@ private class SlnfSolution public List Projects { get; set; } = new(); } - private class SlnfRoot + internal class SlnfRoot { [JsonPropertyName("solution")] public SlnfSolution Solution { get; set; } = new(); @@ -80,13 +84,7 @@ public static void CreateSolutionFilter(string slnfPath, string parentSolutionPa } }; - var options = new JsonSerializerOptions - { - WriteIndented = true, - DefaultIgnoreCondition = JsonIgnoreCondition.Never - }; - - var json = JsonSerializer.Serialize(root, options); + var json = JsonSerializer.Serialize(root, SlnfJsonSerializerContext.Default.SlnfRoot); File.WriteAllText(slnfPath, json); } @@ -119,13 +117,7 @@ public static void SaveSolutionFilter(string slnfPath, string parentSolutionPath } }; - var options = new JsonSerializerOptions - { - WriteIndented = true, - DefaultIgnoreCondition = JsonIgnoreCondition.Never - }; - - var json = JsonSerializer.Serialize(root, options); + var json = JsonSerializer.Serialize(root, SlnfJsonSerializerContext.Default.SlnfRoot); File.WriteAllText(slnfPath, json); } } diff --git a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs index e1dddcc3e98f..df3c68ab5133 100644 --- a/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs +++ b/test/dotnet.Tests/CommandTests/Run/GivenDotnetRunSelectsDevice.cs @@ -380,7 +380,7 @@ public void ItPassesRuntimeIdentifierToDeployToDeviceTarget() [Fact] public void ItPassesEnvironmentVariablesToTargets() { - var testInstance = _testAssetsManager.CopyTestAsset("DotnetRunDevices", identifier: "EnvVarTargets") + var testInstance = TestAssetsManager.CopyTestAsset("DotnetRunDevices", identifier: "EnvVarTargets") .WithSource(); string deviceId = "test-device-1"; @@ -444,7 +444,7 @@ public void ItPassesEnvironmentVariablesToTargets() [Fact] public void ItDoesNotPassEnvironmentVariablesToTargetsWithoutOptIn() { - var testInstance = _testAssetsManager.CopyTestAsset("DotnetRunDevices", identifier: "EnvVarNoOptIn") + var testInstance = TestAssetsManager.CopyTestAsset("DotnetRunDevices", identifier: "EnvVarNoOptIn") .WithSource(); string deviceId = "test-device-1"; diff --git a/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs b/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs index 826d96036c28..8fcb4bedd3d2 100644 --- a/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs +++ b/test/dotnet.Tests/CommandTests/Solution/Add/GivenDotnetSlnAdd.cs @@ -1360,7 +1360,7 @@ private string GetSolutionFileTemplateContents(string templateFileName) [InlineData("solution")] public void WhenAddingProjectToSlnfItAddsOnlyIfInParentSolution(string solutionCommand) { - var projectDirectory = _testAssetsManager + var projectDirectory = TestAssetsManager .CopyTestAsset("TestAppWithSlnfFiles", identifier: $"GivenDotnetSlnAdd-Slnf-{solutionCommand}") .WithSource() .Path; @@ -1384,7 +1384,7 @@ public void WhenAddingProjectToSlnfItAddsOnlyIfInParentSolution(string solutionC [InlineData("solution")] public void WhenRemovingProjectFromSlnfItRemovesSuccessfully(string solutionCommand) { - var projectDirectory = _testAssetsManager + var projectDirectory = TestAssetsManager .CopyTestAsset("TestAppWithSlnfFiles", identifier: $"GivenDotnetSlnAdd-SlnfRemove-{solutionCommand}") .WithSource() .Path; @@ -1408,7 +1408,7 @@ public void WhenRemovingProjectFromSlnfItRemovesSuccessfully(string solutionComm [InlineData("solution")] public void WhenAddingProjectToSlnfWithInRootOptionItErrors(string solutionCommand) { - var projectDirectory = _testAssetsManager + var projectDirectory = TestAssetsManager .CopyTestAsset("TestAppWithSlnfFiles", identifier: $"GivenDotnetSlnAdd-SlnfInRoot-{solutionCommand}") .WithSource() .Path; diff --git a/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs b/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs index 816c7b2732f4..84807718c497 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Repair/GivenDotnetWorkloadRepair.cs @@ -159,7 +159,7 @@ public void GivenMissingPacksRepairFixesInstall(bool userLocal) public void GivenMissingManifestsInWorkloadSetModeRepairReinstallsManifests(bool userLocal) { var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) = - CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(_testAssetsManager, userLocal, out string sdkFeatureVersion); + CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(TestAssetsManager, userLocal, out string sdkFeatureVersion); mockInstaller.InstalledManifests.Should().HaveCount(0); diff --git a/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs b/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs index 92005bdb2862..c1f24f283207 100644 --- a/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs +++ b/test/dotnet.Tests/CommandTests/Workload/Update/GivenDotnetWorkloadUpdate.cs @@ -667,7 +667,7 @@ public void GivenInvalidVersionInRollbackFileItErrors() public void GivenMissingManifestsInWorkloadSetModeUpdateReinstallsManifests(bool userLocal) { var (dotnetRoot, userProfileDir, mockInstaller, workloadResolver, manifestProvider) = - CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(_testAssetsManager, userLocal, out string sdkFeatureVersion); + CorruptWorkloadSetTestHelper.SetupCorruptWorkloadSet(TestAssetsManager, userLocal, out string sdkFeatureVersion); mockInstaller.InstalledManifests.Should().HaveCount(0); From ae11697dd4476043c75189aee0639ac504b1c250 Mon Sep 17 00:00:00 2001 From: "Donna Chen (BEYONDSOFT CONSULTING INC)" Date: Thu, 5 Mar 2026 17:02:06 +0800 Subject: [PATCH 280/280] Update Microsoft.Extensions.DependencyInjection.Abstractions Version --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fdcab6bd5cc5..304cd05ad70e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -143,7 +143,7 @@ This file should be imported by eng/Versions.props 2.1.0 - 11.0.0-preview.3.26118.109 + 11.0.0-preview.3.26152.106 2.2.0-preview.26154.1 4.2.0-preview.26154.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dde1ee48815..2af70bc94bdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -527,7 +527,7 @@ https://github.com/dotnet/dotnet 5507d7a2f05bb6c073a055ead6ce1c4bbe396cda - + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 4c0aa722933ea491006247bbc0a484fa3c28cd14