Introduce non-generic IStructId for string-backed ids

Strings are not structs so we cannot use them in conjunction with the type constraints in IStructId<T>. It simplifies things to have a non-generic interface for the string-version of a struct id, so we can keep the type constraints very specific for structs and other primitives.

The analyzer project is not renamed to StructId.Analyzer so we can instead have a StructId project for development of the main interfaces and code so it can be tested and compiled independently from its inclusion in the test project (which still simulates consumption scenario more closely).

StructId.sln

@@ -3,24 +3,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.13.35507.96
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructId", "src\StructId\StructId.csproj", "{32E82BDE-70EE-401F-B2E5-DFD2A8B00073}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructId.Tests", "src\StructId.Tests\StructId.Tests.csproj", "{4616804F-CDBE-47A2-B03E-2D87F2088A69}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructId.CodeFix", "src\StructId.CodeFix\StructId.CodeFix.csproj", "{BC2FCF3B-C564-4510-9285-FCC9E5E7C8D6}"
 EndProject
 Project("{13B669BE-BB05-4DDF-9536-439F39A36129}") = "StructId.Package", "src\StructId.Package\StructId.Package.msbuildproj", "{C56D242D-7106-08CA-0DC9-4FC3307CCC29}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructId.Analyzer", "src\StructId.Analyzer\StructId.Analyzer.csproj", "{B8E5FB37-9E35-74F9-A797-24E938A01A82}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StructId", "src\StructId\StructId.csproj", "{CBFE34F2-2D9E-E7D9-10DB-75CAA5AF89B1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{32E82BDE-70EE-401F-B2E5-DFD2A8B00073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32E82BDE-70EE-401F-B2E5-DFD2A8B00073}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32E82BDE-70EE-401F-B2E5-DFD2A8B00073}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32E82BDE-70EE-401F-B2E5-DFD2A8B00073}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4616804F-CDBE-47A2-B03E-2D87F2088A69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4616804F-CDBE-47A2-B03E-2D87F2088A69}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4616804F-CDBE-47A2-B03E-2D87F2088A69}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -33,6 +31,14 @@ Global
 		{C56D242D-7106-08CA-0DC9-4FC3307CCC29}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C56D242D-7106-08CA-0DC9-4FC3307CCC29}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C56D242D-7106-08CA-0DC9-4FC3307CCC29}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B8E5FB37-9E35-74F9-A797-24E938A01A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B8E5FB37-9E35-74F9-A797-24E938A01A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B8E5FB37-9E35-74F9-A797-24E938A01A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B8E5FB37-9E35-74F9-A797-24E938A01A82}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBFE34F2-2D9E-E7D9-10DB-75CAA5AF89B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBFE34F2-2D9E-E7D9-10DB-75CAA5AF89B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBFE34F2-2D9E-E7D9-10DB-75CAA5AF89B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBFE34F2-2D9E-E7D9-10DB-75CAA5AF89B1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/StructId/AnalysisExtensions.cs → src/StructId.Analyzer/AnalysisExtensions.cs

@@ -88,7 +88,7 @@ public static string GetTypeName(this ITypeSymbol type, string containingNamespa
 
     public static string ToFileName(this ITypeSymbol type) => type.ToDisplayString(FullName).Replace('+', '.');
 
-    public static bool IsStructId(this ITypeSymbol type) => type.AllInterfaces.Any(x => x.Name == "IStructId" && x.IsGenericType && x.TypeArguments.Length == 1);
+    public static bool IsStructId(this ITypeSymbol type) => type.AllInterfaces.Any(x => x.Name == "IStructId");
 
     public static bool IsPartial(this ITypeSymbol node) => node.DeclaringSyntaxReferences.Any(
         r => r.GetSyntax() is TypeDeclarationSyntax { Modifiers: { } modifiers } &&

src/StructId/ConstructorGenerator.cs → src/StructId.Analyzer/ConstructorGenerator.cs

@@ -19,12 +19,13 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
     void GenerateCode(SourceProductionContext context, INamedTypeSymbol symbol)
     {
         var ns = symbol.ContainingNamespace.ToDisplayString();
-        var type = symbol.AllInterfaces.First(x => x.Name == "IStructId").TypeArguments[0].GetTypeName(ns);
+        // Generic IStructId<T> -> T, otherwise string
+        var type = symbol.AllInterfaces.First(x => x.Name == "IStructId").TypeArguments.Select(x => x.GetTypeName(ns)).FirstOrDefault() ?? "string";
 
-        var kind = symbol.IsRecord && symbol.IsValueType ? 
-            "record struct" : 
-            symbol.IsRecord ?  
-            "record" : 
+        var kind = symbol.IsRecord && symbol.IsValueType ?
+            "record struct" :
+            symbol.IsRecord ?
+            "record" :
             "class";
 
         var output =

src/StructId/Diagnostics.cs → src/StructId.Analyzer/Diagnostics.cs

@@ -13,6 +13,6 @@ public static class Diagnostics
         "Change '{0}' to a partial readonly record struct as required for types used as struct ids.",
         "Build",
         DiagnosticSeverity.Error,
-        isEnabledByDefault: true, 
+        isEnabledByDefault: true,
         helpLinkUri: $"{ThisAssembly.Project.RepositoryUrl}/blob/{ThisAssembly.Project.RepositoryBranch}/docs/SID001.md");
 }

src/StructId.Analyzer/StructId.Analyzer.csproj

@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <PackFolder>analyzers/dotnet/roslyn4.8/cs</PackFolder>
+
+    <IsRoslynComponent>true</IsRoslynComponent>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.8.0" />
+    <PackageReference Include="NuGetizer" Version="1.2.3" />
+    <PackageReference Include="PolySharp" PrivateAssets="All" Version="1.14.1" />
+    <PackageReference Include="ThisAssembly.AssemblyInfo" Version="42.42.1242-main" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Project" Version="42.42.1242-main" PrivateAssets="all" />
+  </ItemGroup>
+
+  <Target Name="CopyEmbeddedCode" Inputs="@(EmbeddedCode)" Outputs="@(EmbeddedCode -> '$(IntermediateOutputPath)%(Filename).txt')">
+    <Copy SourceFiles="@(EmbeddedCode)" DestinationFiles="@(EmbeddedCode -> '$(IntermediateOutputPath)%(Filename).txt')" SkipUnchangedFiles="true" />
+  </Target>
+
+  <Target Name="AddEmbeddedResources" DependsOnTargets="CopyEmbeddedCode" BeforeTargets="SplitResourcesByCulture">
+    <ItemGroup>
+      <EmbeddedResource Include="@(EmbeddedCode -> '$(IntermediateOutputPath)%(Filename).txt')" Link="%(EmbeddedCode.Filename).txt" Type="Non-Resx" />
+    </ItemGroup>
+  </Target>
+
+</Project>

src/StructId.CodeFix/RecordCodeFix.cs

@@ -73,7 +73,7 @@ protected override Task<Document> GetChangedDocumentAsync(CancellationToken canc
                     declaration.SemicolonToken);
             }
 
-            return Task.FromResult(document.WithSyntaxRoot(root.ReplaceNode(original, declaration)));                    
+            return Task.FromResult(document.WithSyntaxRoot(root.ReplaceNode(original, declaration)));
         }
     }
 }

src/StructId.CodeFix/StructId.CodeFix.csproj

@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\StructId\StructId.csproj" />
+    <ProjectReference Include="..\StructId.Analyzer\StructId.Analyzer.csproj" />
   </ItemGroup>
 
 </Project>

src/StructId.Package/StructId.Package.msbuildproj

@@ -11,7 +11,11 @@
     <PackageReference Include="NuGetizer" Version="1.2.3" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\StructId.Analyzer\StructId.Analyzer.csproj" />
     <ProjectReference Include="..\StructId.CodeFix\StructId.CodeFix.csproj" />
-    <ProjectReference Include="..\StructId\StructId.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\StructId\*.cs" Visible="false" />
+    <None Update="@(None)" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 </Project>

src/StructId.Package/StructId.props

@@ -1,10 +1,6 @@
 <Project>
 
-  <PropertyGroup>
-  </PropertyGroup>
-
   <ItemGroup>
-    <CompilerVisibleProperty Include="IsTestProject" />
     <CompilerVisibleProperty Include="StructIdNamespace" />
     <CompilerVisibleProperty Include="RootNamespace" />
   </ItemGroup>

src/StructId.Package/StructId.targets

@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <StructId Include="$(MSBuildThisFileDirectory)*.cs" />
+    <StructId Include="$(MSBuildThisFileDirectory)*.cs" Link="StructId\%(Filename)%(Extension)" />
   </ItemGroup>
 
-  <Target Name="CopyStructId" Inputs="@(StructId)" Outputs="@(StructId -> '$(IntermediateOutputPath)%(Filename).g%(Extension)')">
+  <Target Name="CopyStructId" Inputs="@(StructId)" Outputs="@(StructId -> '$(IntermediateOutputPath)%(Link)')">
     <PropertyGroup>
-      <StructIdTargetFile>@(StructId -> '$(IntermediateOutputPath)%(Filename).g%(Extension)')</StructIdTargetFile>
+      <StructIdTargetFile>@(StructId -> '$(IntermediateOutputPath)%(Link)')</StructIdTargetFile>
     </PropertyGroup>
 
     <PropertyGroup Condition="$(StructIdNamespace) != 'StructId'">
@@ -32,7 +32,7 @@
 
   <Target Name="AddStructId" DependsOnTargets="CopyStructId" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun">
     <ItemGroup>
-      <Compile Include="@(StructId -> '$(IntermediateOutputPath)%(Filename).g%(Extension)')" Link="%(StructId.Filename)%(Extension)" Visible="false" />
+      <Compile Include="@(StructId -> '$(IntermediateOutputPath)%(Link)')" />
     </ItemGroup>
   </Target>
 

src/StructId.Tests/RecordCodeFixTests.cs

@@ -3,9 +3,9 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Testing;
 using Microsoft.CodeAnalysis.Testing;
-using Microsoft.CodeAnalysis;
 using Verifier = Microsoft.CodeAnalysis.CSharp.Testing.CSharpAnalyzerVerifier<StructId.RecordAnalyzer, Microsoft.CodeAnalysis.Testing.DefaultVerifier>;
 
 namespace StructId;

src/StructId.Tests/StructId.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\StructId.Package\StructId.props" />
+  <Import Project="..\StructId.Package\bin\$(Configuration)\netstandard2.0\StructId.props" />
 
   <PropertyGroup>
     <TargetFramework>net8.0</TargetFramework>
@@ -22,19 +22,20 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\StructId\StructId.csproj" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\StructId.Analyzer\StructId.Analyzer.csproj" OutputItemType="Analyzer" />
     <ProjectReference Include="..\StructId.CodeFix\StructId.CodeFix.csproj" OutputItemType="Analyzer" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\StructId.Package\IStructId.cs" Link="IStructId.cs" Type="Non-Resx" Visible="false" />
+    <ProjectReference Include="..\StructId.Package\StructId.Package.msbuildproj" ReferenceOutputAssembly="false" />
   </ItemGroup>
 
   <ItemGroup>
     <Using Include="Xunit" />
     <Using Include="Xunit.Abstractions" />
   </ItemGroup>
 
-  <Import Project="..\StructId.Package\StructId.targets" />
+  <Import Project="..\StructId.Package\bin\$(Configuration)\netstandard2.0\StructId.targets" />
+
+  <ItemGroup>
+    <EmbeddedResource Include="@(StructId)" Type="Non-Resx" />
+  </ItemGroup>
 
-</Project>
+</Project>

src/StructId.Tests/TestExtensions.cs

@@ -3,8 +3,8 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Testing;
 
 namespace StructId;
@@ -15,7 +15,8 @@ public static TTest WithCodeFixStructId<TTest>(this TTest test) where TTest : Co
     {
         test.WithAnalyzerStructId();
 
-        test.FixedState.Sources.Add(("IStructId.cs", ThisAssembly.Resources.IStructId.Text));
+        test.FixedState.Sources.Add(("IStructId.cs", ThisAssembly.Resources.StructId.IStructId.Text));
+        test.FixedState.Sources.Add(("IStructId`1.cs", ThisAssembly.Resources.StructId.IStructId_1.Text));
         // Fixes error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported
         test.FixedState.Sources.Add(
             """
@@ -38,7 +39,8 @@ public static TTest WithAnalyzerStructId<TTest>(this TTest test) where TTest : A
             return project.WithParseOptions(parseOptions).Solution;
         });
 
-        test.TestState.Sources.Add(("IStructId.cs", ThisAssembly.Resources.IStructId.Text));
+        test.TestState.Sources.Add(("IStructId.cs", ThisAssembly.Resources.StructId.IStructId.Text));
+        test.TestState.Sources.Add(("IStructId`1.cs", ThisAssembly.Resources.StructId.IStructId_1.Text));
         // Fixes error CS0518: Predefined type 'System.Runtime.CompilerServices.IsExternalInit' is not defined or imported
         test.TestState.Sources.Add(
             """

src/StructId/IStructId.cs

@@ -0,0 +1,8 @@
+// <auto-generated />
+
+namespace StructId;
+
+public partial interface IStructId
+{
+    string Value { get; }
+}

src/StructId/IStructId`1.cs

@@ -0,0 +1,8 @@
+// <auto-generated />
+
+namespace StructId;
+
+public partial interface IStructId<T> where T : struct
+{
+    T Value { get; }
+}

src/StructId/StructId.csproj

@@ -9,6 +9,14 @@
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Compile Remove="IStructId`1.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="IStructId`1.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Pack="false" Version="4.8.0" />
     <PackageReference Include="NuGetizer" Version="1.2.3" />