Simplify and redesign ThisAssembly.Metadata as a special case of Cons…

…tants This allows us to support Comment attribute, but more importantly, support hierarchical metadata ids to generate the nested class structure like we have in Constants. Fixes #247
devlooped · Jun 9, 2024 · 2442c61 · 2442c61
1 parent 4cd6a55
commit 2442c61
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 161 deletions.
diff --git a/src/ThisAssembly.Git/ThisAssembly.Git.csproj b/src/ThisAssembly.Git/ThisAssembly.Git.csproj
@@ -5,6 +5,7 @@
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
     <DevelopmentDependency>true</DevelopmentDependency>
+    <PackBuildOutput>false</PackBuildOutput>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/ThisAssembly.Metadata/CSharp.sbntxt b/src/ThisAssembly.Metadata/CSharp.sbntxt
diff --git a/src/ThisAssembly.Metadata/MetadataGenerator.cs b/src/ThisAssembly.Metadata/MetadataGenerator.cs
diff --git a/src/ThisAssembly.Metadata/Model.cs b/src/ThisAssembly.Metadata/Model.cs
diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <PackBuildOutput>false</PackBuildOutput>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -54,13 +55,10 @@ C#:
     <!--<PackageReference Include="Devlooped.SponsorLink" Version="1.0.0" />-->
     <PackageReference Include="NuGetizer" Version="1.2.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
+  </ItemGroup>
 
-    <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
-    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
+  <ItemGroup>
+    <ProjectReference Include="..\ThisAssembly.Constants\ThisAssembly.Constants.csproj" />
   </ItemGroup>
 
   <Import Project="..\Shared\Shared.projitems" Label="Shared" />

diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets
@@ -6,5 +6,13 @@
     <PackageReference Update="ThisAssembly.Metadata" PrivateAssets="all" PackTransitive="false" />
   </ItemGroup>
 
+  <Target Name="PrepareMetadataConstants"
+          BeforeTargets="PrepareConstants"
+          DependsOnTargets="GetAssemblyAttributes">
+    <ItemGroup>
+      <Constant Include="%(AssemblyMetadata.Identity)" Value="%(AssemblyMetadata.Value)" Comment="%(AssemblyMetadata.Comment)" Root="Metadata" />
+    </ItemGroup>
+  </Target>
+
   <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
diff --git a/src/ThisAssembly.Metadata/Visual Basic.sbntxt b/src/ThisAssembly.Metadata/Visual Basic.sbntxt
diff --git a/src/ThisAssembly.Tests/Tests.cs b/src/ThisAssembly.Tests/Tests.cs
@@ -47,6 +47,10 @@ public void CanUseFileConstantLinkedFile()
     public void CanUseMetadata()
         => Assert.Equal("Bar", ThisAssembly.Metadata.Foo);
 
+    [Fact]
+    public void CanUseHierarchicalMetadata()
+        => Assert.Equal("Baz", ThisAssembly.Metadata.Root.Foo.Bar);
+
     [Fact]
     public void CanUseProjectProperty()
         => Assert.Equal("Bar", ThisAssembly.Project.Foo);

diff --git a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
@@ -28,7 +28,7 @@
   <ItemGroup>
     <ProjectReference Include="..\ThisAssembly.AssemblyInfo\ThisAssembly.AssemblyInfo.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\ThisAssembly.Constants\ThisAssembly.Constants.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\ThisAssembly.Metadata\ThisAssembly.Metadata.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\ThisAssembly.Metadata\ThisAssembly.Metadata.csproj" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\ThisAssembly.Project\ThisAssembly.Project.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\ThisAssembly.Resources\ThisAssembly.Resources.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
     <ProjectReference Include="..\ThisAssembly.Strings\ThisAssembly.Strings.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
@@ -72,6 +72,7 @@
     </FileConstant>
     <AssemblyMetadata Include="Foo" Value="Bar" />
     <AssemblyMetadata Include="Raw" Value="$(Multiline)" />
+    <AssemblyMetadata Include="Root.Foo.Bar" Value="Baz" Comment="Comment" />
   </ItemGroup>
 
   <ItemGroup>