From 5284668491b08098d80d13843af4d18d8d622c74 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Tue, 4 May 2021 09:55:27 -0700 Subject: [PATCH 1/2] Move Logging Generator and LoggerMessageAttribute to Logging.Abstractions Fixes: #52222 --- .../gen/DiagnosticDescriptors.cs | 0 .../gen/LoggerMessageGenerator.Emitter.cs | 0 .../gen/LoggerMessageGenerator.Parser.cs | 0 .../gen/LoggerMessageGenerator.cs | 0 .../gen/Microsoft.Extensions.Logging.Generators.csproj | 0 .../gen/Resources/Strings.resx | 0 .../gen/Resources/xlf/Strings.cs.xlf | 0 .../gen/Resources/xlf/Strings.de.xlf | 0 .../gen/Resources/xlf/Strings.es.xlf | 0 .../gen/Resources/xlf/Strings.fr.xlf | 0 .../gen/Resources/xlf/Strings.it.xlf | 0 .../gen/Resources/xlf/Strings.ja.xlf | 0 .../gen/Resources/xlf/Strings.ko.xlf | 0 .../gen/Resources/xlf/Strings.pl.xlf | 0 .../gen/Resources/xlf/Strings.pt-BR.xlf | 0 .../gen/Resources/xlf/Strings.ru.xlf | 0 .../gen/Resources/xlf/Strings.tr.xlf | 0 .../gen/Resources/xlf/Strings.zh-Hans.xlf | 0 .../gen/Resources/xlf/Strings.zh-Hant.xlf | 0 .../Microsoft.Extensions.Logging.Abstractions.pkgproj | 1 + .../ref/Microsoft.Extensions.Logging.Abstractions.cs | 9 +++++++++ .../src/LoggerMessageAttribute.cs | 0 .../Baselines/TestWithDynamicLogLevel.generated.txt | 0 .../Baselines/TestWithMoreThan6Params.generated.txt | 0 .../Baselines/TestWithTwoParams.generated.txt | 0 .../LoggerMessageGeneratedCodeTests.cs | 0 .../LoggerMessageGeneratorEmitterTests.cs | 0 .../LoggerMessageGeneratorParserTests.cs | 0 .../Microsoft.Extensions.Logging.Generators.Tests.csproj | 0 .../MockLogger.cs | 0 .../TestClasses/ArgTestExtensions.cs | 0 .../TestClasses/CollectionTestExtensions.cs | 0 .../TestClasses/EnumerableTestExtensions.cs | 0 .../TestClasses/EventNameTestExtensions.cs | 0 .../TestClasses/ExceptionTestExtensions.cs | 0 .../TestClasses/LevelTestExtensions.cs | 0 .../TestClasses/MessageTestExtensions.cs | 0 .../TestClasses/MiscTestExtensions.cs | 0 .../TestClasses/README.md | 0 .../TestClasses/SignatureTestExtensions.cs | 0 .../TestClasses/TemplateTestExtensions.cs | 0 .../TestClasses/TestInstances.cs | 0 .../pkg/Microsoft.Extensions.Logging.pkgproj | 1 - .../ref/Microsoft.Extensions.Logging.cs | 9 --------- 44 files changed, 10 insertions(+), 10 deletions(-) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/DiagnosticDescriptors.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/LoggerMessageGenerator.Emitter.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/LoggerMessageGenerator.Parser.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/LoggerMessageGenerator.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Microsoft.Extensions.Logging.Generators.csproj (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/Strings.resx (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.cs.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.de.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.es.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.fr.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.it.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.ja.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.ko.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.pl.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.pt-BR.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.ru.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.tr.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.zh-Hans.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/gen/Resources/xlf/Strings.zh-Hant.xlf (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/src/LoggerMessageAttribute.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorEmitterTests.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/MockLogger.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ArgTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/CollectionTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EnumerableTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EventNameTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MessageTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MiscTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/README.md (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/SignatureTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TemplateTestExtensions.cs (100%) rename src/libraries/{Microsoft.Extensions.Logging => Microsoft.Extensions.Logging.Abstractions}/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TestInstances.cs (100%) diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/DiagnosticDescriptors.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/DiagnosticDescriptors.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/DiagnosticDescriptors.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/DiagnosticDescriptors.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/LoggerMessageGenerator.Emitter.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/LoggerMessageGenerator.Emitter.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Emitter.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/LoggerMessageGenerator.Parser.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/LoggerMessageGenerator.Parser.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.Parser.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/LoggerMessageGenerator.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/LoggerMessageGenerator.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/LoggerMessageGenerator.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Microsoft.Extensions.Logging.Generators.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.csproj similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Microsoft.Extensions.Logging.Generators.csproj rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Microsoft.Extensions.Logging.Generators.csproj diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/Strings.resx b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/Strings.resx rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/Strings.resx diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.cs.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.cs.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.cs.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.de.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.de.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.de.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.es.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.es.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.es.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.fr.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.fr.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.fr.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.it.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.it.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.it.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.ja.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.ja.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ja.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.ko.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.ko.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ko.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.pl.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.pl.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pl.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.pt-BR.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.pt-BR.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.pt-BR.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.ru.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.ru.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.ru.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.tr.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.tr.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.tr.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.zh-Hans.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.zh-Hans.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hans.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.zh-Hant.xlf b/src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/gen/Resources/xlf/Strings.zh-Hant.xlf rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/gen/Resources/xlf/Strings.zh-Hant.xlf diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj index 748c29f6212db4..6b854423d7afe9 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/pkg/Microsoft.Extensions.Logging.Abstractions.pkgproj @@ -4,6 +4,7 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) + \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs index a1051db9b0189f..60c0cd253078ea 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/ref/Microsoft.Extensions.Logging.Abstractions.cs @@ -115,6 +115,15 @@ public static partial class LoggerMessage public static System.Action Define(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, string formatString) { throw null; } public static System.Action Define(Microsoft.Extensions.Logging.LogLevel logLevel, Microsoft.Extensions.Logging.EventId eventId, string formatString, bool skipEnabledCheck) { throw null; } } + [System.AttributeUsageAttribute(System.AttributeTargets.Method)] + public sealed partial class LoggerMessageAttribute : System.Attribute + { + public LoggerMessageAttribute() { } + public int EventId { get { throw null; } set { } } + public string? EventName { get { throw null; } set { } } + public Microsoft.Extensions.Logging.LogLevel Level { get { throw null; } set { } } + public string Message { get { throw null; } set { } } + } public partial class Logger : Microsoft.Extensions.Logging.ILogger, Microsoft.Extensions.Logging.ILogger { public Logger(Microsoft.Extensions.Logging.ILoggerFactory factory) { } diff --git a/src/libraries/Microsoft.Extensions.Logging/src/LoggerMessageAttribute.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessageAttribute.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/src/LoggerMessageAttribute.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/src/LoggerMessageAttribute.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithDynamicLogLevel.generated.txt diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithMoreThan6Params.generated.txt diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Baselines/TestWithTwoParams.generated.txt diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratedCodeTests.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorEmitterTests.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorEmitterTests.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorEmitterTests.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorEmitterTests.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/LoggerMessageGeneratorParserTests.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/MockLogger.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/MockLogger.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/MockLogger.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/MockLogger.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ArgTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ArgTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ArgTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ArgTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/CollectionTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/CollectionTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/CollectionTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/CollectionTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EnumerableTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EnumerableTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EnumerableTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EnumerableTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EventNameTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EventNameTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EventNameTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/EventNameTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/ExceptionTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/LevelTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MessageTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MessageTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MessageTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MessageTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MiscTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MiscTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MiscTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/MiscTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/README.md b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/README.md similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/README.md rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/README.md diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/SignatureTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/SignatureTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/SignatureTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/SignatureTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TemplateTestExtensions.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TemplateTestExtensions.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TemplateTestExtensions.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TemplateTestExtensions.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TestInstances.cs b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TestInstances.cs similarity index 100% rename from src/libraries/Microsoft.Extensions.Logging/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TestInstances.cs rename to src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/TestClasses/TestInstances.cs diff --git a/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj b/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj index 5180cb122482f8..b1aeb27796364a 100644 --- a/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj +++ b/src/libraries/Microsoft.Extensions.Logging/pkg/Microsoft.Extensions.Logging.pkgproj @@ -4,7 +4,6 @@ net461;netcoreapp2.0;uap10.0.16299;$(AllXamarinFrameworks) - \ No newline at end of file diff --git a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs index a81c21d01f68b8..7e6691af11bca1 100644 --- a/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs +++ b/src/libraries/Microsoft.Extensions.Logging/ref/Microsoft.Extensions.Logging.cs @@ -85,15 +85,6 @@ public LoggerFilterRule(string providerName, string categoryName, Microsoft.Exte public string ProviderName { get { throw null; } } public override string ToString() { throw null; } } - [System.AttributeUsageAttribute(System.AttributeTargets.Method)] - public sealed partial class LoggerMessageAttribute : System.Attribute - { - public LoggerMessageAttribute() { } - public int EventId { get { throw null; } set { } } - public string? EventName { get { throw null; } set { } } - public Microsoft.Extensions.Logging.LogLevel Level { get { throw null; } set { } } - public string Message { get { throw null; } set { } } - } public static partial class LoggingBuilderExtensions { public static Microsoft.Extensions.Logging.ILoggingBuilder AddProvider(this Microsoft.Extensions.Logging.ILoggingBuilder builder, Microsoft.Extensions.Logging.ILoggerProvider provider) { throw null; } From 2814f8912c05019c1d1b161e0201eda3f7fc8e69 Mon Sep 17 00:00:00 2001 From: Maryam Ariyan Date: Tue, 4 May 2021 10:38:51 -0700 Subject: [PATCH 2/2] leftover change --- .../Microsoft.Extensions.Logging.Generators.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj index 329b67c2a16a4c..1e837898edb969 100644 --- a/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj +++ b/src/libraries/Microsoft.Extensions.Logging.Abstractions/tests/Microsoft.Extensions.Logging.Generators.Tests/Microsoft.Extensions.Logging.Generators.Tests.csproj @@ -13,7 +13,7 @@ - +