⬆️ Bump files with dotnet-file sync

# devlooped/oss - Dynamically fetch devlooped JWK from github devlooped/oss@55124bc - Fix path to jwk.ps1 alongside the SponsorLink.targets devlooped/oss@c4830fc - SponsorLink code should be checked as regular code devlooped/oss@e81ab75 - Update help messages for renamed tool devlooped/oss@c5530c4 - Update for renamed tool sponsors devlooped/oss@d4af445 - Add @ before account, unify es messages devlooped/oss@1c7fd8d - Set Version from VersionLabel if it's a refs/tags/ devlooped/oss@57653a2 - Revert back to dotnet-sponsor devlooped/oss@8d29f01 - Cleanup build and publish to use VersionLabel devlooped/oss@14deaea - Switch to the dotnet global tool version of SL CLI devlooped/oss@cff07df - Switch to renamed sponsorlink > sponsor devlooped/oss@d5efe5e - Bump to renamed tool devlooped/oss@b8fd87b - Improve versioning of sample package devlooped/oss@3b943f5
devlooped · Jun 18, 2024 · 33623b2 · 33623b2
1 parent a9bf4e3
commit 33623b2
Show file tree

Hide file tree

Showing 24 changed files with 113 additions and 81 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -107,6 +107,3 @@ dotnet_analyzer_diagnostic.category-Style.severity = none
 
 # VSTHRD200: Use "Async" suffix for async methods
 dotnet_diagnostic.VSTHRD200.severity = none
-
-[**/*SponsorLink*/**]
-generated_code = true
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,10 +17,10 @@ on:
 
 env:
   DOTNET_NOLOGO: true
-  VersionPrefix: 42.42.${{ github.run_number }}
-  VersionLabel: ${{ github.ref }}
   PackOnBuild: true
   GeneratePackageOnBuild: true
+  VersionPrefix: 42.42.${{ github.run_number }}
+  VersionLabel: ${{ github.ref }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 defaults:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -12,6 +12,7 @@ env:
   Configuration: Release
   PackOnBuild: true
   GeneratePackageOnBuild: true
+  VersionLabel: ${{ github.ref }}
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
 
 jobs:
@@ -25,7 +26,7 @@ jobs:
           fetch-depth: 0
 
       - name: 🙏 build
-        run: dotnet build -m:1 -p:version=${GITHUB_REF#refs/*/v} -bl:build.binlog
+        run: dotnet build -m:1 -bl:build.binlog
 
       - name: 🧪 test
         uses: ./.github/workflows/test

diff --git a/.netconfig b/.netconfig
@@ -12,9 +12,9 @@
 	weak
 [file ".editorconfig"]
 	url = https://github.com/devlooped/oss/blob/main/.editorconfig
-	etag = ba2655b8b3ce5491b1c0eea5e0af201a085c48e07542bb9ec2c928084944ea86
+	etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
 	weak
-	sha = f571a42eac3cad554810dad15139ff390db5e1db
+	sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
 [file ".gitattributes"]
 	url = https://github.com/devlooped/oss/blob/main/.gitattributes
 	etag = 7acb32f5fa6d4ccd9c824605a7c2b8538497f0068c165567807d393dcf4d6bb7
@@ -27,9 +27,9 @@
 	sha = 49661dbf0720cde93eb5569be7523b5912351560
 [file ".github/workflows/build.yml"]
 	url = https://github.com/devlooped/oss/blob/main/.github/workflows/build.yml
-	etag = 6efc7d096b25bb4bbeffe7960a1194f1ceb5d21abeda85d28b55594b648ab44a
+	etag = d9fa5d91dc601f10d19099abb55c86df065cd1c23b1f6fab98ad883cb443bf5c
 	weak
-	sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
+	sha = 14deaea5cecc64df51781d29891a2f67caf8be16
 [file ".gitignore"]
 	url = https://github.com/devlooped/oss/blob/main/.gitignore
 	etag = a9c37ae312afac14b78436a7d018af4483d88736b5f780576f2c5a0b3f14998c
@@ -45,9 +45,9 @@
 	skip
 [file "src/Directory.Build.props"]
 	url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
-	etag = a4925eb815bbcecc022de8d3245db069573d96ac5ecdf5f0e604f06b5577b01e
+	etag = f177eb767aaa6a347da43ff7ff419c9a0736c562cb171e17ded8007a1945a8b0
 	weak
-	sha = 6e96c592c7b44bfda10404b9f90e4b8fab299249
+	sha = 14deaea5cecc64df51781d29891a2f67caf8be16
 [file "src/Directory.Build.targets"]
 	url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
 	etag = 7cb1421f00d9f6f4c00f0ca98e485dcadb927cfa6b3f0b5d4fb212525d2ce9c0
@@ -88,9 +88,9 @@
 	sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
 [file ".github/workflows/publish.yml"]
 	url = https://github.com/devlooped/oss/blob/main/.github/workflows/publish.yml
-	etag = 9ea4083894308a610742488923d2a44778ebba6ca73fb13424647d9a82c918b4
+	etag = 4e9a9885a28ce867fd6139e1ae23735ad0073775145af96ff7d96d047d750973
 	weak
-	sha = 5fb172362c767bef7c36478f1a6bdc264723f8f9
+	sha = 14deaea5cecc64df51781d29891a2f67caf8be16
 [file ".github/workflows/dotnet-file.yml"]
 	url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file.yml
 	sha = 7afe350f7e80a230e922db026d4e1198ba15cae1
@@ -166,8 +166,8 @@
 	weak
 [file "src/SponsorLink/Directory.Build.props"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Directory.Build.props
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = 6823e1e914ecedd174276e3d53517cc0b332bb47c56402a9512cfa6aeeeb067e
+	sha = 3b943f5aa59f33141d1c0fffcb215446d594ad53
+	etag = 0c7737411744012078642dbfc174af3f2ac7dc9f7b8ea4423981ae38753a5be4
 	weak
 [file "src/SponsorLink/Directory.Build.targets"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Directory.Build.targets
@@ -176,8 +176,8 @@
 	weak
 [file "src/SponsorLink/Library/Library.csproj"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/Library.csproj
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = 3720f8ae0605aa64df8f6c1d9769969162175b79c93a21024653f210a42348e6
+	sha = 55124bc610b2dcad9efb343bdffc79c959170593
+	etag = b6940fb01376a096bdbfc7dab0a89b37078c1b8581a98a2b2eea213c7e69565c
 	weak
 [file "src/SponsorLink/Library/MyClass.cs"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/MyClass.cs
@@ -191,8 +191,8 @@
 	weak
 [file "src/SponsorLink/SponsorLink.targets"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink.targets
-	sha = 7cda4a18313b0b38b26c0152e1007cdbb9b6ba3a
-	etag = d725bd9cfa33f35224e91748f64237e4dc66270f7e5ec7c835b78164531ae3db
+	sha = c4830fc3b1aa78ec98d1d2ea4fed86ef0b7b803c
+	etag = d60260e2749e1ff1012b6a9bb7411f1bc717e258b6477f0751b3204a102de91a
 	weak
 [file "src/SponsorLink/SponsorLink/AppDomainDictionary.cs"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/AppDomainDictionary.cs
@@ -211,23 +211,23 @@
 	weak
 [file "src/SponsorLink/SponsorLink/SponsorLink.cs"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.cs
-	sha = 4fca946c3201d90d30e2183f699c850dcc1bf8d5
-	etag = 96e1b1b28bfb2372bd5ffcc6bdef65ee926822b3489ce65be4e5a400884dce21
+	sha = 55124bc610b2dcad9efb343bdffc79c959170593
+	etag = 28178198489bf9b72f8a400563950194a06f7ce55ff4a016535eb1be35fa70b8
 	weak
 [file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.csproj
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = ffaea0b580d8dccd672e749a5efd11fda318c484ca4a34428ff81524ec80ec4b
+	sha = c4830fc3b1aa78ec98d1d2ea4fed86ef0b7b803c
+	etag = 4b33abd9075646a6272cafa55ebae6a0ef972a1953ad6eebae45163e5177d5ff
 	weak
 [file "src/SponsorLink/SponsorLink/SponsorLink.es.resx"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.es.resx
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = ded7de7a2624b335beb462763e3580413da21e80c8b40b4c773ca46c7af4e859
+	sha = 8d29f013595aab6d965f1b91eb8b0ecaa0246366
+	etag = 7f623861748c4e7f534fa2118eb66ad3056fd5b28cd5d1d19e9348d0236ffe29
 	weak
 [file "src/SponsorLink/SponsorLink/SponsorLink.resx"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.resx
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = 7d9e89ef2cf762a6119c9c6c2ed2517b71a546838151c005400301fde8def266
+	sha = 8d29f013595aab6d965f1b91eb8b0ecaa0246366
+	etag = 47a7b843e07a8ec858579f435b59548056b14d00d6653dc41ef5807613925f31
 	weak
 [file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs
@@ -256,13 +256,8 @@
 	weak
 [file "src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = 72ec691a085dc34f946627f7038a82569e44f0b63a9f4a7bd60f0f7b52fd198f
-	weak
-[file "src/SponsorLink/SponsorLink/devlooped.pub.jwk"]
-	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/devlooped.pub.jwk
-	sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
-	etag = cf884781ff88b4d096841e3169282762a898b2050c9b5dac0013bc15bdbee267
+	sha = 55124bc610b2dcad9efb343bdffc79c959170593
+	etag = 46842d44ece3d55285bc30a6b22ac21c1c35d3b0c451aa5285d4ca4564b8698c
 	weak
 [file "src/SponsorLink/SponsorLink/sponsorable.md"]
 	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/sponsorable.md
@@ -319,3 +314,13 @@
 	sha = 827a1d18bf0245978d81bcd3d52e9e6f1584d1ef
 	etag = 079b4aedba2aa9851e609b569f25c55db8d5922e3dbb1adc22611ce4d6cfe465
 	weak
+[file "src/SponsorLink/Library/readme.md"]
+	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/readme.md
+	sha = 55124bc610b2dcad9efb343bdffc79c959170593
+	etag = 5002ac8c5bbeee60c13937a32c1b6c1a5dbf0065617c8f2550e6eca6fded256d
+	weak
+[file "src/SponsorLink/jwk.ps1"]
+	url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/jwk.ps1
+	sha = c4830fc3b1aa78ec98d1d2ea4fed86ef0b7b803c
+	etag = f399e05ecb56adaf41d2545171f299a319142b17dd09fc38e452ca8c5d13bd0d
+	weak
diff --git a/readme.md b/readme.md
@@ -388,7 +388,6 @@ The versioning scheme for packages is:
 [![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
 [![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
 [![Giorgi Dalakishvili](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Giorgi.png "Giorgi Dalakishvili")](https://github.com/Giorgi)
-[![Mike James](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MikeCodesDotNET.png "Mike James")](https://github.com/MikeCodesDotNET)
 [![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
 [![Dan Siegel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
 [![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -118,6 +118,8 @@
 
   <PropertyGroup Label="Version" Condition="$(VersionLabel) != ''">
     <_VersionLabel>$(VersionLabel.Replace('refs/heads/', ''))</_VersionLabel>
+    <_VersionLabel>$(_VersionLabel.Replace('refs/tags/v', ''))</_VersionLabel>
+
     <!-- For PRs, we just need a fixed package version numbered after the PR # itself, so remove the commits # at the end -->
     <_VersionLabel Condition="$(_VersionLabel.Contains('refs/pull/'))">$(VersionLabel.TrimEnd('.0123456789'))</_VersionLabel>
     <!-- Next replace the prefix for simply 'pr', so we end up with 'pr99/merge' by default -->
@@ -128,7 +130,9 @@
     <_VersionLabel>$(_VersionLabel.Replace('/', '-'))</_VersionLabel>
 
     <!-- Set sanitized version to the actual version suffix used in build/pack -->
-    <VersionSuffix>$(_VersionLabel)</VersionSuffix>
+    <VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
+    <!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
+    <Version Condition="$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</Version>
   </PropertyGroup>
 
   <ItemGroup Label="ThisAssembly.Project">

diff --git a/src/SponsorLink/Directory.Build.props b/src/SponsorLink/Directory.Build.props
@@ -15,7 +15,11 @@
 
     <!-- Roslyn caches analyzers aggressively so we are better off using a very dynamic version number 
          for local builds where a quick devloop is key. We bump version every 10 seconds -->
-    <Version>42.42.$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds), 10))))</Version>
+    <Epoc>$([System.DateTime]::Parse("2024-03-15"))</Epoc>
+    <TotalDays>$([System.DateTime]::UtcNow.Subtract($(Epoc)).TotalDays)</TotalDays>
+    <Days>$([System.Math]::Truncate($(TotalDays)))</Days>
+    <Seconds>$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds), 10))))</Seconds>
+    <Version>42.$(Days).$(Seconds)</Version>
 
     <Product>SponsorableLib</Product>
   </PropertyGroup>

diff --git a/src/SponsorLink/Library/Library.csproj b/src/SponsorLink/Library/Library.csproj
@@ -6,6 +6,7 @@
     <PackageId>SponsorableLib</PackageId>
     <Description>Sample library incorporating SponsorLink checks</Description>
     <PackOnBuild>true</PackOnBuild>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,16 +17,4 @@
     <ProjectReference Include="..\Analyzer\Analyzer.csproj" ReferenceOutputAssembly="false" OutputType="Analyzer" />
   </ItemGroup>
 
-  <ItemGroup>
-    <EmbeddedResource Update="Resources.resx">
-      <!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
-      <Generator>MSBuild:Compile</Generator>
-      <StronglyTypedFileName>$(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension)</StronglyTypedFileName>
-      <StronglyTypedLanguage>$(Language)</StronglyTypedLanguage>
-      <StronglyTypedNamespace Condition="'%(RelativeDir)' == ''">$(RootNamespace)</StronglyTypedNamespace>
-      <StronglyTypedNamespace Condition="'%(RelativeDir)' != ''">$(RootNamespace).$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').TrimEnd('.'))</StronglyTypedNamespace>
-      <StronglyTypedClassName>%(Filename)</StronglyTypedClassName>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>
diff --git a/src/SponsorLink/Library/readme.md b/src/SponsorLink/Library/readme.md
@@ -0,0 +1,5 @@
+# Sponsorable Library
+
+Example of a library that is available for sponsorship and leverages 
+[SponsorLink](https://github.com/devlooped/SponsorLink) to remind users 
+in an IDE (VS/Rider).
diff --git a/src/SponsorLink/SponsorLink.targets b/src/SponsorLink/SponsorLink.targets
@@ -10,9 +10,6 @@
     <!-- If we are going to merge files, we need to copy local -->
     <CopyLocalLockFileAssemblies Condition="'$(MergeAnalyzerAssemblies)' == 'true'">true</CopyLocalLockFileAssemblies>
 
-    <!-- Read public key we validate manifests against -->
-    <DevloopedJwk>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)SponsorLink/devlooped.pub.jwk'))</DevloopedJwk>
-
     <!-- Default funding product the Product, which already part of ThisAssembly -->
     <FundingProduct Condition="'$(FundingProduct)' == ''">$(Product)</FundingProduct>
     <!-- Default prefix is the joined upper-case letters in the product name (i.e. for ThisAssembly, TA) -->
@@ -22,7 +19,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <AssemblyMetadata Include="Funding.GitHub.devlooped" Value="$(DevloopedJwk)" />
     <Constant Include="Funding.Product" Value="$(FundingProduct)" />
     <Constant Include="Funding.Prefix" Value="$(FundingPrefix)" />
     <Constant Include="Funding.Grace" Value="$(FundingGrace)" />
@@ -123,7 +119,7 @@
       <!--<ILRepackArgs>$(ILRepackArgs) "/lib:$(NetstandardDirectory)"</ILRepackArgs> -->
       <!-- This is needed for ilrepack to find netstandard.dll, which is referenced by the System.Text.Json assembly -->
     </PropertyGroup>
-    <Exec Command="&quot;$(ILRepack)&quot; $(ILRepackArgs)" WorkingDirectory="$(MSBuildProjectDirectory)\$(OutputPath)" StandardErrorImportance="high" StandardOutputImportance="low" ConsoleToMSBuild="true" ContinueOnError="true">
+    <Exec Command='"$(ILRepack)" $(ILRepackArgs)' WorkingDirectory="$(MSBuildProjectDirectory)\$(OutputPath)" StandardErrorImportance="high" IgnoreStandardErrorWarningFormat="true" StandardOutputImportance="low" ConsoleToMSBuild="true" ContinueOnError="true">
       <Output TaskParameter="ConsoleOutput" PropertyName="ILRepackOutput" />
       <Output TaskParameter="ExitCode" PropertyName="ExitCode" />
     </Exec>
@@ -138,4 +134,23 @@
     <Delete Files="@(MergedAssembliesToRemove -&gt; '$(MSBuildProjectDirectory)\$(OutputPath)%(Filename)%(Extension)')" Condition="Exists('$(MSBuildProjectDirectory)\$(OutputPath)%(Filename)%(Extension)')" />
   </Target>
 
+  <Target Name="DownloadDevloopedJwk" BeforeTargets="GetAssemblyAttributes" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk">
+    <Exec Command="pwsh -nop -f $(MSBuildThisFileDirectory)jwk.ps1" ConsoleToMSBuild="true" EchoOff="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="RawJwk"/>
+      <Output TaskParameter="ExitCode" PropertyName="MSBuildLastExitCode" />
+    </Exec>
+    <Error Text="$(RawJwk)" Condition="'$(MSBuildLastExitCode)' != '0'" />
+    <WriteLinesToFile File="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk" Lines="$(RawJwk)" Overwrite="true" />
+  </Target>
+
+  <Target Name="ReadDevloopedJwk" DependsOnTargets="DownloadDevloopedJwk" BeforeTargets="GetAssemblyAttributes">
+    <PropertyGroup>
+      <!-- Read public key we validate manifests against -->
+      <DevloopedJwk>$([System.IO.File]::ReadAllText('$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk'))</DevloopedJwk>
+    </PropertyGroup>
+    <ItemGroup>
+      <AssemblyMetadata Include="Funding.GitHub.devlooped" Value="$(DevloopedJwk)" />
+    </ItemGroup>
+  </Target>
+
 </Project>
diff --git a/src/SponsorLink/SponsorLink/SponsorLink.cs b/src/SponsorLink/SponsorLink/SponsorLink.cs
@@ -82,7 +82,7 @@ public static bool TryRead([NotNullWhen(true)] out ClaimsPrincipal? principal, I
 
         foreach (var value in values)
         {
-            if (string.IsNullOrWhiteSpace(value.jwk) || string.IsNullOrEmpty(value.jwk))
+            if (string.IsNullOrWhiteSpace(value.jwt) || string.IsNullOrEmpty(value.jwk))
                 continue;
 
             if (Validate(value.jwt, value.jwk, out var token, out var claims, false) == ManifestStatus.Valid && claims != null)

diff --git a/src/SponsorLink/SponsorLink/SponsorLink.csproj b/src/SponsorLink/SponsorLink/SponsorLink.csproj
@@ -8,7 +8,6 @@
   </PropertyGroup>
 
   <PropertyGroup Label="SponsorLink">
-    <DevloopedJwk>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)devlooped.pub.jwk'))</DevloopedJwk>
     <!-- Default funding product the Product, which already part of ThisAssembly -->
     <FundingProduct Condition="'$(FundingProduct)' == ''">$(Product)</FundingProduct>
     <!-- Default prefix is the joined upper-case letters in the product name (i.e. for ThisAssembly, TA) -->
@@ -37,10 +36,32 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AssemblyMetadata Include="Funding.GitHub.devlooped" Value="$(DevloopedJwk)" />
     <Constant Include="Funding.Product" Value="$(FundingProduct)" />
     <Constant Include="Funding.Prefix" Value="$(FundingPrefix)" />
     <Constant Include="Funding.Grace" Value="$(FundingGrace)" />
   </ItemGroup>
 
+  <ItemGroup>
+    <None Include="..\SponsorLink.targets" Link="SponsorLink.targets" />
+  </ItemGroup>
+
+  <Target Name="DownloadDevloopedJwk" BeforeTargets="GetAssemblyAttributes" Inputs="$(MSBuildProjectFullPath)" Outputs="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk">
+    <Exec Command="pwsh -nop -f $(MSBuildThisFileDirectory)..\jwk.ps1" ConsoleToMSBuild="true" EchoOff="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="DevloopedJwk"/>
+      <Output TaskParameter="ExitCode" PropertyName="MSBuildLastExitCode" />
+    </Exec>
+    <Error Text="$(DevloopedJwk)" Condition="'$(MSBuildLastExitCode)' != '0'" />
+    <WriteLinesToFile File="$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk" Lines="$(DevloopedJwk)" Overwrite="true" />
+  </Target>
+
+  <Target Name="ReadDevloopedJwk" DependsOnTargets="DownloadDevloopedJwk" BeforeTargets="GetAssemblyAttributes">
+    <PropertyGroup>
+      <!-- Read public key we validate manifests against -->
+      <DevloopedJwk>$([System.IO.File]::ReadAllText('$(MSBuildProjectDirectory)\$(BaseIntermediateOutputPath)devlooped.jwk'))</DevloopedJwk>
+    </PropertyGroup>
+    <ItemGroup>
+      <AssemblyMetadata Include="Funding.GitHub.devlooped" Value="$(DevloopedJwk)" />
+    </ItemGroup>
+  </Target>
+
 </Project>