Skip to content

Commit dd477d9

Browse files
devlooped-botkzu
devlooped-bot
authored and
kzu
committed
⬆️ Bump files with dotnet-file sync
# devlooped/SponsorLink - Bump nuget dependencies for the dotnet analyzer sample devlooped/SponsorLink@0f551e3 - Fix overwriting of $(FundingPackageId) in targets devlooped/SponsorLink@697e210 - Remove workaround for previous buggy targets from TA devlooped/SponsorLink@8f0e621
1 parent 5fd133b commit dd477d9

9 files changed

Lines changed: 51 additions & 39 deletions

File tree

‎.netconfig‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,10 @@
151151
url = https://github.com/devlooped/SponsorLink/tree/main/samples/dotnet/
152152
[file "src/SponsorLink/Analyzer/Analyzer.csproj"]
153153
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Analyzer/Analyzer.csproj
154-
sha = e55425333883c4470d745f8fee70bdf204c292ee
154+
sha = 8f0e6216360f3f8700b4845f3ec2310aabd996f3
155155

156156

157-
etag = 8aa140018fcfbd889c11da36c8c21b5cfb5730c07aa3317d734b118cfa60b416
157+
etag = 671a82f0f6770a990f9364ecf321eeea75bd6092f98c009039af02df172152df
158158
weak
159159
[file "src/SponsorLink/Analyzer/GraceApiAnalyzer.cs"]
160160
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Analyzer/GraceApiAnalyzer.cs
@@ -200,10 +200,10 @@
200200
weak
201201
[file "src/SponsorLink/Library/Library.csproj"]
202202
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Library/Library.csproj
203-
sha = f74ea7a8c7f81c5bceefb3ed7ef4249b1d8574a3
203+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
204204

205205

206-
etag = 592707adba548606ec50ced6e424be4cbfe34f18bf01555a19b29fa61efa416a
206+
etag = 1ba2df85e2aae342f575b9ea08c38b2117f43c131b24d38082d1d4394716f3d0
207207
weak
208208
[file "src/SponsorLink/Library/MyClass.cs"]
209209
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Library/MyClass.cs
@@ -231,10 +231,10 @@
231231
weak
232232
[file "src/SponsorLink/SponsorLink.Analyzer.targets"]
233233
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink.Analyzer.targets
234-
sha = fb82cf346cea86140a51ae49b9bc730d72f7c7ac
234+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
235235

236236

237-
etag = 284f794d03adabf10ac5e25ef87d257821a82eac112efe65d6fe23d675f9af7f
237+
etag = 7276d81830e29f8d5f3e27ee62cadaf7aef02a0162b9a05c88e1daef9cc4875e
238238
weak
239239
[file "src/SponsorLink/SponsorLink/AnalyzerOptionsExtensions.cs"]
240240
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/AnalyzerOptionsExtensions.cs
@@ -286,10 +286,10 @@
286286
weak
287287
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
288288
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLink.csproj
289-
sha = 0d22f1ee7d7afc93e11060887de0e1773884978e
289+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
290290

291291

292-
etag = dbf30ffb9baa63e45a4c821bc1433e4289b9af84855c2a306eaa116874a1c9f2
292+
etag = 27db7c8288b721804b52a719a9218ab1198f4db5b7a7d06bce4e1770def2d4a0
293293
weak
294294
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
295295
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/SponsorLinkAnalyzer.cs
@@ -317,9 +317,9 @@
317317
weak
318318
[file "src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets"]
319319
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/buildTransitive/Devlooped.Sponsors.targets
320-
sha = d7090c1dbcb20c68b99486a6dc53d86b8d9b06bb
320+
sha = 697e210b68c7d6f0ececca7673d13f4309df6cd7
321321

322-
etag = e992b97517c9bcc6c9e927832bc13fac3036fa6d4ecaad893caf320b3c582aee
322+
etag = e2cb4d1bbf4096f4b3fcfa0b20abccb33520442b656f19e01e5da928fd927da8
323323
weak
324324
[file "src/SponsorLink/SponsorLink/sponsorable.md"]
325325
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/SponsorLink/sponsorable.md
@@ -341,9 +341,9 @@
341341
weak
342342
[file "src/SponsorLink/Tests/AnalyzerTests.cs"]
343343
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/AnalyzerTests.cs
344-
sha = 29921560c73bb91c2a21a21800daf0b250773598
344+
sha = 697e210b68c7d6f0ececca7673d13f4309df6cd7
345345

346-
etag = 219df696a47a58d9de377166c87fbb199c84c33d3b7a0f7ae349543df050a583
346+
etag = 44ef3022d2ebe1251896542b697baa9dcef9b9805b68845ccc9d0ff0181ba9d1
347347
weak
348348
[file "src/SponsorLink/Tests/Attributes.cs"]
349349
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Attributes.cs
@@ -389,10 +389,10 @@
389389
weak
390390
[file "src/SponsorLink/Tests/Tests.csproj"]
391391
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/Tests.csproj
392-
sha = 0d22f1ee7d7afc93e11060887de0e1773884978e
392+
sha = 0f551e3be564625ee4d078649c55363bf35954ba
393393

394394

395-
etag = 5db4da024e4ecfb90be14feb4db952efa2109ee2ec84e715921291808d57b749
395+
etag = 7d27c17944c61da196f11f904383b25b3f40579fbeb0cacb367bf05ec184ad7f
396396
weak
397397
[file "src/SponsorLink/Tests/keys/kzu.key"]
398398
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/Tests/keys/kzu.key
@@ -444,9 +444,9 @@
444444
weak
445445
[file "src/SponsorLink/readme.md"]
446446
url = https://github.com/devlooped/SponsorLink/blob/main/samples/dotnet/readme.md
447-
sha = 7407f5b3461213ae764f53ee93651a34487e458c
447+
sha = 697e210b68c7d6f0ececca7673d13f4309df6cd7
448448

449-
etag = 50937c64732bb2b97ddc67cc7b7b2d091c51390c9f5f2b5fdcfe9f1becb5d838
449+
etag = 3f3bb07d204d2539d90a28145653c4b48c1f373d7186b39d2593338cebcd3299
450450
weak
451451
[file ".github/workflows/dotnet-file-core.yml"]
452452
url = https://github.com/devlooped/oss/blob/main/.github/workflows/dotnet-file-core.yml

‎src/SponsorLink/Analyzer/Analyzer.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@
1414
</PropertyGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="NuGetizer" Version="1.2.3" />
17+
<PackageReference Include="NuGetizer" Version="1.2.4" />
1818
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" Pack="false" />
19-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
20-
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="1.4.3" PrivateAssets="all" />
21-
<PackageReference Include="ThisAssembly.Git" Version="1.4.3" PrivateAssets="all" />
22-
<PackageReference Include="ThisAssembly.Constants" Version="1.4.3" PrivateAssets="all" />
23-
<PackageReference Include="ThisAssembly.Project" Version="1.4.3" PrivateAssets="all" />
19+
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
20+
<PackageReference Include="ThisAssembly.AssemblyInfo" Version="2.0.11" PrivateAssets="all" />
2421
</ItemGroup>
2522

2623
<ItemGroup>

‎src/SponsorLink/Library/Library.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="NuGetizer" Version="1.2.3" />
14+
<PackageReference Include="NuGetizer" Version="1.2.4" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

‎src/SponsorLink/SponsorLink.Analyzer.targets‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@
8484
<ItemGroup Condition="'$(ManagePackageVersionsCentrally)' == 'true'">
8585
<PackageReference Include="Humanizer.Core" VersionOverride="2.14.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
8686
<PackageReference Include="Humanizer.Core.es" VersionOverride="2.14.1" PrivateAssets="all" />
87-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.2.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
88-
<PackageReference Include="ILRepack" Version="2.0.35" VersionOverride="all" PrivateAssets="all" Pack="false" />
87+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" VersionOverride="8.4.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
88+
<PackageReference Include="ILRepack" Version="2.0.37" VersionOverride="all" PrivateAssets="all" Pack="false" />
8989
</ItemGroup>
9090

9191
<ItemGroup Condition="'$(ManagePackageVersionsCentrally)' != 'true'">
9292
<PackageReference Include="Humanizer.Core" Version="2.14.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
9393
<PackageReference Include="Humanizer.Core.es" Version="2.14.1" PrivateAssets="all" />
94-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.1" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
95-
<PackageReference Include="ILRepack" Version="2.0.35" PrivateAssets="all" Pack="false" />
94+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" Pack="$(PackMergedAssemblies)" />
95+
<PackageReference Include="ILRepack" Version="2.0.37" PrivateAssets="all" Pack="false" />
9696
</ItemGroup>
9797

9898
<Target Name="EmitFunding" BeforeTargets="CompileDesignTime;CoreCompile" Inputs="$(MSBuildAllProjects)" Outputs="$(IntermediateOutputPath)SponsorLink.g.cs">

‎src/SponsorLink/SponsorLink/SponsorLink.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
<ItemGroup>
2525
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
2626
<PackageReference Include="Humanizer.Core.es" Version="2.14.1" />
27-
<PackageReference Include="ILRepack" Version="2.0.35" PrivateAssets="all" />
28-
<PackageReference Include="NuGetizer" Version="1.2.3" />
27+
<PackageReference Include="ILRepack" Version="2.0.37" PrivateAssets="all" />
28+
<PackageReference Include="NuGetizer" Version="1.2.4" />
2929
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" Pack="false" />
30-
<PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="all" />
31-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" PrivateAssets="all" />
30+
<PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" />
31+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

‎src/SponsorLink/SponsorLink/buildTransitive/Devlooped.Sponsors.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@
6161

6262
<Target Name="SL_CollectSponsorableAnalyzer" Inputs="@(FundingPackageId)" Outputs="|%(FundingPackageId.Identity)|">
6363
<PropertyGroup>
64-
<FundingPackageId>%(FundingPackageId.Identity)</FundingPackageId>
64+
<_FundingPackageId>%(FundingPackageId.Identity)</_FundingPackageId>
6565
</PropertyGroup>
6666
<ItemGroup>
6767
<!--Used to determine installation time, for example, by looking up the analyzer assembly in additional files with:
6868
build_metadata.Analyzer.ItemType = Analyzer
6969
build_metadata.Analyzer.NuGetPackageId = [PackageId] -->
70-
<AdditionalFiles Include="@(Analyzer -> WithMetadataValue('NuGetPackageId', '$(FundingPackageId)'))" />
70+
<AdditionalFiles Include="@(Analyzer -> WithMetadataValue('NuGetPackageId', '$(_FundingPackageId)'))" />
7171
</ItemGroup>
7272
</Target>
7373

‎src/SponsorLink/Tests/AnalyzerTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ public async Task WhenMultipleAnalyzers_ThenReportsOnce()
213213
.Where(x => x.Properties.TryGetValue(nameof(SponsorStatus), out var _));
214214

215215
Assert.NotEmpty(diagnostics);
216-
Assert.Single(diagnostics.Where(x => x.Properties.TryGetValue(nameof(SponsorStatus), out var value)));
216+
Assert.Single(diagnostics, x => x.Properties.TryGetValue(nameof(SponsorStatus), out var value));
217217
}
218218

219219
[Fact]

‎src/SponsorLink/Tests/Tests.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
1111
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.1" />
1212
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
13-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.2.0" PrivateAssets="all" />
13+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.4.0" PrivateAssets="all" />
1414
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
15-
<PackageReference Include="ThisAssembly.Resources" Version="1.4.3" PrivateAssets="all" />
16-
<PackageReference Include="xunit" Version="2.9.2" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
15+
<PackageReference Include="ThisAssembly.Resources" Version="2.0.10" PrivateAssets="all" />
16+
<PackageReference Include="xunit" Version="2.9.3" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2" />
1818
<PackageReference Include="Humanizer.Core" Version="2.14.1" />
1919
<PackageReference Include="Humanizer.Core.es" Version="2.14.1" />
20-
<PackageReference Include="ThisAssembly.Constants" Version="1.4.3" />
20+
<PackageReference Include="ThisAssembly.Constants" Version="2.0.10" />
2121
</ItemGroup>
2222

2323
<ItemGroup>

‎src/SponsorLink/readme.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,19 @@ Including the analyzer and targets in a project involves two steps.
3535
</Project>
3636
```
3737

38+
3. Set the package id(s) that will be checked for funding in the analyzer, such as:
39+
40+
```xml
41+
<PropertyGroup>
42+
<FundingPackageId>SponsorableLib;SponsorableLib.Core</FundingPackageId>
43+
</PropertyGroup>
44+
```
45+
46+
The default analyzer will report a diagnostic for sponsorship status only
47+
if the project being compiled as a direct package reference to one of the
48+
specified package ids.
49+
50+
This property defaults to `$(PackageId)` if present. Otherwise, it defaults
51+
to `$(FundingProduct)`, which in turn defaults to `$(Product)` if not provided.
52+
3853
As long as NuGetizer is used, the right packaging will be done automatically.

0 commit comments

Comments
 (0)