Skip to content

Commit 04c83db

Browse files
kzukzu
committed
Rename project/package to remove the Attributed suffix
We're no longer just about attributes, conventions play a role too now :)
1 parent a16baae commit 04c83db

27 files changed

+66
-50
lines changed

DependencyInjection.Attributed.sln renamed to DependencyInjection.sln

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.4.32916.344
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Attributed", "src\DependencyInjection.Attributed\Attributed.csproj", "{9DF192DF-0330-4B82-81C5-B8E7B4D53E41}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection", "src\DependencyInjection\DependencyInjection.csproj", "{9DF192DF-0330-4B82-81C5-B8E7B4D53E41}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Attributed.Tests", "src\DependencyInjection.Attributed.Tests\Attributed.Tests.csproj", "{F2E67084-FED3-4E17-A012-0E8948FD3E06}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DependencyInjection.Tests", "src\DependencyInjection.Tests\DependencyInjection.Tests.csproj", "{F2E67084-FED3-4E17-A012-0E8948FD3E06}"
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CodeAnalysis.Tests", "src\CodeAnalysis.Tests\CodeAnalysis.Tests.csproj", "{E512DEBA-FB35-47FD-AF25-3BAECCF667B1}"
1111
EndProject
@@ -17,6 +17,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Library2", "src\Samples\Lib
1717
EndProject
1818
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\Samples\ConsoleApp\ConsoleApp.csproj", "{26EF99DB-D846-4F65-929D-D7E3E820423A}"
1919
EndProject
20+
Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "Attributed", "src\Attributed\Attributed.msbuildproj", "{1E68517F-34E7-415E-91B1-857802ED5592}"
21+
EndProject
2022
Global
2123
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2224
Debug|Any CPU = Debug|Any CPU
@@ -47,6 +49,10 @@ Global
4749
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Debug|Any CPU.Build.0 = Debug|Any CPU
4850
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.ActiveCfg = Release|Any CPU
4951
{26EF99DB-D846-4F65-929D-D7E3E820423A}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{1E68517F-34E7-415E-91B1-857802ED5592}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{1E68517F-34E7-415E-91B1-857802ED5592}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{1E68517F-34E7-415E-91B1-857802ED5592}.Release|Any CPU.Build.0 = Release|Any CPU
5056
EndGlobalSection
5157
GlobalSection(SolutionProperties) = preSolution
5258
HideSolutionNode = FALSE

‎src/Attributed/Attributed.msbuildproj‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project Sdk="Microsoft.Build.NoTargets/3.5.0" TreatAsLocalProperty="Version">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<PackageId>Devlooped.Extensions.DependencyInjection.Attributed</PackageId>
6+
<Description>Superseded by Devlooped.Extensions.DependencyInjection</Description>
7+
<Version>2.1.0</Version>
8+
</PropertyGroup>
9+
10+
<ItemGroup>
11+
<PackageReference Include="NuGetizer" Version="1.2.1" />
12+
</ItemGroup>
13+
14+
<ItemGroup>
15+
<ProjectReference Include="..\DependencyInjection\DependencyInjection.csproj" />
16+
</ItemGroup>
17+
18+
</Project>

‎src/Attributed/readme.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Obsolete
2+
3+
This package now just references [Devlooped.Extensions.DependencyInjection](http://nuget.org/packages/Devlooped.Extensions.DependencyInjection)
4+
which contains all its functionality and more.

‎src/CodeAnalysis.Tests/AddServicesAnalyzerTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
using System.IO;
55
using System.Linq;
66
using System.Threading.Tasks;
7-
using Devlooped.Extensions.DependencyInjection.Attributed;
7+
using Devlooped.Extensions.DependencyInjection;
88
using Microsoft.CodeAnalysis.CSharp;
99
using Microsoft.CodeAnalysis.CSharp.Testing;
1010
using Microsoft.CodeAnalysis.Testing;
1111
using Xunit;
1212
using Xunit.Abstractions;
13-
using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest<Devlooped.Extensions.DependencyInjection.Attributed.AddServicesAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
14-
using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Devlooped.Extensions.DependencyInjection.Attributed.AddServicesAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
13+
using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest<Devlooped.Extensions.DependencyInjection.AddServicesAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
14+
using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Devlooped.Extensions.DependencyInjection.AddServicesAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
1515

1616
namespace Tests.CodeAnalysis;
1717

‎src/CodeAnalysis.Tests/CodeAnalysis.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<ProjectReference Include="..\DependencyInjection.Attributed\Attributed.csproj" />
20+
<ProjectReference Include="..\DependencyInjection\DependencyInjection.csproj" />
2121
</ItemGroup>
2222

23-
<Import Project="..\DependencyInjection.Attributed.Tests\ContentFiles.targets" />
23+
<Import Project="..\DependencyInjection.Tests\ContentFiles.targets" />
2424

2525
</Project>

‎src/CodeAnalysis.Tests/ConventionAnalyzerTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
using System.IO;
55
using System.Linq;
66
using System.Threading.Tasks;
7-
using Devlooped.Extensions.DependencyInjection.Attributed;
7+
using Devlooped.Extensions.DependencyInjection;
88
using Microsoft.CodeAnalysis.CSharp;
99
using Microsoft.CodeAnalysis.CSharp.Testing;
1010
using Microsoft.CodeAnalysis.Testing;
1111
using Xunit;
1212
using Xunit.Abstractions;
13-
using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest<Devlooped.Extensions.DependencyInjection.Attributed.ConventionsAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
14-
using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Devlooped.Extensions.DependencyInjection.Attributed.ConventionsAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
13+
using AnalyzerTest = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerTest<Devlooped.Extensions.DependencyInjection.ConventionsAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
14+
using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<Devlooped.Extensions.DependencyInjection.ConventionsAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
1515

1616
namespace Tests.CodeAnalysis;
1717

src/DependencyInjection.Attributed.Tests/ComponentModelTests.cs renamed to src/DependencyInjection.Tests/ComponentModelTests.cs

File renamed without changes.

src/DependencyInjection.Attributed.Tests/CompositionTests.cs renamed to src/DependencyInjection.Tests/CompositionTests.cs

File renamed without changes.

src/DependencyInjection.Attributed.Tests/ContentFiles.targets renamed to src/DependencyInjection.Tests/ContentFiles.targets

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<!-- Simulates including the files under contentFiles/cs/netstandard2.0 in the final package -->
33

44
<ItemGroup>
5-
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection.Attributed\AttributedServicesExtension.cs" Link="AttributedServicesExtension.cs" Visible="false" />
6-
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection.Attributed\ServiceAttribute.cs" Link="ServiceAttribute.cs" Visible="false" />
7-
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection.Attributed\ServiceAttribute`1.cs" Link="ServiceAttribute`1.cs" Visible="false" />
5+
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\AttributedServicesExtension.cs" Link="AttributedServicesExtension.cs" Visible="false" />
6+
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute.cs" Link="ServiceAttribute.cs" Visible="false" />
7+
<Compile Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute`1.cs" Link="ServiceAttribute`1.cs" Visible="false" />
88
</ItemGroup>
99

1010
<ItemGroup>
11-
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection.Attributed\AttributedServicesExtension.cs" Type="Non-Resx" />
12-
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection.Attributed\ServiceAttribute.cs" Type="Non-Resx" />
13-
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection.Attributed\ServiceAttribute`1.cs" Type="Non-Resx" />
11+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\AttributedServicesExtension.cs" Type="Non-Resx" />
12+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute.cs" Type="Non-Resx" />
13+
<EmbeddedResource Include="$(MSBuildThisFileDirectory)..\DependencyInjection\ServiceAttribute`1.cs" Type="Non-Resx" />
1414
</ItemGroup>
1515

1616
</Project>

src/DependencyInjection.Attributed.Tests/ConventionsTests.cs renamed to src/DependencyInjection.Tests/ConventionsTests.cs

File renamed without changes.

0 commit comments

Comments
 (0)