Skip to content

Commit 4ce08a8

Browse files
devlooped-botdevlooped-bot
committed
⬆️ 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 - Remove dependency on ThisAssembly devlooped/oss@c879f25 - SponsorLink code should be checked as regular code devlooped/oss@e81ab75 - Improve versioning of sample package devlooped/oss@3b943f5 - Fix scenario where multiple packages share product name devlooped/oss@23f83bd - Set Version from VersionLabel if it's a refs/tags/ devlooped/oss@57653a2 - Cleanup build and publish to use VersionLabel devlooped/oss@14deaea - Rename sample assemblies for nicer display devlooped/oss@93df7c7 - 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 - Revert back to dotnet-sponsor devlooped/oss@8d29f01 - SponsorLink-enabled analyzers need copylocal devlooped/oss@7593657 - Minor code simplification devlooped/oss@cf154d5
1 parent 7ed516a commit 4ce08a8

23 files changed

+399
-168
lines changed

‎.editorconfig

-3
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,3 @@ dotnet_analyzer_diagnostic.category-Style.severity = none
107107

108108
# VSTHRD200: Use "Async" suffix for async methods
109109
dotnet_diagnostic.VSTHRD200.severity = none
110-
111-
[**/*SponsorLink*/**]
112-
generated_code = true

‎.netconfig

+58-48
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
skip
2727
[file ".editorconfig"]
2828
url = https://github.com/devlooped/oss/blob/main/.editorconfig
29-
sha = f571a42eac3cad554810dad15139ff390db5e1db
30-
etag = ba2655b8b3ce5491b1c0eea5e0af201a085c48e07542bb9ec2c928084944ea86
29+
sha = e81ab754b366d52d92bd69b24bef1d5b1c610634
30+
etag = 7298c6450967975a8782b5c74f3071e1910fc59686e48f9c9d5cd7c68213cf59
3131
weak
3232
[file ".gitattributes"]
3333
url = https://github.com/devlooped/oss/blob/main/.gitattributes
@@ -87,8 +87,8 @@
8787
weak
8888
[file "src/Directory.Build.props"]
8989
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.props
90-
sha = 6e96c592c7b44bfda10404b9f90e4b8fab299249
91-
etag = a4925eb815bbcecc022de8d3245db069573d96ac5ecdf5f0e604f06b5577b01e
90+
sha = 14deaea5cecc64df51781d29891a2f67caf8be16
91+
etag = f177eb767aaa6a347da43ff7ff419c9a0736c562cb171e17ded8007a1945a8b0
9292
weak
9393
[file "src/Directory.Build.targets"]
9494
url = https://github.com/devlooped/oss/blob/main/src/Directory.Build.targets
@@ -127,8 +127,8 @@
127127
weak
128128
[file "src/SponsorLink/Analyzer/Analyzer.csproj"]
129129
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/Analyzer.csproj
130-
sha = 7cda4a18313b0b38b26c0152e1007cdbb9b6ba3a
131-
etag = d9444fa36daa8f4ff8f06fc2f9f600dbd8032f25ff58542d3b96676e0305677e
130+
sha = 93df7c7ec34f83ae58efbf213624d5ea31fe3c41
131+
etag = f76e33fde812244a275b95c8815101f6f87d144a5305a2c1f0f631f770d91920
132132
weak
133133
[file "src/SponsorLink/Analyzer/Properties/launchSettings.json"]
134134
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/Properties/launchSettings.json
@@ -137,8 +137,8 @@
137137
weak
138138
[file "src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs"]
139139
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs
140-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
141-
etag = 23d4cd16294974d85164fc26d6a7e2ae52698f23a62463db5025d69d9c166dc5
140+
sha = c879f25bf483086725c8a29f104555644e6ee542
141+
etag = cde10b763b87a3987e86cca2292c9afc7637d2113b9921e79492b6a31620bbb4
142142
weak
143143
[file "src/SponsorLink/Analyzer/buildTransitive/SponsorableLib.targets"]
144144
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/buildTransitive/SponsorableLib.targets
@@ -147,8 +147,8 @@
147147
weak
148148
[file "src/SponsorLink/Directory.Build.props"]
149149
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Directory.Build.props
150-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
151-
etag = 6823e1e914ecedd174276e3d53517cc0b332bb47c56402a9512cfa6aeeeb067e
150+
sha = 3b943f5aa59f33141d1c0fffcb215446d594ad53
151+
etag = 0c7737411744012078642dbfc174af3f2ac7dc9f7b8ea4423981ae38753a5be4
152152
weak
153153
[file "src/SponsorLink/Directory.Build.targets"]
154154
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Directory.Build.targets
@@ -157,8 +157,8 @@
157157
weak
158158
[file "src/SponsorLink/Library/Library.csproj"]
159159
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/Library.csproj
160-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
161-
etag = 3720f8ae0605aa64df8f6c1d9769969162175b79c93a21024653f210a42348e6
160+
sha = 93df7c7ec34f83ae58efbf213624d5ea31fe3c41
161+
etag = 56233a536fb38edd75f66f6a9a9e6044eb227a0b58fb791495ff88e43649feb7
162162
weak
163163
[file "src/SponsorLink/Library/MyClass.cs"]
164164
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/MyClass.cs
@@ -172,8 +172,8 @@
172172
weak
173173
[file "src/SponsorLink/SponsorLink.targets"]
174174
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink.targets
175-
sha = 7cda4a18313b0b38b26c0152e1007cdbb9b6ba3a
176-
etag = d725bd9cfa33f35224e91748f64237e4dc66270f7e5ec7c835b78164531ae3db
175+
sha = 759365751e6529049a3df5701f85aecb51189289
176+
etag = 6e3955b7233c5c2000b9adf1bb281e74e7fb08813e17b3ef10fd8b5d50f9fb4d
177177
weak
178178
[file "src/SponsorLink/SponsorLink/AppDomainDictionary.cs"]
179179
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/AppDomainDictionary.cs
@@ -182,8 +182,8 @@
182182
weak
183183
[file "src/SponsorLink/SponsorLink/DiagnosticsManager.cs"]
184184
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/DiagnosticsManager.cs
185-
sha = b2a11faac6c1c300bce8c1d45f95b585c19f2953
186-
etag = 9f289f45169f35916fff1857840d4118ed134215639d6dae9016dc62004291a5
185+
sha = cf154d5d9c2ac3dad56e95da04effdad64409471
186+
etag = 7ac9738f71cafd15dbb347bc9d83468b0691d0b0888cc82e35c161fd1f2d48eb
187187
weak
188188
[file "src/SponsorLink/SponsorLink/ManifestStatus.cs"]
189189
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/ManifestStatus.cs
@@ -192,28 +192,18 @@
192192
weak
193193
[file "src/SponsorLink/SponsorLink/SponsorLink.cs"]
194194
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.cs
195-
sha = 4fca946c3201d90d30e2183f699c850dcc1bf8d5
196-
etag = 96e1b1b28bfb2372bd5ffcc6bdef65ee926822b3489ce65be4e5a400884dce21
195+
sha = 55124bc610b2dcad9efb343bdffc79c959170593
196+
etag = 28178198489bf9b72f8a400563950194a06f7ce55ff4a016535eb1be35fa70b8
197197
weak
198198
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
199199
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.csproj
200-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
201-
etag = ffaea0b580d8dccd672e749a5efd11fda318c484ca4a34428ff81524ec80ec4b
202-
weak
203-
[file "src/SponsorLink/SponsorLink/SponsorLink.es.resx"]
204-
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.es.resx
205-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
206-
etag = ded7de7a2624b335beb462763e3580413da21e80c8b40b4c773ca46c7af4e859
207-
weak
208-
[file "src/SponsorLink/SponsorLink/SponsorLink.resx"]
209-
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.resx
210-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
211-
etag = 7d9e89ef2cf762a6119c9c6c2ed2517b71a546838151c005400301fde8def266
200+
sha = c879f25bf483086725c8a29f104555644e6ee542
201+
etag = 997b08082f85a491be7a68805d7811e65e1474a6e7d49cbe927617f7035d21e1
212202
weak
213203
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
214204
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs
215-
sha = b2a11faac6c1c300bce8c1d45f95b585c19f2953
216-
etag = fc96f7f5642cbf69b35b7e8de1756822580315f0cee61e47da3b2b1b03f68e1a
205+
sha = 23f83bd6b1f0fe13ac02bf464377f576652fec97
206+
etag = 5f9823d1bf83f7d28e5809e0a08d942fb2c444f4653ca5b035d500ebef2ead15
217207
weak
218208
[file "src/SponsorLink/SponsorLink/SponsorStatus.cs"]
219209
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorStatus.cs
@@ -225,25 +215,15 @@
225215
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
226216
etag = 2f923a97081481a6a264d63c8ff70ce5ba65c3dbaf7ea078cbe1388fb0868e1c
227217
weak
228-
[file "src/SponsorLink/SponsorLink/ThisAssembly.cs"]
229-
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/ThisAssembly.cs
230-
sha = b2a11faac6c1c300bce8c1d45f95b585c19f2953
231-
etag = 978269025f58e2bae872af25fdfd94659e234e8365e3014c18b1b20fdcd155bf
232-
weak
233218
[file "src/SponsorLink/SponsorLink/Tracing.cs"]
234219
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/Tracing.cs
235220
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
236221
etag = 22e32872cafd080bcd5ac9084355578ef70910c8e494602ead365139dcbf40c0
237222
weak
238223
[file "src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets"]
239224
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
240-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
241-
etag = 72ec691a085dc34f946627f7038a82569e44f0b63a9f4a7bd60f0f7b52fd198f
242-
weak
243-
[file "src/SponsorLink/SponsorLink/devlooped.pub.jwk"]
244-
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/devlooped.pub.jwk
245-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
246-
etag = cf884781ff88b4d096841e3169282762a898b2050c9b5dac0013bc15bdbee267
225+
sha = 55124bc610b2dcad9efb343bdffc79c959170593
226+
etag = 46842d44ece3d55285bc30a6b22ac21c1c35d3b0c451aa5285d4ca4564b8698c
247227
weak
248228
[file "src/SponsorLink/SponsorLink/sponsorable.md"]
249229
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/sponsorable.md
@@ -277,8 +257,8 @@
277257
weak
278258
[file "src/SponsorLink/Tests/Sample.cs"]
279259
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Sample.cs
280-
sha = e732f6a2c44a2f7940a1868a92cd66523f74ed24
281-
etag = db968d1d665b77a17e13bc7ca3d43ea65ed05cbebc18669f1b607ebe0e38a59a
260+
sha = c879f25bf483086725c8a29f104555644e6ee542
261+
etag = c4ed1e041d1ec816710757790aaa6688e3756870cfd98ba7e6c7b5103ce3a9ba
282262
weak
283263
[file "src/SponsorLink/Tests/SponsorLinkTests.cs"]
284264
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/SponsorLinkTests.cs
@@ -292,11 +272,41 @@
292272
weak
293273
[file "src/SponsorLink/Tests/Tests.csproj"]
294274
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Tests.csproj
295-
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
296-
etag = 237409e155202ec1b845593195d30057a949b2b18ae46a575e4cf480e4e2c8fe
275+
sha = c879f25bf483086725c8a29f104555644e6ee542
276+
etag = 31d33feb5860cd6df71ee2d6f3ca6d8fdc9e6535bea8caa97300421c0502246e
297277
weak
298278
[file "src/SponsorLink/readme.md"]
299279
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/readme.md
300280
sha = 827a1d18bf0245978d81bcd3d52e9e6f1584d1ef
301281
etag = 079b4aedba2aa9851e609b569f25c55db8d5922e3dbb1adc22611ce4d6cfe465
302282
weak
283+
[file "src/SponsorLink/Library/readme.md"]
284+
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/readme.md
285+
sha = 55124bc610b2dcad9efb343bdffc79c959170593
286+
etag = 5002ac8c5bbeee60c13937a32c1b6c1a5dbf0065617c8f2550e6eca6fded256d
287+
weak
288+
[file "src/SponsorLink/SponsorLink/Resources.es.resx"]
289+
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/Resources.es.resx
290+
sha = c879f25bf483086725c8a29f104555644e6ee542
291+
etag = c0a05bb5efedf8e30a73ab96678579ad33832e4a4aec75d3b596b47f248c23f5
292+
weak
293+
[file "src/SponsorLink/SponsorLink/Resources.resx"]
294+
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/Resources.resx
295+
sha = c879f25bf483086725c8a29f104555644e6ee542
296+
etag = fcb46a86511cb7996e8dcd1f4e283cea9cd51610b094ac49a7396301730814b0
297+
weak
298+
[file "src/SponsorLink/Tests/Resources.Designer.cs"]
299+
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Resources.Designer.cs
300+
sha = c879f25bf483086725c8a29f104555644e6ee542
301+
etag = 69404ac09238930893fdbc225ae7839b14957e129b4c05f1ef0e7afcc4c91d63
302+
weak
303+
[file "src/SponsorLink/Tests/Resources.resx"]
304+
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Resources.resx
305+
sha = c879f25bf483086725c8a29f104555644e6ee542
306+
etag = 13d1bb8b0de32a8c9b5dbdc806a036ed89d423cd7c0be187b8c56055c9bf7783
307+
weak
308+
[file "src/SponsorLink/jwk.ps1"]
309+
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/jwk.ps1
310+
sha = c4830fc3b1aa78ec98d1d2ea4fed86ef0b7b803c
311+
etag = f399e05ecb56adaf41d2545171f299a319142b17dd09fc38e452ca8c5d13bd0d
312+
weak

‎src/Directory.Build.props

+5-1
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">

‎src/SponsorLink/Analyzer/Analyzer.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<AssemblyName>SponsorableLib.Analyzers</AssemblyName>
45
<TargetFramework>netstandard2.0</TargetFramework>
56
<IsRoslynComponent>true</IsRoslynComponent>
67
<PackFolder>analyzers/dotnet/roslyn4.0</PackFolder>
@@ -29,4 +30,8 @@
2930
<None Update="buildTransitive\SponsorableLib.targets" Pack="true" />
3031
</ItemGroup>
3132

33+
<ItemGroup>
34+
<Compile Remove="C:\Code\devlooped.oss\src\SponsorLink\SponsorLink\ThisAssembly.cs" />
35+
</ItemGroup>
36+
3237
</Project>

‎src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using Microsoft.CodeAnalysis;
44
using Microsoft.CodeAnalysis.Diagnostics;
55
using static Devlooped.Sponsors.SponsorLink;
6-
using static ThisAssembly.Constants;
76

87
namespace Analyzer;
98

‎src/SponsorLink/Directory.Build.props

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@
1515

1616
<!-- Roslyn caches analyzers aggressively so we are better off using a very dynamic version number
1717
for local builds where a quick devloop is key. We bump version every 10 seconds -->
18-
<Version>42.42.$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::Now.TimeOfDay.TotalSeconds), 10))))</Version>
18+
<Epoc>$([System.DateTime]::Parse("2024-03-15"))</Epoc>
19+
<TotalDays>$([System.DateTime]::UtcNow.Subtract($(Epoc)).TotalDays)</TotalDays>
20+
<Days>$([System.Math]::Truncate($(TotalDays)))</Days>
21+
<Seconds>$([System.Math]::Floor($([MSBuild]::Divide($([System.DateTime]::UtcNow.TimeOfDay.TotalSeconds), 10))))</Seconds>
22+
<Version>42.$(Days).$(Seconds)</Version>
1923

2024
<Product>SponsorableLib</Product>
2125
</PropertyGroup>

‎src/SponsorLink/Library/Library.csproj

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4+
<AssemblyName>SponsorableLib</AssemblyName>
45
<TargetFramework>netstandard2.0</TargetFramework>
56
<PackNone>true</PackNone>
67
<PackageId>SponsorableLib</PackageId>
78
<Description>Sample library incorporating SponsorLink checks</Description>
89
<PackOnBuild>true</PackOnBuild>
10+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
911
</PropertyGroup>
1012

1113
<ItemGroup>
@@ -16,16 +18,4 @@
1618
<ProjectReference Include="..\Analyzer\Analyzer.csproj" ReferenceOutputAssembly="false" OutputType="Analyzer" />
1719
</ItemGroup>
1820

19-
<ItemGroup>
20-
<EmbeddedResource Update="Resources.resx">
21-
<!-- Default to Just Works resources generation. See https://www.cazzulino.com/resources.html -->
22-
<Generator>MSBuild:Compile</Generator>
23-
<StronglyTypedFileName>$(IntermediateOutputPath)\$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.'))%(Filename).g$(DefaultLanguageSourceExtension)</StronglyTypedFileName>
24-
<StronglyTypedLanguage>$(Language)</StronglyTypedLanguage>
25-
<StronglyTypedNamespace Condition="'%(RelativeDir)' == ''">$(RootNamespace)</StronglyTypedNamespace>
26-
<StronglyTypedNamespace Condition="'%(RelativeDir)' != ''">$(RootNamespace).$([MSBuild]::ValueOrDefault('%(RelativeDir)', '').Replace('\', '.').Replace('/', '.').TrimEnd('.'))</StronglyTypedNamespace>
27-
<StronglyTypedClassName>%(Filename)</StronglyTypedClassName>
28-
</EmbeddedResource>
29-
</ItemGroup>
30-
3121
</Project>

‎src/SponsorLink/Library/readme.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Sponsorable Library
2+
3+
Example of a library that is available for sponsorship and leverages
4+
[SponsorLink](https://github.com/devlooped/SponsorLink) to remind users
5+
in an IDE (VS/Rider).

0 commit comments

Comments
 (0)