Update to SponsorLink 0.7.0

kzu · kzu · commit be7f6153860a · 2023-01-28T03:26:56.000-03:00
diff --git a/src/Directory.props b/src/Directory.props
@@ -7,7 +7,7 @@
     <ThisAssemblyMinimumRoslynVersion>4.0</ThisAssemblyMinimumRoslynVersion>
     <PackFolder>analyzers/dotnet/roslyn$(ThisAssemblyMinimumRoslynVersion)/cs</PackFolder>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
-    <RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources>
+    <RestoreSources>https://api.nuget.org/v3/index.json;https://pkg.kzu.io/index.json;</RestoreSources>
     <RestoreSources Condition="Exists('$(MSBuildThisFileDirectory)..\..\nugetizer\bin\')">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\nugetizer\bin'));$(RestoreSources)</RestoreSources>
 
     <PackageProjectUrl>https://clarius.org/ThisAssembly</PackageProjectUrl>
diff --git a/src/ThisAssembly.AssemblyInfo/SponsorLink.cs b/src/ThisAssembly.AssemblyInfo/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.AssemblyInfo");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.AssemblyInfo"))
+    { }
+}
diff --git a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj
@@ -27,7 +27,7 @@ on the `ThisAssembly.Info` class.
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
 
diff --git a/src/ThisAssembly.Constants/SponsorLink.cs b/src/ThisAssembly.Constants/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.Constants");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.Constants"))
+    { }
+}
diff --git a/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj b/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj
@@ -47,7 +47,7 @@ C#:
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
 
diff --git a/src/ThisAssembly.Git/SponsorLink.cs b/src/ThisAssembly.Git/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.Git");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.Git"))
+    { }
+}
diff --git a/src/ThisAssembly.Git/ThisAssembly.Git.csproj b/src/ThisAssembly.Git/ThisAssembly.Git.csproj
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.Common" Version="1.1.1" Pack="true" ExcludeAssets="all" />
diff --git a/src/ThisAssembly.Metadata/SponsorLink.cs b/src/ThisAssembly.Metadata/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.Metadata");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.Metadata"))
+    { }
+}
diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj
@@ -39,7 +39,7 @@ C#:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
 
diff --git a/src/ThisAssembly.Project/SponsorLink.cs b/src/ThisAssembly.Project/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.Project");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.Project"))
+    { }
+}
diff --git a/src/ThisAssembly.Project/ThisAssembly.Project.csproj b/src/ThisAssembly.Project/ThisAssembly.Project.csproj
@@ -38,7 +38,7 @@ C#:
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
 
diff --git a/src/ThisAssembly.Resources/SponsorLink.cs b/src/ThisAssembly.Resources/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.Resources");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.Resources"))
+    { }
+}
diff --git a/src/ThisAssembly.Resources/ThisAssembly.Resources.csproj b/src/ThisAssembly.Resources/ThisAssembly.Resources.csproj
@@ -23,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
 
diff --git a/src/ThisAssembly.Strings/SponsorLink.cs b/src/ThisAssembly.Strings/SponsorLink.cs
@@ -1,14 +1,13 @@
 ﻿using Devlooped;
 using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Diagnostics;
 
 namespace ThisAssembly;
 
+[DiagnosticAnalyzer(LanguageNames.CSharp)]
 [Generator]
-class Generator : IIncrementalGenerator
+class SponsorLinker : SponsorLink
 {
-    readonly SponsorLink link;
-
-    public Generator() => link = new SponsorLink("devlooped", "ThisAssembly.Strings");
-
-    public void Initialize(IncrementalGeneratorInitializationContext context) => link.Initialize(context);
-}
+    public SponsorLinker() : base(SponsorLinkSettings.Create("devlooped", "ThisAssembly", "ThisAssembly.Strings"))
+    { }
+}
diff --git a/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj b/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj
@@ -24,7 +24,7 @@ such as "Hello {name}".
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
     <PackageReference Include="NuGetizer" Version="0.9.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
 
diff --git a/src/ThisAssembly.Strings/ThisAssembly.Strings.targets b/src/ThisAssembly.Strings/ThisAssembly.Strings.targets
@@ -1,6 +1,6 @@
 <Project>
 
-  <Target Name="_InjectRexAdditionalFiles"
+  <Target Name="_InjectResxAdditionalFiles"
           BeforeTargets="PrepareForBuild;CompileDesignTime;GenerateMSBuildEditorConfigFileShouldRun"
           DependsOnTargets="PrepareResourceNames">
     <ItemGroup>
diff --git a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
@@ -31,7 +31,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageReference Include="Devlooped.SponsorLink" Version="0.3.0" />
+    <PackageReference Include="Devlooped.SponsorLink" Version="0.7.0" />
   </ItemGroup>
 
   <ItemGroup>
