From 94d305f9f29ca12f921b7db8c7014f7bff7a8d6e Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Tue, 18 Jun 2024 17:30:33 -0300
Subject: [PATCH] Incorporate SponsorLink v2

Read more at https://www.devlooped.com/SponsorLink/
---
 src/Directory.props                           |  3 ++
 src/Directory.targets                         | 52 ++++++++++++++++++-
 src/Shared/Shared.projitems                   | 10 +---
 src/Shared/Shared.shproj                      |  6 ---
 src/Shared/ThisAssembly.Prerequisites.targets | 33 ------------
 .../ThisAssembly.AssemblyInfo.csproj          |  5 +-
 .../ThisAssembly.AssemblyInfo.targets         |  2 +-
 .../ConstantsGenerator.cs                     |  3 +-
 .../ThisAssembly.Constants.csproj             |  9 +---
 .../ThisAssembly.Constants.targets            |  2 +-
 src/ThisAssembly.Git/ThisAssembly.Git.csproj  |  4 +-
 src/ThisAssembly.Git/ThisAssembly.Git.targets | 13 +++--
 .../ThisAssembly.Metadata.csproj              |  4 +-
 .../ThisAssembly.Metadata.targets             |  1 -
 .../ThisAssembly.Project.csproj               |  5 +-
 .../ThisAssembly.Project.targets              |  2 +-
 .../ThisAssembly.Resources.csproj             |  7 +--
 .../ThisAssembly.Resources.targets            |  2 +-
 .../ThisAssembly.Strings.csproj               |  6 +--
 .../ThisAssembly.Strings.targets              |  2 +-
 .../ThisAssembly.Tests.csproj                 | 32 +++++++++++-
 src/ThisAssembly/ThisAssembly.csproj          |  1 -
 22 files changed, 109 insertions(+), 95 deletions(-)
 delete mode 100644 src/Shared/ThisAssembly.Prerequisites.targets

diff --git a/src/Directory.props b/src/Directory.props
index fe3cc80f..2cdb13a9 100644
--- a/src/Directory.props
+++ b/src/Directory.props
@@ -4,6 +4,7 @@
   <PropertyGroup Label="NuGet">
     <PackageTags>dotnet roslyn</PackageTags>
     <PackOnBuild>true</PackOnBuild>
+    <DevelopmentDependency>true</DevelopmentDependency>
     <ThisAssemblyMinimumRoslynVersion>4.0</ThisAssemblyMinimumRoslynVersion>
     <PackFolder>analyzers/dotnet/roslyn$(ThisAssemblyMinimumRoslynVersion)/cs</PackFolder>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
@@ -18,6 +19,8 @@
 
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
     <NoWarn>MSB3277;$(NoWarn)</NoWarn>
+
+    <Product>ThisAssembly</Product>
   </PropertyGroup>
 
   <PropertyGroup Label="Build">
diff --git a/src/Directory.targets b/src/Directory.targets
index 357eaef1..7e31a87f 100644
--- a/src/Directory.targets
+++ b/src/Directory.targets
@@ -1,4 +1,4 @@
-<Project>
+<Project InitialTargets="SetLocalVersion">
 
   <ItemGroup>
     <None Update="@(None)" CopyToOutputDirectory="PreserveNewest" />
@@ -9,4 +9,54 @@
     <PackageFile Include="*.props;*.targets" PackagePath="build\$(TargetFramework)\%(Filename)%(Extension)" Visible="true" />
   </ItemGroup>
 
+  <Target Name="PackCopyLocalLockFileAssemblies" Condition="'$(MergeAnalyzerAssemblies)' != 'true'" BeforeTargets="GetPackageContents" DependsOnTargets="ReferenceCopyLocalPathsOutputGroup">
+    <ItemGroup>
+      <ReferenceCopyLocalAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' 
+        And !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase))
+        And !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('ThisAssembly', StringComparison.OrdinalIgnoreCase))" />
+      <PackCopyLocalAssemblies Include="@(ReferenceCopyLocalAssemblies)" Condition="
+        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CodeAnalysis', StringComparison.OrdinalIgnoreCase)) And
+        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CSharp', StringComparison.OrdinalIgnoreCase)) And
+        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.', StringComparison.OrdinalIgnoreCase))"
+      />
+      <!-- Brings in System/Microsoft.IdentityModel, System.Text.Encodings.Web, System.Text.Json  -->
+      <PackCopyLocalAssemblies Include="@(ReferenceCopyLocalAssemblies)" Condition="
+        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or
+        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or
+        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.Text', StringComparison.OrdinalIgnoreCase))"
+      />
+      <PackageFile Include="@(PackCopyLocalAssemblies)" PackFolder="$(PackFolder)" />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="SetLocalVersion" Condition="!$(CI)">
+    <GetVersion>
+      <Output TaskParameter="Version" PropertyName="Version" />
+    </GetVersion>
+  </Target>
+
+  <UsingTask TaskName="GetVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
+    <ParameterGroup>
+      <Version Output="true" />
+    </ParameterGroup>
+    <Task>
+      <Using Namespace="System" />
+      <Using Namespace="Microsoft.Build.Framework"/>
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+        var version = this.BuildEngine4.GetRegisteredTaskObject("Version", RegisteredTaskObjectLifetime.Build);
+        if (version == null)
+        {
+            var epoc = DateTime.Parse("2024-03-15");
+            var days = Math.Truncate(DateTime.UtcNow.Subtract(epoc).TotalDays);
+            var time = Math.Floor(DateTime.UtcNow.TimeOfDay.TotalMinutes);
+            version = "42." + days + "." + time;
+            this.BuildEngine4.RegisterTaskObject("Version", version, RegisteredTaskObjectLifetime.Build, false);
+        }
+        Version = (string)version;
+        ]]>
+      </Code>
+    </Task>
+  </UsingTask>
+
 </Project>
diff --git a/src/Shared/Shared.projitems b/src/Shared/Shared.projitems
index fe0ecc79..b46cbc63 100644
--- a/src/Shared/Shared.projitems
+++ b/src/Shared/Shared.projitems
@@ -6,8 +6,7 @@
   <ItemGroup>
     <Compile Include="$(MSBuildThisFileDirectory)**/*$(DefaultLanguageSourceExtension)" Source="Shared" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)**/*.resx" Source="Shared" />
-    <None Include="$(MSBuildThisFileDirectory)**/*" Exclude="$(MSBuildThisFileDirectory)*.projitems;$(MSBuildThisFileDirectory)*.shproj" Source="Shared" />
-    <None Remove="$(MSBuildThisFileDirectory)**/*$(DefaultLanguageSourceExtension)" />
+    <None Include="$(MSBuildThisFileDirectory)**/*" Exclude="$(MSBuildThisFileDirectory)*.projitems;$(MSBuildThisFileDirectory)*.shproj" Source="Shared" />    <None Remove="$(MSBuildThisFileDirectory)**/*$(DefaultLanguageSourceExtension)" />
     <None Remove="$(MSBuildThisFileDirectory)**/*.resx" />
   </ItemGroup>
   <ItemGroup>
@@ -21,11 +20,4 @@
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <!-- Add prerequisites to package -->
-    <None Update="$(MSBuildThisFileDirectory)*.props;$(MSBuildThisFileDirectory)*.targets" Condition="'$(PackSharedTargets)' != 'false'">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <PackagePath>build\$(TargetFramework)\%(Filename)%(Extension)</PackagePath>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Shared/Shared.shproj b/src/Shared/Shared.shproj
index 21876c3d..d4c63bdd 100644
--- a/src/Shared/Shared.shproj
+++ b/src/Shared/Shared.shproj
@@ -7,10 +7,4 @@
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
   <Import Project="Shared.projitems" Label="Shared" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
-  <ItemGroup>
-    <PackageFile Remove="ThisAssembly.Prerequisites.targets" />
-  </ItemGroup>
-  <ItemGroup>
-    <UpToDateCheck Remove="ThisAssembly.Prerequisites.targets" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Shared/ThisAssembly.Prerequisites.targets b/src/Shared/ThisAssembly.Prerequisites.targets
deleted file mode 100644
index ed7f095e..00000000
--- a/src/Shared/ThisAssembly.Prerequisites.targets
+++ /dev/null
@@ -1,33 +0,0 @@
-<Project>
-
-  <PropertyGroup>
-    <!-- Incremental source generator interface appeared first on Roslyn 4.0.1, see 
-         https://learn.microsoft.com/en-us/dotnet/api/microsoft.codeanalysis.iincrementalgenerator?view=roslyn-dotnet-4.0.1 -->
-    <ThisAssemblyMinimumRoslynVersion Condition="'$(ThisAssemblyMinimumRoslynVersion)' == ''">4.0</ThisAssemblyMinimumRoslynVersion>
-  </PropertyGroup>
-
-  <Target Name="_ThisAssemblyCheckCompilerVersion" BeforeTargets="CoreCompile">
-
-    <!-- Version comparison functions require MSBuild 16.5+ -->
-    <Error Text="ThisAssembly requires MSBuild 16.5 or greater."
-            Condition="$([System.Version]::Parse('16.5.0').CompareTo($([System.Version]::Parse($(MSBuildVersion))))) == 1" />
-
-    <PropertyGroup>
-      <!-- CompilerApiVersion comes from Microsoft.Managed.Core.CurrentVersions.targets -->
-      <RoslynVersion Condition="'$(CompilerApiVersion)' != ''">$(CompilerApiVersion.Substring(6))</RoslynVersion>
-      <RoslynVersion Condition="'$(RoslynVersion)' == ''">0.0</RoslynVersion>
-    </PropertyGroup>
-
-    <!-- Don't enforce compiler version for F#, since it's not surfacing the CompilerApiversion at all. 
-         See https://github.com/dotnet/sdk/blob/main/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.PackageDependencyResolution.targets#L214 -->
-    <Warning Code="THIS001"
-             Text="ThisAssembly requires Compiler API (Roslyn) version $(ThisAssemblyMinimumRoslynVersion) or greater."
-             Condition="$([MSBuild]::VersionLessThan('$(RoslynVersion)', '$(ThisAssemblyMinimumRoslynVersion)')) and 
-                        ('$(Language)' == 'C#' Or '$(Language)' == 'VB')" />
-  </Target>
-
-  <PropertyGroup>
-    <ThisAssemblyPrerequisitesImported>true</ThisAssemblyPrerequisitesImported>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj
index 5efdb13f..0b2ba473 100644
--- a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj
+++ b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,9 +28,7 @@ on the `ThisAssembly.Info` class.
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<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" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.targets b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.targets
index dfbda1ea..a4d408b5 100644
--- a/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.targets
+++ b/src/ThisAssembly.AssemblyInfo/ThisAssembly.AssemblyInfo.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\buildTransitive\Devlooped.Sponsors.targets" Condition="Exists('..\buildTransitive\Devlooped.Sponsors.targets')"/>
 
   <ItemGroup>
     <!-- Make sure we're always private to the referencing project. 
@@ -6,5 +7,4 @@
     <PackageReference Update="ThisAssembly.AssemblyInfo" PrivateAssets="all" PackTransitive="false" />
   </ItemGroup>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/ThisAssembly.Constants/ConstantsGenerator.cs b/src/ThisAssembly.Constants/ConstantsGenerator.cs
index 107f812b..622c6bec 100644
--- a/src/ThisAssembly.Constants/ConstantsGenerator.cs
+++ b/src/ThisAssembly.Constants/ConstantsGenerator.cs
@@ -19,7 +19,6 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                 .Where(x =>
                     x.Right.GetOptions(x.Left).TryGetValue("build_metadata.AdditionalFiles.SourceItemType", out var itemType)
                     && itemType == "Constant")
-                .Where(x => x.Right.GetOptions(x.Left).TryGetValue("build_metadata.Constant.Value", out var value) && value != null)
                 .Select((x, ct) =>
                 {
                     x.Right.GetOptions(x.Left).TryGetValue("build_metadata.Constant.Value", out var value);
@@ -32,7 +31,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
 
                     return (
                         name: Path.GetFileName(x.Left.Path),
-                        value: value!,
+                        value: value ?? "",
                         comment: string.IsNullOrWhiteSpace(comment) ? null : comment,
                         root: string.IsNullOrWhiteSpace(root) ? "Constants" : root!);
                 })
diff --git a/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj b/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj
index 76661618..9aa33218 100644
--- a/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj
+++ b/src/ThisAssembly.Constants/ThisAssembly.Constants.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -39,17 +40,11 @@ C#:
 
   <ItemGroup>
     <None Remove="CSharp.sbntxt" />
-    <None Remove="ThisAssembly.Constants.targets" />
-  </ItemGroup>
-
-  <ItemGroup>
     <EmbeddedResource Include="CSharp.sbntxt" CopyToOutputDirectory="PreserveNewest" />
   </ItemGroup>
 
   <ItemGroup>
-    <!--<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" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/src/ThisAssembly.Constants/ThisAssembly.Constants.targets b/src/ThisAssembly.Constants/ThisAssembly.Constants.targets
index 329a601e..2ff4dbcc 100644
--- a/src/ThisAssembly.Constants/ThisAssembly.Constants.targets
+++ b/src/ThisAssembly.Constants/ThisAssembly.Constants.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\buildTransitive\Devlooped.Sponsors.targets" Condition="Exists('..\buildTransitive\Devlooped.Sponsors.targets')"/>
 
   <ItemGroup>
     <CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemType" />
@@ -53,5 +54,4 @@
     </ItemGroup>
   </Target>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
diff --git a/src/ThisAssembly.Git/ThisAssembly.Git.csproj b/src/ThisAssembly.Git/ThisAssembly.Git.csproj
index bc98c892..f4fa769a 100644
--- a/src/ThisAssembly.Git/ThisAssembly.Git.csproj
+++ b/src/ThisAssembly.Git/ThisAssembly.Git.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -30,9 +30,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <!--<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>
 
   <Import Project="..\Shared\Shared.projitems" Label="Shared" />
diff --git a/src/ThisAssembly.Git/ThisAssembly.Git.targets b/src/ThisAssembly.Git/ThisAssembly.Git.targets
index 0b36ec16..e34ada87 100644
--- a/src/ThisAssembly.Git/ThisAssembly.Git.targets
+++ b/src/ThisAssembly.Git/ThisAssembly.Git.targets
@@ -63,7 +63,7 @@
       <SourceLinkUrl>@(_ThisAssemblyGitSourceRoot -> '%(SourceLinkUrl)')</SourceLinkUrl>
     </PropertyGroup>
 
-    <Warning Code="THIS002" Text="A valid SourceLink provider does not seem to be installed for the current repository/project. Values will be empty." Condition="'$(SourceLinkUrl)' == ''" />
+    <Warning Code="TA001" Text="A valid SourceLink provider does not seem to be installed for the current repository/project. Some values may be empty." Condition="'$(SourceLinkUrl)' == ''" />
     
     <PropertyGroup Condition="'$(RepositoryBranch)' == '' and '$(RepositoryRoot)' != ''">
       <!-- We may not be in CI at all. If we got a git repo root, we can directly read HEAD -->
@@ -81,11 +81,11 @@
       <EmptySourceControlValue>[pending build]</EmptySourceControlValue>
     </PropertyGroup>
     <ItemGroup Condition="'$(EnableSourceControlManagerQueries)' != 'true'">
-      <Constant Include="Branch" Value="[pending build]" Root="Git" />
-      <Constant Include="Commit" Value="[pending build]" Root="Git" />
-      <Constant Include="Sha" Value="[pending build]" Root="Git" />
-      <Constant Include="Root" Value="[pending build]" Root="Git" />
-      <Constant Include="Url" Value="[pending build]" Root="Git" />
+      <Constant Include="Branch" Value="$(EmptySourceControlValue)" Root="Git" />
+      <Constant Include="Commit" Value="$(EmptySourceControlValue)" Root="Git" />
+      <Constant Include="Sha" Value="$(EmptySourceControlValue)" Root="Git" />
+      <Constant Include="Root" Value="$(EmptySourceControlValue)" Root="Git" />
+      <Constant Include="Url" Value="$(EmptySourceControlValue)" Root="Git" />
     </ItemGroup>
     <ItemGroup Condition="'$(EnableSourceControlManagerQueries)' == 'true'">
       <Constant Include="Branch" Value="$(RepositoryBranch)" Root="Git" />
@@ -96,5 +96,4 @@
     </ItemGroup>
   </Target>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj
index b6165a6f..e451f8f1 100644
--- a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj
+++ b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
@@ -44,9 +44,7 @@ C#:
   </ItemGroup>
 
   <ItemGroup>
-    <!--<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>
 
   <ItemGroup>
diff --git a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets
index 66c7fc9f..98cfd342 100644
--- a/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets
+++ b/src/ThisAssembly.Metadata/ThisAssembly.Metadata.targets
@@ -14,5 +14,4 @@
     </ItemGroup>
   </Target>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/ThisAssembly.Project/ThisAssembly.Project.csproj b/src/ThisAssembly.Project/ThisAssembly.Project.csproj
index be579583..4499d370 100644
--- a/src/ThisAssembly.Project/ThisAssembly.Project.csproj
+++ b/src/ThisAssembly.Project/ThisAssembly.Project.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -38,9 +39,7 @@ C#:
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<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" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/src/ThisAssembly.Project/ThisAssembly.Project.targets b/src/ThisAssembly.Project/ThisAssembly.Project.targets
index 82cbcc72..eae8d76d 100644
--- a/src/ThisAssembly.Project/ThisAssembly.Project.targets
+++ b/src/ThisAssembly.Project/ThisAssembly.Project.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\buildTransitive\Devlooped.Sponsors.targets" Condition="Exists('..\buildTransitive\Devlooped.Sponsors.targets')"/>
 
   <ItemGroup>
     <!-- Make sure we're always private to the referencing project. 
@@ -28,5 +29,4 @@
     </ItemGroup>
   </Target>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
diff --git a/src/ThisAssembly.Resources/ThisAssembly.Resources.csproj b/src/ThisAssembly.Resources/ThisAssembly.Resources.csproj
index 40837edf..a1a880e7 100644
--- a/src/ThisAssembly.Resources/ThisAssembly.Resources.csproj
+++ b/src/ThisAssembly.Resources/ThisAssembly.Resources.csproj
@@ -8,6 +8,7 @@
     <!-- We cannot use ThisAssembly.Resources as the assembly name, or for whatever 
          reason, it's never added as an analyzer :/ -->
     <AssemblyName>ThisAssembly.Resource</AssemblyName>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -19,13 +20,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Remove="ThisAssembly.Resources.targets" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!--<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" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
diff --git a/src/ThisAssembly.Resources/ThisAssembly.Resources.targets b/src/ThisAssembly.Resources/ThisAssembly.Resources.targets
index e5d57d8a..746f8659 100644
--- a/src/ThisAssembly.Resources/ThisAssembly.Resources.targets
+++ b/src/ThisAssembly.Resources/ThisAssembly.Resources.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\buildTransitive\Devlooped.Sponsors.targets" Condition="Exists('..\buildTransitive\Devlooped.Sponsors.targets')"/>
 
   <ItemGroup>
     <!-- Make sure we're always private to the referencing project. 
@@ -43,5 +44,4 @@
     </ItemGroup>
   </Target>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
diff --git a/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj b/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj
index 6dfffab3..b95c20b6 100644
--- a/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj
+++ b/src/ThisAssembly.Strings/ThisAssembly.Strings.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -24,9 +25,7 @@ such as "Hello {name}".
   </PropertyGroup>
 
   <ItemGroup>
-    <!--<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" />
 
     <PackageReference Include="Scriban" Version="5.10.0" Pack="false" IncludeAssets="build" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
@@ -41,6 +40,7 @@ such as "Hello {name}".
   </ItemGroup>
 
   <ItemGroup>
+    <Compile Remove="ThisAssembly.Strings.cs" />
     <EmbeddedResource Include="ThisAssembly.Strings.cs" />
   </ItemGroup>
 
diff --git a/src/ThisAssembly.Strings/ThisAssembly.Strings.targets b/src/ThisAssembly.Strings/ThisAssembly.Strings.targets
index 3a05199b..a0f9cc85 100644
--- a/src/ThisAssembly.Strings/ThisAssembly.Strings.targets
+++ b/src/ThisAssembly.Strings/ThisAssembly.Strings.targets
@@ -1,4 +1,5 @@
 <Project>
+  <Import Project="..\buildTransitive\Devlooped.Sponsors.targets" Condition="Exists('..\buildTransitive\Devlooped.Sponsors.targets')"/>
 
   <ItemGroup>
     <!-- Make sure we're always private to the referencing project. 
@@ -22,5 +23,4 @@
     <CompilerVisibleItemMetadata Include="ResxCode" MetadataName="ManifestResourceName" />
   </ItemGroup>
 
-  <Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
index ef198a21..053e1834 100644
--- a/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
+++ b/src/ThisAssembly.Tests/ThisAssembly.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Multiline>
       A Description
       with a newline and
@@ -41,6 +41,9 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit" Version="2.8.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />
+
+    <PackageReference Include="Humanizer.Core" Version="2.14.1" PrivateAssets="all" GeneratePathProperty="true" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.6.0" PrivateAssets="all" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup>
@@ -80,7 +83,32 @@
     <Compile Include="..\ThisAssembly.Strings\Model.cs" Link="Model.cs" />
   </ItemGroup>
 
-  <Import Project="..\Shared\ThisAssembly.Prerequisites.targets" />
+  <Target Name="AddSponsorLinkAnalyzerDependencies" BeforeTargets="CoreCompile" DependsOnTargets="ResolveLockFileCopyLocalFiles">
+    <ItemGroup>
+      <ReferenceCopyLocalAssemblies Include="@(ReferenceCopyLocalPaths)" Condition="'%(Extension)' == '.dll' 
+        And !$([MSBuild]::ValueOrDefault('%(FileName)', '').EndsWith('.resources', StringComparison.OrdinalIgnoreCase))
+        And !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('ThisAssembly', StringComparison.OrdinalIgnoreCase))" />
+      <Analyzer Include="@(ReferenceCopyLocalAssemblies)" Condition="
+        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CodeAnalysis', StringComparison.OrdinalIgnoreCase)) And
+        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.CSharp', StringComparison.OrdinalIgnoreCase)) And
+        !$([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.', StringComparison.OrdinalIgnoreCase))"
+      />
+      <!-- Brings in System/Microsoft.IdentityModel, System.Text.Encodings.Web, System.Text.Json  -->
+      <Analyzer Include="@(ReferenceCopyLocalAssemblies)" Condition="
+        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or
+        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('Microsoft.IdentityModel', StringComparison.OrdinalIgnoreCase)) Or
+        $([MSBuild]::ValueOrDefault('%(FileName)', '').StartsWith('System.Text', StringComparison.OrdinalIgnoreCase))"
+      />
+    </ItemGroup>
+  </Target>
+
+  <Target Name="RenderVersion" AfterTargets="Build">
+    <GetVersion>
+      <Output TaskParameter="Version" PropertyName="Version2" />
+    </GetVersion>
+    <Message importance="high" Text="Version: $(Version2)" />
+  </Target>
+
   <Import Project="..\*\ThisAssembly*.targets" />
 
 </Project>
diff --git a/src/ThisAssembly/ThisAssembly.csproj b/src/ThisAssembly/ThisAssembly.csproj
index abf203db..62fe3ba3 100644
--- a/src/ThisAssembly/ThisAssembly.csproj
+++ b/src/ThisAssembly/ThisAssembly.csproj
@@ -15,7 +15,6 @@
 
   <ItemGroup>
     <PackageReference Include="NuGetizer" Version="1.2.2" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
     <Compile Remove="..\*.cs" />
   </ItemGroup>