From 70e77880f54079b1312cbaa50bbacde7b42fb992 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Wed, 22 Jun 2022 12:44:54 +0300 Subject: [PATCH] Avalonia.SourceGenerator -> DevGenerators --- Avalonia.sln | 13 +++++++------ build/SourceGenerators.props | 2 +- .../CompositionRoslynGenerator.cs | 0 .../DevGenerators}/CompositionGenerator/Config.cs | 0 .../CompositionGenerator/Extensions.cs | 0 .../Generator.KeyFrameAnimation.cs | 0 .../CompositionGenerator/Generator.ListProxy.cs | 0 .../CompositionGenerator/Generator.Utils.cs | 0 .../CompositionGenerator/Generator.cs | 0 .../ICompositionGeneratorSink.cs | 0 .../RoslynCompositionGeneratorSink.cs | 0 .../DevGenerators/DevGenerators.csproj} | 2 +- .../DevGenerators}/IsExternalInit.cs | 0 .../DevGenerators}/SubtypesFactoryGenerator.cs | 0 14 files changed, 9 insertions(+), 8 deletions(-) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/CompositionRoslynGenerator.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/Config.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/Extensions.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/Generator.KeyFrameAnimation.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/Generator.ListProxy.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/Generator.Utils.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/Generator.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/ICompositionGeneratorSink.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/CompositionGenerator/RoslynCompositionGeneratorSink.cs (100%) rename src/{Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj => tools/DevGenerators/DevGenerators.csproj} (89%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/IsExternalInit.cs (100%) rename src/{Avalonia.SourceGenerator => tools/DevGenerators}/SubtypesFactoryGenerator.cs (100%) diff --git a/Avalonia.sln b/Avalonia.sln index 25c7daf080..d3dce17e02 100644 --- a/Avalonia.sln +++ b/Avalonia.sln @@ -205,14 +205,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlSamples", "samples\S EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ControlCatalog.iOS", "samples\ControlCatalog.iOS\ControlCatalog.iOS.csproj", "{70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.SourceGenerator", "src\Avalonia.SourceGenerator\Avalonia.SourceGenerator.csproj", "{CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevAnalyzers", "src\tools\DevAnalyzers\DevAnalyzers.csproj", "{2B390431-288C-435C-BB6B-A374033BD8D1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.Controls.ColorPicker", "src\Avalonia.Controls.ColorPicker\Avalonia.Controls.ColorPicker.csproj", "{7BF6C69D-FC14-43EB-9ED0-782C16F3D5D9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.DesignerSupport.Tests", "tests\Avalonia.DesignerSupport.Tests\Avalonia.DesignerSupport.Tests.csproj", "{EABE2161-989B-42BF-BD8D-1E34B20C21F1}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DevGenerators", "src\tools\DevGenerators\DevGenerators.csproj", "{1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -485,10 +485,6 @@ Global {70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Debug|Any CPU.Build.0 = Debug|Any CPU {70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.ActiveCfg = Release|Any CPU {70B9F5CC-E2F9-4314-9514-EDE762ACCC4B}.Release|Any CPU.Build.0 = Release|Any CPU - {CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA932DF3-2616-4BF6-8F28-1AD0EC40F1FF}.Release|Any CPU.Build.0 = Release|Any CPU {2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2B390431-288C-435C-BB6B-A374033BD8D1}.Debug|Any CPU.Build.0 = Debug|Any CPU {2B390431-288C-435C-BB6B-A374033BD8D1}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -501,6 +497,10 @@ Global {EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.ActiveCfg = Release|Any CPU {EABE2161-989B-42BF-BD8D-1E34B20C21F1}.Release|Any CPU.Build.0 = Release|Any CPU + {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -557,6 +557,7 @@ Global {70B9F5CC-E2F9-4314-9514-EDE762ACCC4B} = {9B9E3891-2366-4253-A952-D08BCEB71098} {2B390431-288C-435C-BB6B-A374033BD8D1} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637} {EABE2161-989B-42BF-BD8D-1E34B20C21F1} = {C5A00AC3-B34C-4564-9BDD-2DA473EF4D8B} + {1BBFAD42-B99E-47E0-B00A-A4BC6B6BB4BB} = {4ED8B739-6F4E-4CD4-B993-545E6B5CE637} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {87366D66-1391-4D90-8999-95A620AD786A} diff --git a/build/SourceGenerators.props b/build/SourceGenerators.props index d000af1bf6..4929578b60 100644 --- a/build/SourceGenerators.props +++ b/build/SourceGenerators.props @@ -1,7 +1,7 @@ diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/CompositionRoslynGenerator.cs b/src/tools/DevGenerators/CompositionGenerator/CompositionRoslynGenerator.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/CompositionRoslynGenerator.cs rename to src/tools/DevGenerators/CompositionGenerator/CompositionRoslynGenerator.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/Config.cs b/src/tools/DevGenerators/CompositionGenerator/Config.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/Config.cs rename to src/tools/DevGenerators/CompositionGenerator/Config.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/Extensions.cs b/src/tools/DevGenerators/CompositionGenerator/Extensions.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/Extensions.cs rename to src/tools/DevGenerators/CompositionGenerator/Extensions.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/Generator.KeyFrameAnimation.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/Generator.KeyFrameAnimation.cs rename to src/tools/DevGenerators/CompositionGenerator/Generator.KeyFrameAnimation.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/Generator.ListProxy.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/Generator.ListProxy.cs rename to src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/Generator.Utils.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/Generator.Utils.cs rename to src/tools/DevGenerators/CompositionGenerator/Generator.Utils.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/Generator.cs rename to src/tools/DevGenerators/CompositionGenerator/Generator.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/ICompositionGeneratorSink.cs b/src/tools/DevGenerators/CompositionGenerator/ICompositionGeneratorSink.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/ICompositionGeneratorSink.cs rename to src/tools/DevGenerators/CompositionGenerator/ICompositionGeneratorSink.cs diff --git a/src/Avalonia.SourceGenerator/CompositionGenerator/RoslynCompositionGeneratorSink.cs b/src/tools/DevGenerators/CompositionGenerator/RoslynCompositionGeneratorSink.cs similarity index 100% rename from src/Avalonia.SourceGenerator/CompositionGenerator/RoslynCompositionGeneratorSink.cs rename to src/tools/DevGenerators/CompositionGenerator/RoslynCompositionGeneratorSink.cs diff --git a/src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj b/src/tools/DevGenerators/DevGenerators.csproj similarity index 89% rename from src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj rename to src/tools/DevGenerators/DevGenerators.csproj index 3312f7a619..04ab33bf9e 100644 --- a/src/Avalonia.SourceGenerator/Avalonia.SourceGenerator.csproj +++ b/src/tools/DevGenerators/DevGenerators.csproj @@ -12,7 +12,7 @@ all - + diff --git a/src/Avalonia.SourceGenerator/IsExternalInit.cs b/src/tools/DevGenerators/IsExternalInit.cs similarity index 100% rename from src/Avalonia.SourceGenerator/IsExternalInit.cs rename to src/tools/DevGenerators/IsExternalInit.cs diff --git a/src/Avalonia.SourceGenerator/SubtypesFactoryGenerator.cs b/src/tools/DevGenerators/SubtypesFactoryGenerator.cs similarity index 100% rename from src/Avalonia.SourceGenerator/SubtypesFactoryGenerator.cs rename to src/tools/DevGenerators/SubtypesFactoryGenerator.cs