Skip to content

Commit a92b84d

Browse files
devlooped-botdevlooped-bot
committed
⬆️ Bump files with dotnet-file sync
# devlooped/oss - SponsorLink-enabled analyzers need copylocal devlooped/oss@7593657 - Add our implementation of JWT manifest reading and reporting devlooped/oss@a0ae727 - Whitespace and formatting devlooped/oss@d74f511 - Rename sample assemblies for nicer display devlooped/oss@93df7c7 - Dynamically fetch devlooped JWK from github devlooped/oss@55124bc - Minor code simplification devlooped/oss@cf154d5 - Remove dependency on ThisAssembly devlooped/oss@c879f25 - Add nullable and generated code annotations devlooped/oss@b2a11fa - Fix path to jwk.ps1 alongside the SponsorLink.targets devlooped/oss@c4830fc - Improve versioning of sample package devlooped/oss@3b943f5 - Fix scenario where multiple packages share product name devlooped/oss@23f83bd - Minimal docs on consuming devlooped/oss@827a1d1 - Add targets for inclusion from tests devlooped/oss@81ba912 - Simplify and unify manifest reading implementation devlooped/oss@4fca946 - Update to checkout@v4 devlooped/oss@5fb1723 - 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 - 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 - Cleanup build and publish to use VersionLabel devlooped/oss@14deaea - Bump create-pr dependency to avoid error with existing PRs devlooped/oss@11a8757 - Only commit markdown files when resolving includes devlooped/oss@2c10a83
1 parent 311904c commit a92b84d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2654
-49
lines changed

‎.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
github_token: ${{ secrets.GITHUB_TOKEN }}
1818

1919
- name: 🤘 checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323
ref: main

‎.github/workflows/dotnet-file.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ jobs:
2424
github_token: ${{ secrets.GITHUB_TOKEN }}
2525

2626
- name: 🤘 checkout
27-
uses: actions/checkout@v2
27+
uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030
ref: main
3131
token: ${{ env.GH_TOKEN }}
3232

3333
- name: ⌛ rate
3434
shell: pwsh
35+
if: github.event_name != 'workflow_dispatch'
3536
run: |
3637
# add random sleep since we run on fixed schedule
3738
sleep (get-random -max 60)
@@ -70,7 +71,7 @@ jobs:
7071
validate: false
7172

7273
- name: ✍ pull request
73-
uses: peter-evans/create-pull-request@v4
74+
uses: peter-evans/create-pull-request@v6
7475
with:
7576
base: main
7677
branch: dotnet-file-sync

‎.github/workflows/includes.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,17 @@ jobs:
2121
github_token: ${{ secrets.GITHUB_TOKEN }}
2222

2323
- name: 🤘 checkout
24-
uses: actions/checkout@v2
24+
uses: actions/checkout@v4
2525
with:
2626
token: ${{ env.GH_TOKEN }}
2727

2828
- name: +Mᐁ includes
2929
uses: devlooped/actions-includes@v1
3030

3131
- name: ✍ pull request
32-
uses: peter-evans/create-pull-request@v4
32+
uses: peter-evans/create-pull-request@v6
3333
with:
34+
add-paths: '**/*.md'
3435
base: main
3536
branch: markdown-includes
3637
delete-branch: true

‎.github/workflows/sponsor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- name: 🤘 checkout
1717
if: env.token != ''
18-
uses: actions/checkout@v2
18+
uses: actions/checkout@v4
1919

2020
- name: 💜 sponsor
2121
if: env.token != ''

‎.netconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@
102102
sha = 0683ee777d7d878d4bf013d7deea352685135a05
103103
etag = b8d789b5b6bea017cdcc8badcea888ad78de3e34298efca922054e9fb0e7b6b9
104104
weak
105-
[file "src/nuget.config"]
106-
url = https://github.com/devlooped/oss/blob/main/src/nuget.config
107-
sha = b2fa09bd9db6de89e37a8ba6705b5659e435dafd
108-
etag = eb2d09e546aa1e11c0b464d9ed6ab2d3c028a1d86c3ac40a318053625fb72819
109-
weak
110105
[file ".github/workflows/combine-prs.yml"]
111106
url = https://github.com/devlooped/oss/blob/main/.github/workflows/combine-prs.yml
112107
sha = c1610886eba42cb250e3894aed40c0a258cd383d

‎readme.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,14 +95,12 @@ snapshots of the day the release build runs, fetched from:
9595
[![Kori Francis](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/kfrancis.png "Kori Francis")](https://github.com/kfrancis)
9696
[![Toni Wenzel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/twenzel.png "Toni Wenzel")](https://github.com/twenzel)
9797
[![Giorgi Dalakishvili](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Giorgi.png "Giorgi Dalakishvili")](https://github.com/Giorgi)
98-
[![Mike James](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/MikeCodesDotNET.png "Mike James")](https://github.com/MikeCodesDotNET)
98+
[![Uno Platform](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/unoplatform.png "Uno Platform")](https://github.com/unoplatform)
9999
[![Dan Siegel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/dansiegel.png "Dan Siegel")](https://github.com/dansiegel)
100100
[![Reuben Swartz](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/rbnswartz.png "Reuben Swartz")](https://github.com/rbnswartz)
101101
[![Jacob Foshee](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/jfoshee.png "Jacob Foshee")](https://github.com/jfoshee)
102102
[![](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Mrxx99.png "")](https://github.com/Mrxx99)
103103
[![Eric Johnson](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/eajhnsn1.png "Eric Johnson")](https://github.com/eajhnsn1)
104-
[![Norman Mackay](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/mackayn.png "Norman Mackay")](https://github.com/mackayn)
105-
[![Certify The Web](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/certifytheweb.png "Certify The Web")](https://github.com/certifytheweb)
106104
[![Ix Technologies B.V.](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/IxTechnologies.png "Ix Technologies B.V.")](https://github.com/IxTechnologies)
107105
[![David JENNI](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/davidjenni.png "David JENNI")](https://github.com/davidjenni)
108106
[![Jonathan ](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/Jonathan-Hickey.png "Jonathan ")](https://github.com/Jonathan-Hickey)
@@ -112,14 +110,14 @@ snapshots of the day the release build runs, fetched from:
112110
[![Seann Alexander](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/seanalexander.png "Seann Alexander")](https://github.com/seanalexander)
113111
[![Tino Hager](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/tinohager.png "Tino Hager")](https://github.com/tinohager)
114112
[![Mark Seemann](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ploeh.png "Mark Seemann")](https://github.com/ploeh)
115-
[![Angelo Belchior](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/angelobelchior.png "Angelo Belchior")](https://github.com/angelobelchior)
116113
[![Ken Bonny](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/KenBonny.png "Ken Bonny")](https://github.com/KenBonny)
117114
[![Simon Cropp](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/SimonCropp.png "Simon Cropp")](https://github.com/SimonCropp)
118115
[![agileworks-eu](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/agileworks-eu.png "agileworks-eu")](https://github.com/agileworks-eu)
119116
[![sorahex](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/sorahex.png "sorahex")](https://github.com/sorahex)
120117
[![Zheyu Shen](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/arsdragonfly.png "Zheyu Shen")](https://github.com/arsdragonfly)
121118
[![Vezel](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/vezel-dev.png "Vezel")](https://github.com/vezel-dev)
122-
[![Georg Jung](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/georg-jung.png "Georg Jung")](https://github.com/georg-jung)
119+
[![ChilliCream](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/ChilliCream.png "ChilliCream")](https://github.com/ChilliCream)
120+
[![4OTC](https://raw.githubusercontent.com/devlooped/sponsors/main/.github/avatars/4OTC.png "4OTC")](https://github.com/4OTC)
123121

124122

125123
<!-- sponsors.md -->

‎src/Directory.Build.props

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,8 @@
118118

119119
<PropertyGroup Label="Version" Condition="$(VersionLabel) != ''">
120120
<_VersionLabel>$(VersionLabel.Replace('refs/heads/', ''))</_VersionLabel>
121+
<_VersionLabel>$(_VersionLabel.Replace('refs/tags/v', ''))</_VersionLabel>
122+
121123
<!-- For PRs, we just need a fixed package version numbered after the PR # itself, so remove the commits # at the end -->
122124
<_VersionLabel Condition="$(_VersionLabel.Contains('refs/pull/'))">$(VersionLabel.TrimEnd('.0123456789'))</_VersionLabel>
123125
<!-- Next replace the prefix for simply 'pr', so we end up with 'pr99/merge' by default -->
@@ -128,7 +130,9 @@
128130
<_VersionLabel>$(_VersionLabel.Replace('/', '-'))</_VersionLabel>
129131

130132
<!-- Set sanitized version to the actual version suffix used in build/pack -->
131-
<VersionSuffix>$(_VersionLabel)</VersionSuffix>
133+
<VersionSuffix Condition="!$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</VersionSuffix>
134+
<!-- Special case for tags, the label is actually the version. Backs compat since passed-in value overrides MSBuild-set one -->
135+
<Version Condition="$(VersionLabel.Contains('refs/tags/'))">$(_VersionLabel)</Version>
132136
</PropertyGroup>
133137

134138
<ItemGroup Label="ThisAssembly.Project">
@@ -142,6 +146,16 @@
142146
<ProjectProperty Include="PublicKeyToken" />
143147
</ItemGroup>
144148

149+
<ItemGroup Label="Throw">
150+
<Using Include="System.ArgumentException" Static="true" />
151+
<Using Include="System.ArgumentOutOfRangeException" Static="true" />
152+
<Using Include="System.ArgumentNullException" Static="true" />
153+
</ItemGroup>
154+
145155
<Import Project="Directory.props" Condition="Exists('Directory.props')"/>
146156
<Import Project="Directory.props.user" Condition="Exists('Directory.props.user')" />
157+
158+
<!-- Implemented by SDK in .targets, guaranteeing it's overwritten. Added here since we add a DependsOnTargets to it.
159+
Covers backwards compatiblity with non-SDK projects. -->
160+
<Target Name="InitializeSourceControlInformation" />
147161
</Project>

‎src/SponsorLink/Analyzer/Analyzer.csproj

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<AssemblyName>SponsorableLib.Analyzers</AssemblyName>
5+
<TargetFramework>netstandard2.0</TargetFramework>
6+
<IsRoslynComponent>true</IsRoslynComponent>
7+
<PackFolder>analyzers/dotnet/roslyn4.0</PackFolder>
8+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
9+
<CustomAfterMicrosoftCSharpTargets>$(MSBuildThisFileDirectory)..\SponsorLink.targets</CustomAfterMicrosoftCSharpTargets>
10+
<MergeAnalyzerAssemblies>true</MergeAnalyzerAssemblies>
11+
<ImplicitUsings>disable</ImplicitUsings>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<PackageReference Include="NuGetizer" Version="1.2.2" />
16+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" Pack="false" />
17+
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
18+
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
19+
<PackageReference Include="ThisAssembly.Git" Version="1.4.3" PrivateAssets="all" />
20+
<PackageReference Include="ThisAssembly.Constants" Version="1.4.3" PrivateAssets="all" />
21+
<PackageReference Include="ThisAssembly.Strings" Version="1.4.3" PrivateAssets="all" />
22+
<PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
23+
</ItemGroup>
24+
25+
<ItemGroup>
26+
<InternalsVisibleTo Include="Tests" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<None Update="buildTransitive\SponsorableLib.targets" Pack="true" />
31+
</ItemGroup>
32+
33+
<ItemGroup>
34+
<Compile Remove="C:\Code\devlooped.oss\src\SponsorLink\SponsorLink\ThisAssembly.cs" />
35+
</ItemGroup>
36+
37+
</Project>

‎src/SponsorLink/Analyzer/Properties/launchSettings.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"profiles": {
3+
"SponsorableLib": {
4+
"commandName": "DebugRoslynComponent",
5+
"targetProject": "..\\Tests\\Tests.csproj",
6+
"environmentVariables": {
7+
"SPONSORLINK_TRACE": "true"
8+
}
9+
}
10+
}
11+
}

‎src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
using System.Collections.Immutable;
2+
using Devlooped.Sponsors;
3+
using Microsoft.CodeAnalysis;
4+
using Microsoft.CodeAnalysis.Diagnostics;
5+
using static Devlooped.Sponsors.SponsorLink;
6+
7+
namespace Analyzer;
8+
9+
[DiagnosticAnalyzer(LanguageNames.CSharp)]
10+
public class StatusReportingAnalyzer : DiagnosticAnalyzer
11+
{
12+
public override ImmutableArray<DiagnosticDescriptor> SupportedDiagnostics => ImmutableArray<DiagnosticDescriptor>.Empty;
13+
14+
public override void Initialize(AnalysisContext context)
15+
{
16+
context.EnableConcurrentExecution();
17+
context.ConfigureGeneratedCodeAnalysis(GeneratedCodeAnalysisFlags.None);
18+
19+
context.RegisterCodeBlockAction(c =>
20+
{
21+
var status = Diagnostics.GetStatus(Funding.Product);
22+
Tracing.Trace($"Status: {status}");
23+
});
24+
}
25+
}

0 commit comments

Comments
 (0)