Skip to content

Commit

Permalink
⬆️ Bump files with dotnet-file sync
Browse files Browse the repository at this point in the history
# devlooped/oss

- Remove dependency on ThisAssembly devlooped/oss@c879f25
- Rename sample assemblies for nicer display devlooped/oss@93df7c7
  • Loading branch information
devlooped-bot authored and kzu committed Jun 18, 2024
1 parent 33623b2 commit 9e9773b
Show file tree
Hide file tree
Showing 15 changed files with 301 additions and 109 deletions.
71 changes: 38 additions & 33 deletions .netconfig
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@
weak
[file "src/SponsorLink/Analyzer/Analyzer.csproj"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/Analyzer.csproj
sha = 7cda4a18313b0b38b26c0152e1007cdbb9b6ba3a
etag = d9444fa36daa8f4ff8f06fc2f9f600dbd8032f25ff58542d3b96676e0305677e
sha = 93df7c7ec34f83ae58efbf213624d5ea31fe3c41
etag = f76e33fde812244a275b95c8815101f6f87d144a5305a2c1f0f631f770d91920
weak
[file "src/SponsorLink/Analyzer/Properties/launchSettings.json"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/Properties/launchSettings.json
Expand All @@ -156,8 +156,8 @@
weak
[file "src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
etag = 23d4cd16294974d85164fc26d6a7e2ae52698f23a62463db5025d69d9c166dc5
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = cde10b763b87a3987e86cca2292c9afc7637d2113b9921e79492b6a31620bbb4
weak
[file "src/SponsorLink/Analyzer/buildTransitive/SponsorableLib.targets"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Analyzer/buildTransitive/SponsorableLib.targets
Expand All @@ -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 = 55124bc610b2dcad9efb343bdffc79c959170593
etag = b6940fb01376a096bdbfc7dab0a89b37078c1b8581a98a2b2eea213c7e69565c
sha = 93df7c7ec34f83ae58efbf213624d5ea31fe3c41
etag = 56233a536fb38edd75f66f6a9a9e6044eb227a0b58fb791495ff88e43649feb7
weak
[file "src/SponsorLink/Library/MyClass.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Library/MyClass.cs
Expand All @@ -191,8 +191,8 @@
weak
[file "src/SponsorLink/SponsorLink.targets"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink.targets
sha = c4830fc3b1aa78ec98d1d2ea4fed86ef0b7b803c
etag = d60260e2749e1ff1012b6a9bb7411f1bc717e258b6477f0751b3204a102de91a
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 507622bc78653602235f2dc0a4e3479a3bfa89de7bd418311b259744434a10c5
weak
[file "src/SponsorLink/SponsorLink/AppDomainDictionary.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/AppDomainDictionary.cs
Expand All @@ -201,8 +201,8 @@
weak
[file "src/SponsorLink/SponsorLink/DiagnosticsManager.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/DiagnosticsManager.cs
sha = b2a11faac6c1c300bce8c1d45f95b585c19f2953
etag = 9f289f45169f35916fff1857840d4118ed134215639d6dae9016dc62004291a5
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 8c03f01cee109c8c8b09d24c6e2bcb927487913b8ab48315ae36841aeb6ff1b3
weak
[file "src/SponsorLink/SponsorLink/ManifestStatus.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/ManifestStatus.cs
Expand All @@ -216,23 +216,13 @@
weak
[file "src/SponsorLink/SponsorLink/SponsorLink.csproj"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.csproj
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 = 8d29f013595aab6d965f1b91eb8b0ecaa0246366
etag = 7f623861748c4e7f534fa2118eb66ad3056fd5b28cd5d1d19e9348d0236ffe29
weak
[file "src/SponsorLink/SponsorLink/SponsorLink.resx"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLink.resx
sha = 8d29f013595aab6d965f1b91eb8b0ecaa0246366
etag = 47a7b843e07a8ec858579f435b59548056b14d00d6653dc41ef5807613925f31
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 997b08082f85a491be7a68805d7811e65e1474a6e7d49cbe927617f7035d21e1
weak
[file "src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorLinkAnalyzer.cs
sha = b2a11faac6c1c300bce8c1d45f95b585c19f2953
etag = fc96f7f5642cbf69b35b7e8de1756822580315f0cee61e47da3b2b1b03f68e1a
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 514423ef54fcd7718ec3cb8ef00b24091b03951236994bb7f45982a8b3e7e299
weak
[file "src/SponsorLink/SponsorLink/SponsorStatus.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/SponsorStatus.cs
Expand All @@ -244,11 +234,6 @@
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
etag = 2f923a97081481a6a264d63c8ff70ce5ba65c3dbaf7ea078cbe1388fb0868e1c
weak
[file "src/SponsorLink/SponsorLink/ThisAssembly.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/ThisAssembly.cs
sha = b2a11faac6c1c300bce8c1d45f95b585c19f2953
etag = 978269025f58e2bae872af25fdfd94659e234e8365e3014c18b1b20fdcd155bf
weak
[file "src/SponsorLink/SponsorLink/Tracing.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/Tracing.cs
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
Expand Down Expand Up @@ -291,8 +276,8 @@
weak
[file "src/SponsorLink/Tests/Sample.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Sample.cs
sha = e732f6a2c44a2f7940a1868a92cd66523f74ed24
etag = db968d1d665b77a17e13bc7ca3d43ea65ed05cbebc18669f1b607ebe0e38a59a
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = c4ed1e041d1ec816710757790aaa6688e3756870cfd98ba7e6c7b5103ce3a9ba
weak
[file "src/SponsorLink/Tests/SponsorLinkTests.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/SponsorLinkTests.cs
Expand All @@ -306,8 +291,8 @@
weak
[file "src/SponsorLink/Tests/Tests.csproj"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Tests.csproj
sha = a0ae7272f31c766ebb129ea38c11c01df93b6b5d
etag = 237409e155202ec1b845593195d30057a949b2b18ae46a575e4cf480e4e2c8fe
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 31d33feb5860cd6df71ee2d6f3ca6d8fdc9e6535bea8caa97300421c0502246e
weak
[file "src/SponsorLink/readme.md"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/readme.md
Expand All @@ -324,3 +309,23 @@
sha = c4830fc3b1aa78ec98d1d2ea4fed86ef0b7b803c
etag = f399e05ecb56adaf41d2545171f299a319142b17dd09fc38e452ca8c5d13bd0d
weak
[file "src/SponsorLink/SponsorLink/Resources.es.resx"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/Resources.es.resx
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = c0a05bb5efedf8e30a73ab96678579ad33832e4a4aec75d3b596b47f248c23f5
weak
[file "src/SponsorLink/SponsorLink/Resources.resx"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/SponsorLink/Resources.resx
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = fcb46a86511cb7996e8dcd1f4e283cea9cd51610b094ac49a7396301730814b0
weak
[file "src/SponsorLink/Tests/Resources.Designer.cs"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Resources.Designer.cs
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 69404ac09238930893fdbc225ae7839b14957e129b4c05f1ef0e7afcc4c91d63
weak
[file "src/SponsorLink/Tests/Resources.resx"]
url = https://github.com/devlooped/oss/blob/main/src/SponsorLink/Tests/Resources.resx
sha = c879f25bf483086725c8a29f104555644e6ee542
etag = 13d1bb8b0de32a8c9b5dbdc806a036ed89d423cd7c0be187b8c56055c9bf7783
weak
5 changes: 5 additions & 0 deletions src/SponsorLink/Analyzer/Analyzer.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>SponsorableLib.Analyzers</AssemblyName>
<TargetFramework>netstandard2.0</TargetFramework>
<IsRoslynComponent>true</IsRoslynComponent>
<PackFolder>analyzers/dotnet/roslyn4.0</PackFolder>
Expand Down Expand Up @@ -29,4 +30,8 @@
<None Update="buildTransitive\SponsorableLib.targets" Pack="true" />
</ItemGroup>

<ItemGroup>
<Compile Remove="C:\Code\devlooped.oss\src\SponsorLink\SponsorLink\ThisAssembly.cs" />
</ItemGroup>

</Project>
1 change: 0 additions & 1 deletion src/SponsorLink/Analyzer/StatusReportingAnalyzer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using Microsoft.CodeAnalysis;
using Microsoft.CodeAnalysis.Diagnostics;
using static Devlooped.Sponsors.SponsorLink;
using static ThisAssembly.Constants;

namespace Analyzer;

Expand Down
1 change: 1 addition & 0 deletions src/SponsorLink/Library/Library.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<AssemblyName>SponsorableLib</AssemblyName>
<TargetFramework>netstandard2.0</TargetFramework>
<PackNone>true</PackNone>
<PackageId>SponsorableLib</PackageId>
Expand Down
36 changes: 29 additions & 7 deletions src/SponsorLink/SponsorLink.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
<MergeAnalyzerAssemblies Condition="'$(MergeAnalyzerAssemblies)' == '' and '$(Configuration)' == 'Release'">true</MergeAnalyzerAssemblies>
<!-- If we are going to merge files, we need to copy local -->
<CopyLocalLockFileAssemblies Condition="'$(MergeAnalyzerAssemblies)' == 'true'">true</CopyLocalLockFileAssemblies>
<!-- Make Resources visible to intellisense -->
<CoreCompileDependsOn>CoreResGen;$(CoreCompileDependsOn)</CoreCompileDependsOn>

<!-- Default funding product the Product, which already part of ThisAssembly -->
<FundingProduct Condition="'$(FundingProduct)' == ''">$(Product)</FundingProduct>
Expand All @@ -18,20 +20,19 @@
<FundingGrace Condition="'$(FundingGrace)' == ''">21</FundingGrace>
</PropertyGroup>

<ItemGroup>
<Constant Include="Funding.Product" Value="$(FundingProduct)" />
<Constant Include="Funding.Prefix" Value="$(FundingPrefix)" />
<Constant Include="Funding.Grace" Value="$(FundingGrace)" />
</ItemGroup>

<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)SponsorLink/*.cs"
Exclude="$(MSBuildThisFileDirectory)SponsorLink/bin/**;$(MSBuildThisFileDirectory)SponsorLink/obj/**"
Source="SponsorLink"/>
<EmbeddedResource Include="$(MSBuildThisFileDirectory)SponsorLink/*.resx"
Exclude="$(MSBuildThisFileDirectory)SponsorLink/bin/**;$(MSBuildThisFileDirectory)SponsorLink/obj/**"
Source="SponsorLink"
ManifestResourceName="Devlooped.%(Filename)"/>
ManifestResourceName="Devlooped.Sponsors.%(Filename)"/>
<EmbeddedResource Update="$(MSBuildThisFileDirectory)SponsorLink/Resources.resx"
StronglyTypedManifestPrefix="Devlooped.Sponsors"
StronglyTypedClassName="%(Filename)"
StronglyTypedNamespace="Devlooped.Sponsors"
StronglyTypedLanguage="$(Language)" />
<None Include="$(MSBuildThisFileDirectory)SponsorLink/buildTransitive/*.*"
Source="SponsorLink"
PackagePath="buildTransitive/%(Filename)%(Extension)"/>
Expand Down Expand Up @@ -81,6 +82,27 @@
<PackageReference Include="ILRepack" Version="2.0.33" PrivateAssets="all" Pack="false" />
</ItemGroup>

<Target Name="EmitFunding" BeforeTargets="GenerateMSBuildEditorConfigFileShouldRun" Inputs="$(MSBuildAllProjects)" Outputs="$(IntermediateOutputPath)SponsorLink.g.cs">
<PropertyGroup>
<SponsorLinkPartial>namespace Devlooped.Sponsors%3B

partial class SponsorLink
{
public partial class Funding
{
public const string Product = "$(FundingProduct)"%3B
public const string Prefix = "$(FundingPrefix)"%3B
public const int Grace = $(FundingGrace)%3B
}
}
</SponsorLinkPartial>
</PropertyGroup>
<WriteLinesToFile File="$(IntermediateOutputPath)SponsorLink.g.cs" Lines="$(SponsorLinkPartial)" WriteOnlyWhenDifferent="true" Overwrite="true" />
<ItemGroup>
<Compile Include="$(IntermediateOutputPath)SponsorLink.g.cs" />
</ItemGroup>
</Target>

<Target Name="ILRepack" AfterTargets="CoreCompile" BeforeTargets="CopyFilesToOutputDirectory"
Inputs="@(IntermediateAssembly -&gt; '%(FullPath)')"
Outputs="$(IntermediateOutputPath)ilrepack.txt"
Expand Down
25 changes: 13 additions & 12 deletions src/SponsorLink/SponsorLink/DiagnosticsManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#nullable enable
using System;
using System.Collections.Concurrent;
using System.Globalization;
using Humanizer;
using Microsoft.CodeAnalysis;

Expand Down Expand Up @@ -92,47 +93,47 @@ public Diagnostic Push(string product, Diagnostic diagnostic)

static DiagnosticDescriptor CreateSponsor(string[] sponsorable, string prefix) => new(
$"{prefix}100",
ThisAssembly.Strings.Sponsor.Title,
ThisAssembly.Strings.Sponsor.MessageFormat,
Resources.Sponsor_Title,
Resources.Sponsor_Message,
"SponsorLink",
DiagnosticSeverity.Info,
isEnabledByDefault: true,
description: ThisAssembly.Strings.Sponsor.Description,
description: Resources.Sponsor_Description,
helpLinkUri: "https://github.com/devlooped#sponsorlink",
"DoesNotSupportF1Help");

static DiagnosticDescriptor CreateUnknown(string[] sponsorable, string product, string prefix) => new(
$"{prefix}101",
ThisAssembly.Strings.Unknown.Title,
ThisAssembly.Strings.Unknown.MessageFormat,
Resources.Unknown_Title,
Resources.Unknown_Message,
"SponsorLink",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
description: ThisAssembly.Strings.Unknown.Description(
description: string.Format(CultureInfo.CurrentCulture, Resources.Unknown_Description,
sponsorable.Humanize(x => $"https://github.com/sponsors/{x}"),
string.Join(" ", sponsorable)),
helpLinkUri: "https://github.com/devlooped#sponsorlink",
WellKnownDiagnosticTags.NotConfigurable);

static DiagnosticDescriptor CreateExpiring(string[] sponsorable, string prefix) => new(
$"{prefix}103",
ThisAssembly.Strings.Expiring.Title,
ThisAssembly.Strings.Expiring.MessageFormat,
Resources.Expiring_Title,
Resources.Expiring_Message,
"SponsorLink",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
description: ThisAssembly.Strings.Expiring.Description(string.Join(" ", sponsorable)),
description: string.Format(CultureInfo.CurrentCulture, Resources.Expiring_Description, string.Join(" ", sponsorable)),
helpLinkUri: "https://github.com/devlooped#autosync",
"DoesNotSupportF1Help", WellKnownDiagnosticTags.NotConfigurable);

static DiagnosticDescriptor CreateExpired(string[] sponsorable, string prefix) => new(
$"{prefix}104",
ThisAssembly.Strings.Expired.Title,
ThisAssembly.Strings.Expired.MessageFormat,
Resources.Expired_Title,
Resources.Expired_Message,
"SponsorLink",
DiagnosticSeverity.Warning,
isEnabledByDefault: true,
description: ThisAssembly.Strings.Expired.Description(string.Join(" ", sponsorable)),
description: string.Format(CultureInfo.CurrentCulture, Resources.Expired_Description, string.Join(" ", sponsorable)),
helpLinkUri: "https://github.com/devlooped#autosync",
"DoesNotSupportF1Help", WellKnownDiagnosticTags.NotConfigurable);
}
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</resheader>
<data name="Unknown_Description" xml:space="preserve">
<value>Patrocinar los proyectos en que dependes asegura que se mantengan activos, y que recibas el apoyo que necesitas. También es muy económico y está disponible en todo el mundo!
Por favor considera apoyar el proyecto patrocinando en {links} y ejecutando posteriormente 'sponsor sync {spaced}'.</value>
Por favor considera apoyar el proyecto patrocinando en {0} y ejecutando posteriormente 'sponsor sync {1}'.</value>
</data>
<data name="Unknown_Message" xml:space="preserve">
<value>Por favor considere apoyar {0} patrocinando @{1} 🙏</value>
Expand All @@ -128,7 +128,7 @@ Por favor considera apoyar el proyecto patrocinando en {links} y ejecutando post
<value>Estado de patrocinio desconocido</value>
</data>
<data name="Expired_Description" xml:space="preserve">
<value>Funcionalidades exclusivas para patrocinadores pueden no estar disponibles. Ejecuta 'sponsor sync {spaced}' y, opcionalmente, habilita la sincronización automática.</value>
<value>Funcionalidades exclusivas para patrocinadores pueden no estar disponibles. Ejecuta 'sponsor sync {0}' y, opcionalmente, habilita la sincronización automática.</value>
</data>
<data name="Expired_Message" xml:space="preserve">
<value>El estado de patrocino ha expirado y la sincronización automática no está habilitada.</value>
Expand All @@ -146,7 +146,7 @@ Por favor considera apoyar el proyecto patrocinando en {links} y ejecutando post
<value>Eres un patrocinador del proyecto, eres lo máximo 💟!</value>
</data>
<data name="Expiring_Description" xml:space="preserve">
<value>El estado de patrocino ha expirado y estás en un período de gracia. Ejecuta 'sponsor sync {spaced}' y, opcionalmente, habilita la sincronización automática.</value>
<value>El estado de patrocino ha expirado y estás en un período de gracia. Ejecuta 'sponsor sync {0}' y, opcionalmente, habilita la sincronización automática.</value>
</data>
<data name="Expiring_Message" xml:space="preserve">
<value>El estado de patrocino necesita actualización periódica y la sincronización automática no está habilitada.</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@
</resheader>
<data name="Unknown_Description" xml:space="preserve">
<value>Sponsoring projects you depend on ensures they remain active, and that you get the support you need. It's also super affordable and available worldwide!
Please consider supporting the project by sponsoring at {links} and running 'sponsor sync {spaced}' afterwards.</value>
Please consider supporting the project by sponsoring at {0} and running 'sponsor sync {1}' afterwards.</value>
<comment>Unknown sponsor description</comment>
</data>
<data name="Unknown_Message" xml:space="preserve">
Expand All @@ -129,7 +129,7 @@ Please consider supporting the project by sponsoring at {links} and running 'spo
<value>Unknown sponsor status</value>
</data>
<data name="Expired_Description" xml:space="preserve">
<value>Sponsor-only features may be disabled. Please run 'sponsor sync {spaced}' and optionally enable automatic sync.</value>
<value>Sponsor-only features may be disabled. Please run 'sponsor sync {0}' and optionally enable automatic sync.</value>
</data>
<data name="Expired_Message" xml:space="preserve">
<value>Sponsor status has expired and automatic sync has not been enabled.</value>
Expand All @@ -147,7 +147,7 @@ Please consider supporting the project by sponsoring at {links} and running 'spo
<value>You are a sponsor of the project, you rock 💟!</value>
</data>
<data name="Expiring_Description" xml:space="preserve">
<value>Sponsor status has expired and you are in the grace period. Please run 'sponsor sync {spaced}' and optionally enable automatic sync.</value>
<value>Sponsor status has expired and you are in the grace period. Please run 'sponsor sync {0}' and optionally enable automatic sync.</value>
</data>
<data name="Expiring_Message" xml:space="preserve">
<value>Sponsor status needs periodic updating and automatic sync has not been enabled.</value>
Expand Down
Loading

0 comments on commit 9e9773b

Please sign in to comment.