Skip to content

Allow using ThisAssembly.Resources and ThisAssembly.Strings SxS #225

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2023
Merged

Allow using ThisAssembly.Resources and ThisAssembly.Strings SxS #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/ThisAssembly.Resources/ResourcesGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
var files = context.AdditionalTextsProvider
.Combine(context.AnalyzerConfigOptionsProvider)
.Where(x =>
x.Right.GetOptions(x.Left).TryGetValue("build_metadata.AdditionalFiles.SourceItemType", out var itemType)
&& itemType == "EmbeddedResource")
x.Right.GetOptions(x.Left).TryGetValue("build_metadata.EmbeddedResource.ThisAssemblyResource", out var assemblyResource)
&& bool.TryParse(assemblyResource, out var isAssemblyResource) && isAssemblyResource)
.Where(x => x.Right.GetOptions(x.Left).TryGetValue("build_metadata.EmbeddedResource.Value", out var value) && value != null)
.Select((x, ct) =>
{
Expand Down
5 changes: 3 additions & 2 deletions src/ThisAssembly.Resources/ThisAssembly.Resources.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ItemGroup>
<CompilerVisibleProperty Include="EmbeddedResourceStringExtensions" />

<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemType" />
<CompilerVisibleItemMetadata Include="EmbeddedResource" MetadataName="ThisAssemblyResource" />
<CompilerVisibleItemMetadata Include="EmbeddedResource" MetadataName="Kind" />
<CompilerVisibleItemMetadata Include="EmbeddedResource" MetadataName="Comment" />
<CompilerVisibleItemMetadata Include="EmbeddedResource" MetadataName="Value" />
Expand Down Expand Up @@ -38,7 +38,8 @@
<Area>$([MSBuild]::ValueOrDefault('%(AreaPath)', '').Replace('\', '.').Replace('/', '.'))</Area>
<Value>%(AreaPath)%(FileExtension)</Value>
</EmbeddedResource>
<AdditionalFiles Include="@(EmbeddedResource)" SourceItemType="EmbeddedResource" />
<EmbeddedResource ThisAssemblyResource="true" />
<AdditionalFiles Include="@(EmbeddedResource)" />
</ItemGroup>
</Target>

Expand Down
8 changes: 4 additions & 4 deletions src/ThisAssembly.Strings/StringsGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
var files = context.AdditionalTextsProvider
.Combine(context.AnalyzerConfigOptionsProvider)
.Where(x =>
x.Right.GetOptions(x.Left).TryGetValue("build_metadata.AdditionalFiles.SourceItemType", out var itemType)
&& itemType == "ResourceString")
.Where(x => x.Right.GetOptions(x.Left).TryGetValue("build_metadata.AdditionalFiles.ManifestResourceName", out var value) && value != null)
x.Right.GetOptions(x.Left).TryGetValue("build_metadata.ResxCode.ThisAssemblyStrings", out var resourceString)
&& bool.TryParse(resourceString, out var isResourceString) && isResourceString)
.Where(x => x.Right.GetOptions(x.Left).TryGetValue("build_metadata.ResxCode.ManifestResourceName", out var value) && value != null)
.Select((x, ct) =>
{
x.Right.GetOptions(x.Left).TryGetValue("build_metadata.AdditionalFiles.ManifestResourceName", out var resourceName);
x.Right.GetOptions(x.Left).TryGetValue("build_metadata.ResxCode.ManifestResourceName", out var resourceName);
return (fileName: Path.GetFileName(x.Left.Path), text: x.Left.GetText(ct), resourceName!);
})
.Where(x => x.text != null);
Expand Down
7 changes: 4 additions & 3 deletions src/ThisAssembly.Strings/ThisAssembly.Strings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
DependsOnTargets="PrepareResourceNames">
<ItemGroup>
<ResxCode Include="@(EmbeddedResource)"
ThisAssemblyStrings="true"
Condition="'%(EmbeddedResource.Type)' == 'Resx' And '%(EmbeddedResource.WithCulture)' != 'true' And '%(EmbeddedResource.GenerateResource)' != 'false' And '%(EmbeddedResource.ManifestResourceName)' != ''" />
<AdditionalFiles Include="@(ResxCode -> '%(FullPath)')" SourceItemType="ResourceString" />
<AdditionalFiles Include="@(ResxCode)" />
</ItemGroup>
</Target>

<ItemGroup>
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="SourceItemType" />
<CompilerVisibleItemMetadata Include="AdditionalFiles" MetadataName="ManifestResourceName" />
<CompilerVisibleItemMetadata Include="ResxCode" MetadataName="ThisAssemblyStrings" />
<CompilerVisibleItemMetadata Include="ResxCode" MetadataName="ManifestResourceName" />
</ItemGroup>

<Import Condition="'$(ThisAssemblyPrerequisitesImported)' != 'true'" Project="ThisAssembly.Prerequisites.targets" />
Expand Down