From bf47eb01b55f574f567e369628fa9ecfc17650c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 May 2025 03:34:27 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/templating build 20250514.5 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.117-servicing.25257.13 -> To Version 8.0.117-servicing.25264.5 --- NuGet.config | 43 ++++++++++++++++++++++++++++++++++++++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 293368b60c30..d7716656b133 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,26 +4,50 @@ + + + + + + + + + + + + + + + + + + + + - + + + + + @@ -48,18 +72,35 @@ + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5dad628aa842..91b939d4c9e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - dde824a1cac39339d38c5660b494c667c69aa7df + c7d33c95b7fb11e99d06971c12d6814972adbe86 - + https://github.com/dotnet/templating - dde824a1cac39339d38c5660b494c667c69aa7df + c7d33c95b7fb11e99d06971c12d6814972adbe86 - + https://github.com/dotnet/templating - dde824a1cac39339d38c5660b494c667c69aa7df + c7d33c95b7fb11e99d06971c12d6814972adbe86 diff --git a/eng/Versions.props b/eng/Versions.props index 1bb36909b4ac..5239bed73ca0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.117-servicing.25257.13 + 8.0.117-servicing.25264.5 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 8bf9a2fa048878f5945b1bb6cc52fb3a1d97e5fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 May 2025 02:02:28 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20250514.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25263.4 -> To Version 8.0.0-beta.25264.2 --- 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 91b939d4c9e2..daefc4ee1c74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 20ab70a74d52b68f4271bd946884e24049b14f83 + 983d15077d88cfed26837e40e8f984fdee5d1715 - + https://github.com/dotnet/arcade - 20ab70a74d52b68f4271bd946884e24049b14f83 + 983d15077d88cfed26837e40e8f984fdee5d1715 - + https://github.com/dotnet/arcade - 20ab70a74d52b68f4271bd946884e24049b14f83 + 983d15077d88cfed26837e40e8f984fdee5d1715 - + https://github.com/dotnet/arcade - 20ab70a74d52b68f4271bd946884e24049b14f83 + 983d15077d88cfed26837e40e8f984fdee5d1715 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5239bed73ca0..68d0834dff1c 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.25263.4 + 8.0.0-beta.25264.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25263.4 + 8.0.0-beta.25264.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 57ff36c0131b..76babd5acaf9 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25263.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25263.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25264.2" } } From 30b71aba56af246e43195df958f3e5b876fde0b1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 16 May 2025 09:03:04 -0700 Subject: [PATCH 3/6] Update branding to 8.0.314 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a8b359e03bbe..6a9140abb6a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.313 + 8.0.314 8.0.300 true From 1eb61fe56c261ea365aaa7109e93b87a4a6ea856 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 May 2025 02:02:37 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/templating build 20250516.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.313-servicing.25264.1 -> To Version 8.0.314-servicing.25266.2 --- 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 f9af6adc0392..71d309819c55 100644 --- a/NuGet.config +++ b/NuGet.config @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad1532e01393..f3bc90532b74 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - d8a5bd5be4cdd1e018220cd8d836bec7d10d6ada + 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa - + https://github.com/dotnet/templating - d8a5bd5be4cdd1e018220cd8d836bec7d10d6ada + 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa - + https://github.com/dotnet/templating - d8a5bd5be4cdd1e018220cd8d836bec7d10d6ada + 99e2f2e1cbdc89187f45851e09adeb4d3a7483fa diff --git a/eng/Versions.props b/eng/Versions.props index 6a9140abb6a9..2c93bdd36e25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,13 +141,13 @@ - 8.0.313 + 8.0.314 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.313-servicing.25264.1 + 8.0.314-servicing.25266.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From b3ec429f53ca16683582e6406d97fc997d0b2142 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 26 May 2025 23:02:22 -0700 Subject: [PATCH 5/6] Fix minimum width of Author column in tabular output --- .../TemplateSearch/CliTemplateSearchCoordinator.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs index 13f7c996be91..9bb858400cf5 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateSearch/CliTemplateSearchCoordinator.cs @@ -190,7 +190,7 @@ private static void DisplayResultsForPack( .ThenBy(d => d.TemplateGroupInfo.Name, StringComparer.CurrentCultureIgnoreCase)) .DefineColumn(r => r.TemplateGroupInfo.Name, out object? nameColumn, LocalizableStrings.ColumnNameTemplateName, showAlways: true, shrinkIfNeeded: true, minWidth: 15) .DefineColumn(r => r.TemplateGroupInfo.ShortNames, LocalizableStrings.ColumnNameShortName, showAlways: true) - .DefineColumn(r => r.TemplateGroupInfo.Author, LocalizableStrings.ColumnNameAuthor, TabularOutputSettings.ColumnNames.Author, defaultColumn: false, shrinkIfNeeded: true, minWidth: 10) + .DefineColumn(r => r.TemplateGroupInfo.Author, LocalizableStrings.ColumnNameAuthor, TabularOutputSettings.ColumnNames.Author, defaultColumn: false, shrinkIfNeeded: true, minWidth: 12) .DefineColumn(r => r.TemplateGroupInfo.Languages, LocalizableStrings.ColumnNameLanguage, TabularOutputSettings.ColumnNames.Language, defaultColumn: true) .DefineColumn(r => r.TemplateGroupInfo.Type, LocalizableStrings.ColumnNameType, TabularOutputSettings.ColumnNames.Type, defaultColumn: false) .DefineColumn(r => r.TemplateGroupInfo.Classifications, LocalizableStrings.ColumnNameTags, TabularOutputSettings.ColumnNames.Tags, defaultColumn: false, shrinkIfNeeded: true, minWidth: 10) From ef24b5843917a2f2209446d43ce6423ca084ed00 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 4 Jun 2025 09:22:23 -0700 Subject: [PATCH 6/6] Update branding to 8.0.315 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c93bdd36e25..eebe6709256a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.314 + 8.0.315 8.0.300 true