⬆️ Bump files with dotnet-file sync

# devlooped/oss - Make sure Funding class is available to intellisense devlooped/oss@5813f21 - Introduce lazy-init of sponsoring status, simplify diagnostics devlooped/oss@5009784 - Add support and showcase determining install time devlooped/oss@717ddb1 - Rename sample assemblies for nicer display devlooped/oss@93df7c7 - Fix path to jwk.ps1 alongside the SponsorLink.targets devlooped/oss@c4830fc - Add our implementation of JWT manifest reading and reporting devlooped/oss@a0ae727 - Minimal docs on consuming devlooped/oss@827a1d1 - Update to newest JsonWebTokens devlooped/oss@068140b - Make sure we report only once per product for entire solution devlooped/oss@4b7f922 - Improve versioning of sample package devlooped/oss@3b943f5 - Remove dependency on ThisAssembly devlooped/oss@c879f25 - Dynamically fetch devlooped JWK from github devlooped/oss@55124bc - Add nullable and generated code annotations devlooped/oss@b2a11fa - Whitespace and formatting devlooped/oss@d74f511 - Replace JWT package in tests targets too devlooped/oss@ba1310c - Simplify and unify manifest reading implementation devlooped/oss@4fca946 - Fix formatting/whitespace devlooped/oss@7febebc - Remove unused tracing overloads devlooped/oss@08a8488 - Upload binlog artifact on debug runs devlooped/oss@a67ae78 - Set env:gh_token if present as secret devlooped/oss@97ebd18 - Update to checkout@v4 devlooped/oss@5fb1723 - Cleanup build and publish to use VersionLabel devlooped/oss@14deaea - Update dotnet-file.yml with fix to create pull request action devlooped/oss@11a331d - Don't add random wait on manual dotnet-file runs devlooped/oss@7afe350 - Bump create-pr dependency to avoid error with existing PRs devlooped/oss@11a8757 - Only commit markdown files when resolving includes devlooped/oss@2c10a83 - Update sponsor.yml to use org-access token devlooped/oss@96ca2b1 - Fix condition check for sender != owner devlooped/oss@49f34c0 - Try using dotnet-sponsor CLI for checks devlooped/oss@e04e3e0 - Only ignore App folder directly under the root devlooped/oss@02811fa - Add static usings to allow unprefixed ThrowXxxx devlooped/oss@6dfe21f - Add compatibility for non-SDK projects without InitializeSourceControlInformation target devlooped/oss@6e96c59 - Set Version from VersionLabel if it's a refs/tags/ devlooped/oss@57653a2 - Improve default value for GenerateDocumentationFile devlooped/oss@b76de49 - Add common sponsors metadata to assemblies devlooped/oss@0789bf0 - Update assembly metadata format for Funding.GitHub devlooped/oss@5801de0 - SponsorLink metadata will be opt-in only by analyzer projects devlooped/oss@c618ea8
devlooped · Jul 3, 2024 · bbacc72 · bbacc72
1 parent 9d28ab7
commit bbacc72
Show file tree

Hide file tree

Showing 50 changed files with 2,964 additions and 64 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,10 +17,11 @@ 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:
   run:
@@ -33,7 +34,7 @@ jobs:
       matrix: ${{ steps.lookup.outputs.matrix }}
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: 🔎 lookup
         id: lookup
@@ -52,13 +53,13 @@ jobs:
         os: ${{ fromJSON(needs.os-matrix.outputs.matrix) }}
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
           fetch-depth: 0
 
       - name: 🙏 build
-        run: dotnet build -m:1
+        run: dotnet build -m:1 -bl:build.binlog
 
       - name: ⚙ GNU grep
         if: matrix.os == 'macOS-latest'
@@ -69,6 +70,13 @@ jobs:
       - name: 🧪 test
         uses: ./.github/workflows/test
 
+      - name: 🐛 logs
+        uses: actions/upload-artifact@v3
+        if: runner.debug && always()
+        with:
+          name: logs
+          path: '*.binlog'
+
       # Only push CI package to sleet feed if building on ubuntu (fastest)
       - name: 🚀 sleet
         env:
@@ -82,7 +90,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           submodules: recursive
           fetch-depth: 0

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -17,7 +17,7 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: main

diff --git a/.github/workflows/dotnet-file.yml b/.github/workflows/dotnet-file.yml
@@ -24,14 +24,15 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: main
           token: ${{ env.GH_TOKEN }}
 
       - name: ⌛ rate
         shell: pwsh
+        if: github.event_name != 'workflow_dispatch'
         run: |
           # add random sleep since we run on fixed schedule
           sleep (get-random -max 60)
@@ -70,7 +71,7 @@ jobs:
           validate: false
 
       - name: ✍ pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
           base: main
           branch: dotnet-file-sync

diff --git a/.github/workflows/includes.yml b/.github/workflows/includes.yml
@@ -21,16 +21,17 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: 🤘 checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with: 
           token: ${{ env.GH_TOKEN }}
 
       - name: +Mᐁ includes
         uses: devlooped/actions-includes@v1
 
       - name: ✍ pull request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
         with:
+          add-paths: '**/*.md'
           base: main
           branch: markdown-includes
           delete-branch: true

diff --git a/.github/workflows/sponsor.yml b/.github/workflows/sponsor.yml
@@ -9,14 +9,58 @@ jobs:
   sponsor:
     runs-on: ubuntu-latest
     continue-on-error: true
-    env:
-      token: ${{ secrets.GH_TOKEN }}
-    if: ${{ !endsWith(github.event.sender.login, '[bot]') && !endsWith(github.event.sender.login, 'bot') }}      
+    if: ${{ !endsWith(github.event.sender.login, '[bot]') && github.event.sender.login != github.repository_owner }}      
     steps:
       - name: 🤘 checkout
-        if: env.token != ''
-        uses: actions/checkout@v2
-
+        uses: actions/checkout@v4
+
+      - name: ⚙ install
+        run: dotnet tool update -g dotnet-sponsor --prerelease
+
+      - name: 💻 setup
+        run: |
+          sponsor --version
+          pushd ~
+          git config -f .sponsorlink/.netconfig sponsorlink.id devlooped.sponsors.ci
+
+      - name: 🧪 run
+        shell: pwsh
+        env:
+          SPONSORABLE: ${{ secrets.GITHUB_TOKEN }}
+          TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          $env:TOKEN | sponsor sync $env:SPONSORABLE --tos --with-token
+          if ($LASTEXITCODE -eq -5) {
+              throw "Can not determine sponsorship with the provided token"
+          } elseif ($LASTEXITCODE -eq -6) {
+              Write-Output "User is not sponsoring, skipping"
+              exit 0
+          } elseif ($LASTEXITCODE -eq -3) {
+              Write-Output "$env:SPONSORABLE is not set up for SponsorLink"
+              exit 0
+          } elseif ($LASTEXITCODE -eq -4) {
+              Write-Output "$env:SPONSORABLE SponsorLink manifest is invalid"
+              exit 0
+          } elseif ($LASTEXITCODE -ne -0) {
+              Write-Output "Could not determine sponsor status"
+              exit $LASTEXITCODE
+          }
+
+          $roles = cat ~/.sponsorlink/github/$env:SPONSORABLE.jwt | jq -R 'split(".") | .[1] | @base64d | fromjson | .roles[]'
+          if (($roles | jq 'select(. == "team")' -r) -eq "team") { 
+            Write-Output "User is a team member, skipping"
+            exit 0 
+          } elseif (($roles | jq 'select(. == "contrib")' -r) -eq "contrib") {
+            Write-Output "User is a contributor!"
+          } else {
+            Write-Output "User is a sponsor"
+            if (($roles | jq 'select(. == "org")' -r) -eq "org") {
+              Write-Output "  (indirectly as a sponsoring organization member)"
+            } elseif (($roles | jq 'select(. == "user")' -r) -eq "user") {
+              Write-Output "  (as a direct sponsor)"
+            }
+          }
+        
       - name: 💜 sponsor 
         if: env.token != ''
         uses: devlooped/actions-sponsor@main

diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,11 @@
 bin
-app
 obj
 artifacts
 pack
 TestResults
 results
 BenchmarkDotNet.Artifacts
+/app
 .vs
 .vscode
 .idea

diff --git a/.netconfig b/.netconfig
@@ -111,11 +111,6 @@
 	sha = 1bf1eacc7ac3920d52c8e7045bfa34abc7c05302
 	etag = 7cb1421f00d9f6f4c00f0ca98e485dcadb927cfa6b3f0b5d4fb212525d2ce9c0
 	weak
-[file "src/nuget.config"]
-	url = https://github.com/devlooped/oss/blob/main/src/nuget.config
-	sha = b2fa09bd9db6de89e37a8ba6705b5659e435dafd
-	etag = eb2d09e546aa1e11c0b464d9ed6ab2d3c028a1d86c3ac40a318053625fb72819
-	weak
 [file ".github/workflows/pages.yml"]
 	url = https://github.com/clarius/pages/blob/main/.github/workflows/pages.yml
 	sha = afcb0421af6507eba5ceba913b8fc37261efc085

diff --git a/readme.md b/readme.md
@@ -83,22 +83,18 @@ while (books.MoveNext())
 [![Stephen Shaw](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/decriptor.png "Stephen Shaw")](https://github.com/decriptor)
 [![Torutek](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/torutek-gh.png "Torutek")](https://github.com/torutek-gh)
 [![DRIVE.NET, Inc.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/drivenet.png "DRIVE.NET, Inc.")](https://github.com/drivenet)
-[![Daniel Gnägi](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dgnaegi.png "Daniel Gnägi")](https://github.com/dgnaegi)
 [![Ashley Medway](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/AshleyMedway.png "Ashley Medway")](https://github.com/AshleyMedway)
 [![Keith Pickford](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Keflon.png "Keith Pickford")](https://github.com/Keflon)
 [![Thomas Bolon](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tbolon.png "Thomas Bolon")](https://github.com/tbolon)
 [![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
-[![Sean Killeen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SeanKilleen.png "Sean Killeen")](https://github.com/SeanKilleen)
 [![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)
 [![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
 [![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
 [![Eric Johnson](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/eajhnsn1.png "Eric Johnson")](https://github.com/eajhnsn1)
-[![Norman Mackay](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mackayn.png "Norman Mackay")](https://github.com/mackayn)
-[![Certify The Web](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/certifytheweb.png "Certify The Web")](https://github.com/certifytheweb)
 [![Ix Technologies B.V.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/IxTechnologies.png "Ix Technologies B.V.")](https://github.com/IxTechnologies)
 [![David JENNI](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
 [![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
@@ -108,13 +104,14 @@ while (books.MoveNext())
 [![Seann Alexander](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/seanalexander.png "Seann Alexander")](https://github.com/seanalexander)
 [![Tino Hager](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
 [![Mark Seemann](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ploeh.png "Mark Seemann")](https://github.com/ploeh)
-[![Angelo Belchior](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/angelobelchior.png "Angelo Belchior")](https://github.com/angelobelchior)
 [![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
 [![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
 [![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
 [![sorahex](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
 [![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
 [![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
+[![ChilliCream](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
+[![4OTC](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/4OTC.png "4OTC")](https://github.com/4OTC)
 
 
 <!-- sponsors.md -->

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -46,8 +46,6 @@
 
   <PropertyGroup Label="Build">
     <Configuration Condition="'$(Configuration)' == '' and $(CI)">Release</Configuration>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <GenerateDocumentationFile Condition="$(MSBuildProjectName.Contains('Tests'))">false</GenerateDocumentationFile>
     <LangVersion>Latest</LangVersion>
 
     <!-- See https://docs.microsoft.com/en-us/dotnet/standard/assembly/reference-assemblies -->
@@ -118,6 +116,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 +128,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">
@@ -142,6 +144,16 @@
     <ProjectProperty Include="PublicKeyToken" />
   </ItemGroup>
 
+  <ItemGroup Label="Throw">
+    <Using Include="System.ArgumentException" Static="true" />
+    <Using Include="System.ArgumentOutOfRangeException" Static="true" />
+    <Using Include="System.ArgumentNullException" Static="true" />
+  </ItemGroup>
+
   <Import Project="Directory.props" Condition="Exists('Directory.props')"/>
   <Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
+
+  <!-- Implemented by SDK in .targets, guaranteeing it's overwritten. Added here since we add a DependsOnTargets to it. 
+       Covers backwards compatiblity with non-SDK projects. -->
+  <Target Name="InitializeSourceControlInformation" />
 </Project>
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
@@ -4,6 +4,13 @@
   <PropertyGroup Condition="'$(CI)' == 'true' and '$(Language)' == 'C#'">
     <DefineConstants>CI;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
+
+  <PropertyGroup Label="Build">
+    <!-- Tests projects don't need API docs, typically -->
+    <GenerateDocumentationFile Condition="$(GenerateDocumentationFile) == '' and $(IsTestProject) == 'true'">false</GenerateDocumentationFile>
+    <GenerateDocumentationFile Condition="$(GenerateDocumentationFile) == '' amd $(MSBuildProjectName.Contains('Tests'))">false</GenerateDocumentationFile>
+    <GenerateDocumentationFile Condition="$(GenerateDocumentationFile) == ''">true</GenerateDocumentationFile>
+  </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsPackable)' == ''">
     <IsPackable Condition="'$(PackAsTool)' == 'true'">true</IsPackable>

diff --git a/src/SponsorLink/Analyzer/Analyzer.csproj b/src/SponsorLink/Analyzer/Analyzer.csproj
@@ -0,0 +1,37 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <AssemblyName>SponsorableLib.Analyzers</AssemblyName>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <IsRoslynComponent>true</IsRoslynComponent>
+    <PackFolder>analyzers/dotnet/roslyn4.0</PackFolder>
+    <PublishRepositoryUrl>true</PublishRepositoryUrl>
+    <CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
+    <MergeAnalyzerAssemblies>true</MergeAnalyzerAssemblies>
+    <ImplicitUsings>disable</ImplicitUsings>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="NuGetizer" Version="1.2.2" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" Pack="false" />
+    <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Git" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Constants" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Strings" Version="1.4.3" PrivateAssets="all" />
+    <PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="buildTransitive\SponsorableLib.targets" Pack="true" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="C:\Code\devlooped.oss\src\SponsorLink\SponsorLink\ThisAssembly.cs" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/SponsorLink/Analyzer/Properties/launchSettings.json b/src/SponsorLink/Analyzer/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "SponsorableLib": {
+      "commandName": "DebugRoslynComponent",
+      "targetProject": "..\\Tests\\Tests.csproj",
+      "environmentVariables": {
+        "SPONSORLINK_TRACE": "true"
+      }
+    }
+  }
+}