diff --git a/DependencyInjection.Attributed.sln b/DependencyInjection.sln similarity index 81% rename from DependencyInjection.Attributed.sln rename to DependencyInjection.sln index b502d97..a8dd488 100644 --- a/DependencyInjection.Attributed.sln +++ b/DependencyInjection.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.32916.344 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Attributed", "src\DependencyInjection.Attributed\Attributed.csproj", "{9DF192DF-0330-4B82-81C5-B8E7B4D53E41}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection", "src\DependencyInjection\DependencyInjection.csproj", "{9DF192DF-0330-4B82-81C5-B8E7B4D53E41}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Attributed.Tests", "src\DependencyInjection.Attributed.Tests\Attributed.Tests.csproj", "{F2E67084-FED3-4E17-A012-0E8948FD3E06}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection.Tests", "src\DependencyInjection.Tests\DependencyInjection.Tests.csproj", "{F2E67084-FED3-4E17-A012-0E8948FD3E06}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeAnalysis.Tests", "src\CodeAnalysis.Tests\CodeAnalysis.Tests.csproj", "{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}" EndProject @@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library2", "src\Samples\Lib EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\Samples\ConsoleApp\ConsoleApp.csproj", "{26EF99DB-D846-4F65-929D-D7E3E820423A}" EndProject +Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Attributed", "src\Attributed\Attributed.msbuildproj", "{1E68517F-34E7-415E-91B1-857802ED5592}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -47,6 +49,10 @@ Global {26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.Build.0 = Debug|Any CPU {26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.ActiveCfg = Release|Any CPU {26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.Build.0 = Release|Any CPU + {1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E68517F-34E7-415E-91B1-857802ED5592}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E68517F-34E7-415E-91B1-857802ED5592}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Attributed/Attributed.msbuildproj b/src/Attributed/Attributed.msbuildproj new file mode 100644 index 0000000..ba7ddb4 --- /dev/null +++ b/src/Attributed/Attributed.msbuildproj @@ -0,0 +1,18 @@ + + + + net6.0 + Devlooped.Extensions.DependencyInjection.Attributed + Superseded by Devlooped.Extensions.DependencyInjection + 2.1.0 + + + + + + + + + + + diff --git a/src/Attributed/readme.md b/src/Attributed/readme.md new file mode 100644 index 0000000..215a679 --- /dev/null +++ b/src/Attributed/readme.md @@ -0,0 +1,4 @@ +# Obsolete + +This package now just references [Devlooped.Extensions.DependencyInjection](http://nuget.org/packages/Devlooped.Extensions.DependencyInjection) +which contains all its functionality and more. \ No newline at end of file diff --git a/src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs b/src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs index d307d60..eed2ae3 100644 --- a/src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs +++ b/src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs @@ -4,14 +4,14 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using Devlooped.Extensions.DependencyInjection.Attributed; +using Devlooped.Extensions.DependencyInjection; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Testing; using Xunit; using Xunit.Abstractions; -using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest; -using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier; +using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest; +using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier; namespace Tests.CodeAnalysis; diff --git a/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj b/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj index f01ce1f..f5d0c12 100644 --- a/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj +++ b/src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj @@ -17,9 +17,9 @@ - + - + diff --git a/src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs b/src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs index 7628b7d..9ba1542 100644 --- a/src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs +++ b/src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs @@ -4,14 +4,14 @@ using System.IO; using System.Linq; using System.Threading.Tasks; -using Devlooped.Extensions.DependencyInjection.Attributed; +using Devlooped.Extensions.DependencyInjection; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.CSharp.Testing; using Microsoft.CodeAnalysis.Testing; using Xunit; using Xunit.Abstractions; -using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest; -using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier; +using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest; +using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier; namespace Tests.CodeAnalysis; diff --git a/src/DependencyInjection.Attributed.Tests/ComponentModelTests.cs b/src/DependencyInjection.Tests/ComponentModelTests.cs similarity index 100% rename from src/DependencyInjection.Attributed.Tests/ComponentModelTests.cs rename to src/DependencyInjection.Tests/ComponentModelTests.cs diff --git a/src/DependencyInjection.Attributed.Tests/CompositionTests.cs b/src/DependencyInjection.Tests/CompositionTests.cs similarity index 100% rename from src/DependencyInjection.Attributed.Tests/CompositionTests.cs rename to src/DependencyInjection.Tests/CompositionTests.cs diff --git a/src/DependencyInjection.Attributed.Tests/ContentFiles.targets b/src/DependencyInjection.Tests/ContentFiles.targets similarity index 53% rename from src/DependencyInjection.Attributed.Tests/ContentFiles.targets rename to src/DependencyInjection.Tests/ContentFiles.targets index a651d7f..d70c61a 100644 --- a/src/DependencyInjection.Attributed.Tests/ContentFiles.targets +++ b/src/DependencyInjection.Tests/ContentFiles.targets @@ -2,15 +2,15 @@ - - - + + + - - - + + + \ No newline at end of file diff --git a/src/DependencyInjection.Attributed.Tests/ConventionsTests.cs b/src/DependencyInjection.Tests/ConventionsTests.cs similarity index 100% rename from src/DependencyInjection.Attributed.Tests/ConventionsTests.cs rename to src/DependencyInjection.Tests/ConventionsTests.cs diff --git a/src/DependencyInjection.Attributed.Tests/Attributed.Tests.csproj b/src/DependencyInjection.Tests/DependencyInjection.Tests.csproj similarity index 60% rename from src/DependencyInjection.Attributed.Tests/Attributed.Tests.csproj rename to src/DependencyInjection.Tests/DependencyInjection.Tests.csproj index 2578277..ff2fcfb 100644 --- a/src/DependencyInjection.Attributed.Tests/Attributed.Tests.csproj +++ b/src/DependencyInjection.Tests/DependencyInjection.Tests.csproj @@ -1,6 +1,6 @@  - + net6.0 @@ -8,18 +8,6 @@ Tests - - - - - - - - - - - - @@ -32,7 +20,7 @@ - + @@ -41,6 +29,6 @@ - + diff --git a/src/DependencyInjection.Attributed.Tests/GenerationTests.cs b/src/DependencyInjection.Tests/GenerationTests.cs similarity index 100% rename from src/DependencyInjection.Attributed.Tests/GenerationTests.cs rename to src/DependencyInjection.Tests/GenerationTests.cs diff --git a/src/DependencyInjection.Attributed/AddServicesAnalyzer.cs b/src/DependencyInjection/AddServicesAnalyzer.cs similarity index 98% rename from src/DependencyInjection.Attributed/AddServicesAnalyzer.cs rename to src/DependencyInjection/AddServicesAnalyzer.cs index 2d4a394..545041d 100644 --- a/src/DependencyInjection.Attributed/AddServicesAnalyzer.cs +++ b/src/DependencyInjection/AddServicesAnalyzer.cs @@ -5,7 +5,7 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Diagnostics; -namespace Devlooped.Extensions.DependencyInjection.Attributed; +namespace Devlooped.Extensions.DependencyInjection; [DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic)] public class AddServicesAnalyzer : DiagnosticAnalyzer diff --git a/src/DependencyInjection.Attributed/AttributedServicesExtension.cs b/src/DependencyInjection/AttributedServicesExtension.cs similarity index 100% rename from src/DependencyInjection.Attributed/AttributedServicesExtension.cs rename to src/DependencyInjection/AttributedServicesExtension.cs diff --git a/src/DependencyInjection.Attributed/ConventionsAnalyzer.cs b/src/DependencyInjection/ConventionsAnalyzer.cs similarity index 98% rename from src/DependencyInjection.Attributed/ConventionsAnalyzer.cs rename to src/DependencyInjection/ConventionsAnalyzer.cs index 9b0b248..7e3f0fa 100644 --- a/src/DependencyInjection.Attributed/ConventionsAnalyzer.cs +++ b/src/DependencyInjection/ConventionsAnalyzer.cs @@ -5,7 +5,7 @@ using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Diagnostics; -namespace Devlooped.Extensions.DependencyInjection.Attributed; +namespace Devlooped.Extensions.DependencyInjection; [DiagnosticAnalyzer(LanguageNames.CSharp, LanguageNames.VisualBasic)] public class ConventionsAnalyzer : DiagnosticAnalyzer diff --git a/src/DependencyInjection.Attributed/Attributed.csproj b/src/DependencyInjection/DependencyInjection.csproj similarity index 85% rename from src/DependencyInjection.Attributed/Attributed.csproj rename to src/DependencyInjection/DependencyInjection.csproj index 2882298..e491933 100644 --- a/src/DependencyInjection.Attributed/Attributed.csproj +++ b/src/DependencyInjection/DependencyInjection.csproj @@ -3,8 +3,8 @@ Preview netstandard2.0 - Devlooped.Extensions.DependencyInjection.Attributed - Devlooped.Extensions.DependencyInjection.Attributed + Devlooped.Extensions.DependencyInjection + Devlooped.Extensions.DependencyInjection Automatic compile-time service registrations for Microsoft.Extensions.DependencyInjection with no run-time dependencies. $(Title) analyzers/dotnet @@ -23,8 +23,8 @@ - - + + @@ -36,8 +36,8 @@ - - + + diff --git a/src/DependencyInjection.Attributed/Devlooped.Extensions.DependencyInjection.Attributed.props b/src/DependencyInjection/Devlooped.Extensions.DependencyInjection.props similarity index 100% rename from src/DependencyInjection.Attributed/Devlooped.Extensions.DependencyInjection.Attributed.props rename to src/DependencyInjection/Devlooped.Extensions.DependencyInjection.props diff --git a/src/DependencyInjection.Attributed/Devlooped.Extensions.DependencyInjection.Attributed.targets b/src/DependencyInjection/Devlooped.Extensions.DependencyInjection.targets similarity index 100% rename from src/DependencyInjection.Attributed/Devlooped.Extensions.DependencyInjection.Attributed.targets rename to src/DependencyInjection/Devlooped.Extensions.DependencyInjection.targets diff --git a/src/DependencyInjection.Attributed/IncrementalGenerator.cs b/src/DependencyInjection/IncrementalGenerator.cs similarity index 99% rename from src/DependencyInjection.Attributed/IncrementalGenerator.cs rename to src/DependencyInjection/IncrementalGenerator.cs index 59ef674..659b9d1 100644 --- a/src/DependencyInjection.Attributed/IncrementalGenerator.cs +++ b/src/DependencyInjection/IncrementalGenerator.cs @@ -11,7 +11,7 @@ using Microsoft.CodeAnalysis.Diagnostics; using KeyedService = (Microsoft.CodeAnalysis.INamedTypeSymbol Type, Microsoft.CodeAnalysis.TypedConstant? Key); -namespace Devlooped.Extensions.DependencyInjection.Attributed; +namespace Devlooped.Extensions.DependencyInjection; /// /// Discovers annotated services during compilation and generates the partial method diff --git a/src/DependencyInjection.Attributed/Properties/launchSettings.json b/src/DependencyInjection/Properties/launchSettings.json similarity index 100% rename from src/DependencyInjection.Attributed/Properties/launchSettings.json rename to src/DependencyInjection/Properties/launchSettings.json diff --git a/src/DependencyInjection.Attributed/ServiceAttribute.cs b/src/DependencyInjection/ServiceAttribute.cs similarity index 100% rename from src/DependencyInjection.Attributed/ServiceAttribute.cs rename to src/DependencyInjection/ServiceAttribute.cs diff --git a/src/DependencyInjection.Attributed/ServiceAttribute`1.cs b/src/DependencyInjection/ServiceAttribute`1.cs similarity index 100% rename from src/DependencyInjection.Attributed/ServiceAttribute`1.cs rename to src/DependencyInjection/ServiceAttribute`1.cs diff --git a/src/DependencyInjection.Attributed/StaticGenerator.cs b/src/DependencyInjection/StaticGenerator.cs similarity index 93% rename from src/DependencyInjection.Attributed/StaticGenerator.cs rename to src/DependencyInjection/StaticGenerator.cs index 3b603a2..973d230 100644 --- a/src/DependencyInjection.Attributed/StaticGenerator.cs +++ b/src/DependencyInjection/StaticGenerator.cs @@ -1,6 +1,6 @@ using Microsoft.CodeAnalysis; -namespace Devlooped.Extensions.DependencyInjection.Attributed; +namespace Devlooped.Extensions.DependencyInjection; [Generator(LanguageNames.CSharp)] public class StaticGenerator : ISourceGenerator @@ -24,7 +24,7 @@ public void Execute(GeneratorExecutionContext context) value : "AddServicesExtension"; context.AddSource("AddServicesExtension.g", ThisAssembly.Resources.AddServicesExtension.Text - .Replace("Devlooped.Extensions.DependencyInjection.Attributed", rootNs) + .Replace("Devlooped.Extensions.DependencyInjection", rootNs) .Replace("AddServicesExtension", className)); } } diff --git a/src/DependencyInjection.Attributed/SymbolExtensions.cs b/src/DependencyInjection/SymbolExtensions.cs similarity index 100% rename from src/DependencyInjection.Attributed/SymbolExtensions.cs rename to src/DependencyInjection/SymbolExtensions.cs diff --git a/src/DependencyInjection.Attributed/readme.md b/src/DependencyInjection/readme.md similarity index 100% rename from src/DependencyInjection.Attributed/readme.md rename to src/DependencyInjection/readme.md diff --git a/src/Samples/ConsoleApp/ConsoleApp.csproj b/src/Samples/ConsoleApp/ConsoleApp.csproj index 1dc9831..dba4172 100644 --- a/src/Samples/ConsoleApp/ConsoleApp.csproj +++ b/src/Samples/ConsoleApp/ConsoleApp.csproj @@ -1,5 +1,5 @@  - + Exe @@ -17,9 +17,9 @@ - + - - + + diff --git a/src/Samples/Library1/Library1.csproj b/src/Samples/Library1/Library1.csproj index d83ae9a..5b5fd0f 100644 --- a/src/Samples/Library1/Library1.csproj +++ b/src/Samples/Library1/Library1.csproj @@ -1,5 +1,5 @@  - + netstandard2.0 @@ -16,9 +16,9 @@ - + - - + +