From 00be70f1872523deda7b697127540fcf2f493725 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 12:52:53 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/templating build 20230117.3 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23067.3 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5d37a38e943..c2b5caca3490 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - b1fcea318f07681249f4d9ac33005eb99e77adb1 + 3b7bc2c69f41dd5205b850632b0f76c457254010 diff --git a/eng/Versions.props b/eng/Versions.props index c5127a08d9b1..b26440892ee9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.1 + 8.0.100-alpha.1.23067.3 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 52ab2d2bb14a8a122599b66aa224d786e8c57228 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 15:16:08 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/templating build 20230117.4 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23067.4 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2b5caca3490..80c3b16f80e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 3b7bc2c69f41dd5205b850632b0f76c457254010 + 67bfb7aab4839c2762cef6375d85208710cc608a diff --git a/eng/Versions.props b/eng/Versions.props index b26440892ee9..d7cebfe8bee4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.3 + 8.0.100-alpha.1.23067.4 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 9a81d8decc13982ee7e63e1048569356f256625e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 16:45:17 +0000 Subject: [PATCH 03/11] Update dependencies from https://github.com/dotnet/templating build 20230117.5 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23067.5 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c3b16f80e7..2fa6412e15cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 67bfb7aab4839c2762cef6375d85208710cc608a + 3dcef8e798aae1966a8967e1dda3872c13a8f096 diff --git a/eng/Versions.props b/eng/Versions.props index d7cebfe8bee4..ec5cf6abfcaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.4 + 8.0.100-alpha.1.23067.5 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 516215ca8329ab1372ef47596b086f61f7ed5dcf Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Jan 2023 18:15:41 +0100 Subject: [PATCH 04/11] Remove obsolete members --- .../CliTemplateEngineHost.cs | 28 ------------------- 1 file changed, 28 deletions(-) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs index d278ccde493f..5cfa73e328fa 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs @@ -82,33 +82,5 @@ public override bool TryGetHostParamDefault(string paramName, out string? value) return base.TryGetHostParamDefault(paramName, out value); } } - - [Obsolete("Use " + nameof(Logger) + " instead")] - void ITemplateEngineHost.LogDiagnosticMessage(string message, string category, params string[] details) - { - //do nothing if used - //DefaultTemplateEngineHost may log these messages to Console - } - - [Obsolete("Use " + nameof(Logger) + " instead")] - void ITemplateEngineHost.LogTiming(string label, TimeSpan duration, int depth) - { - //do nothing if used - //DefaultTemplateEngineHost may log these messages to Console - } - - [Obsolete("Use " + nameof(Logger) + " instead")] - void ITemplateEngineHost.LogMessage(string message) - { - //do nothing if used - //DefaultTemplateEngineHost may log these messages to Console - } - - [Obsolete("Use CreationStatusResult instead")] - bool ITemplateEngineHost.OnPotentiallyDestructiveChangesDetected(IReadOnlyList changes, IReadOnlyList destructiveChanges) - { - //return false to return TemplateCreationResult with CreationResultStatus.DestructiveChangesDetected status. - return false; - } } } From fba25f5c7bf811ef01df5c52075d03636d7ab40a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 17 Jan 2023 18:39:28 +0100 Subject: [PATCH 05/11] React to obsolete members being removed --- .../CliTestHostFactory.cs | 52 ------------------- 1 file changed, 52 deletions(-) diff --git a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs index ebd53d189278..6df31217536a 100644 --- a/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs +++ b/src/Tests/Microsoft.TemplateEngine.Cli.UnitTests/CliTestHostFactory.cs @@ -113,64 +113,12 @@ public void Dispose() #region Obsolete methods #pragma warning disable CA1041 // Provide ObsoleteAttribute message - [Obsolete] - void ITemplateEngineHost.OnSymbolUsed(string symbol, object value) - { - //do nothing - } - - [Obsolete] - bool ITemplateEngineHost.OnParameterError(ITemplateParameter parameter, string receivedValue, string message, out string newValue) - { - //do nothing - newValue = receivedValue; - return false; - } - - [Obsolete] - bool ITemplateEngineHost.OnNonCriticalError(string code, string message, string currentFile, long currentPosition) - { - //do nothing - return false; - } - - [Obsolete] - void ITemplateEngineHost.OnCriticalError(string code, string message, string currentFile, long currentPosition) - { - //do nothing - } - - [Obsolete] - void ITemplateEngineHost.LogMessage(string message) - { - //do nothing - } - [Obsolete] bool ITemplateEngineHost.OnPotentiallyDestructiveChangesDetected(IReadOnlyList changes, IReadOnlyList destructiveChanges) { //do nothing return false; } - - [Obsolete] - bool ITemplateEngineHost.OnConfirmPartialMatch(string name) - { - //do nothing - return false; - } - - [Obsolete] - void ITemplateEngineHost.LogDiagnosticMessage(string message, string category, params string[] details) - { - //do nothing - } - - [Obsolete] - void ITemplateEngineHost.LogTiming(string label, TimeSpan duration, int depth) - { - //do nothing - } #pragma warning restore CA1041 // Provide ObsoleteAttribute message #endregion } From 3156f783c07605eeeb5c3558c375f7517f23a2dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 18:26:05 +0000 Subject: [PATCH 06/11] Update dependencies from https://github.com/dotnet/templating build 20230117.6 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23067.6 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fa6412e15cb..11f5a7c722ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 3dcef8e798aae1966a8967e1dda3872c13a8f096 + ba8a96bf2984c2fe49d107b071528ea9abbc12e0 diff --git a/eng/Versions.props b/eng/Versions.props index ec5cf6abfcaf..bdb1a13719fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.5 + 8.0.100-alpha.1.23067.6 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 289b1b60858c2ed88d62415c9e7a78ebd715c54f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 19:44:16 +0000 Subject: [PATCH 07/11] Update dependencies from https://github.com/dotnet/templating build 20230117.7 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23067.7 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11f5a7c722ad..30715912025a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - ba8a96bf2984c2fe49d107b071528ea9abbc12e0 + a63559eedc6ce243a372b9640aba720de5f14681 diff --git a/eng/Versions.props b/eng/Versions.props index bdb1a13719fa..cb12c7278024 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.6 + 8.0.100-alpha.1.23067.7 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From c17d6915806699317220a7268824c60a0f46a8a0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jan 2023 10:34:02 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/templating build 20230118.1 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23068.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30715912025a..a5ff1783e56d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - a63559eedc6ce243a372b9640aba720de5f14681 + 3481f68bbca448704394c493bc82c106109f4fb5 diff --git a/eng/Versions.props b/eng/Versions.props index cb12c7278024..2d4039d7ff06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23067.7 + 8.0.100-alpha.1.23068.1 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From 1b476bf04fe2fb9c1952f165d4c7090eba7a27e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jan 2023 12:48:14 +0000 Subject: [PATCH 09/11] Update dependencies from https://github.com/dotnet/templating build 20230118.2 Microsoft.TemplateEngine.Abstractions From Version 8.0.100-alpha.1.23067.1 -> To Version 8.0.100-alpha.1.23068.2 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5ff1783e56d..c776f31b95fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,9 +1,9 @@ - + https://github.com/dotnet/templating - 3481f68bbca448704394c493bc82c106109f4fb5 + 4827cbc295e50af2f7162172e81514ad3b671bf0 diff --git a/eng/Versions.props b/eng/Versions.props index 2d4039d7ff06..4efa95130a45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 8.0.100-alpha.1.23068.1 + 8.0.100-alpha.1.23068.2 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) From e03645c8e86911bffc704e2b5b1eea3a57066998 Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Wed, 18 Jan 2023 13:54:42 +0100 Subject: [PATCH 10/11] return missed OnPotentiallyDestructiveChangesDetected --- .../Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs index 5cfa73e328fa..1992623aef22 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/CliTemplateEngineHost.cs @@ -82,5 +82,12 @@ public override bool TryGetHostParamDefault(string paramName, out string? value) return base.TryGetHostParamDefault(paramName, out value); } } + + [Obsolete("Use CreationStatusResult instead")] + bool ITemplateEngineHost.OnPotentiallyDestructiveChangesDetected(IReadOnlyList changes, IReadOnlyList destructiveChanges) + { + //return false to return TemplateCreationResult with CreationResultStatus.DestructiveChangesDetected status. + return false; + } } } From af3fd4a76f5700cfc3ff039d7158a06eaefe08ef Mon Sep 17 00:00:00 2001 From: YuliiaKovalova Date: Wed, 18 Jan 2023 14:41:12 +0100 Subject: [PATCH 11/11] try to bump FluentAssertions --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4efa95130a45..56191ac381f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -185,7 +185,7 @@ - 6.8.0 + 6.9.0 6.1.0 8.0.0-beta.23054.2 4.8.2