Skip to content

Commit 2bc70f4

Browse files
committed
Fix embedded resource filenames
1 parent 434f5cc commit 2bc70f4

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

CommunityToolkit.Mvvm.SourceGenerators/Attributes/NullabilityAttributesGenerator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
6767
private static string LoadAttributeSourceWithMetadataName(string typeFullName)
6868
{
6969
string typeName = typeFullName.Split('.').Last();
70-
string filename = $"CommunityToolkit.Mvvm.SourceGenerators.EmbeddedResources.{typeName}.cs";
70+
string filename = $"{typeName}.cs";
7171

7272
Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filename);
7373
StreamReader reader = new(stream);

CommunityToolkit.Mvvm.SourceGenerators/CommunityToolkit.Mvvm.SourceGenerators.projitems

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,23 @@
1111
<ItemGroup>
1212
<EmbeddedResource Include="$(MSBuildThisFileDirectory)EmbeddedResources\INotifyPropertyChanged.cs">
1313
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
14+
<LogicalName>INotifyPropertyChanged.cs</LogicalName>
1415
</EmbeddedResource>
1516
<EmbeddedResource Include="$(MSBuildThisFileDirectory)EmbeddedResources\NotNullAttribute.cs">
1617
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18+
<LogicalName>NotNullAttribute.cs</LogicalName>
1719
</EmbeddedResource>
1820
<EmbeddedResource Include="$(MSBuildThisFileDirectory)EmbeddedResources\NotNullIfNotNullAttribute.cs">
1921
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
22+
<LogicalName>NotNullIfNotNullAttribute.cs</LogicalName>
2023
</EmbeddedResource>
2124
<EmbeddedResource Include="$(MSBuildThisFileDirectory)EmbeddedResources\ObservableObject.cs">
2225
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
26+
<LogicalName>ObservableObject.cs</LogicalName>
2327
</EmbeddedResource>
2428
<EmbeddedResource Include="$(MSBuildThisFileDirectory)EmbeddedResources\ObservableRecipient.cs">
2529
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30+
<LogicalName>ObservableRecipient.cs</LogicalName>
2631
</EmbeddedResource>
2732
</ItemGroup>
2833
<ItemGroup>

CommunityToolkit.Mvvm.SourceGenerators/ComponentModel/TransitiveMembersGenerator.Execute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ internal static class Execute
3131
public static ClassDeclarationSyntax LoadClassDeclaration(string attributeType)
3232
{
3333
string attributeTypeName = attributeType.Split('.').Last();
34-
string filename = $"CommunityToolkit.Mvvm.SourceGenerators.EmbeddedResources.{attributeTypeName.Replace("Attribute", string.Empty)}.cs";
34+
string filename = $"{attributeTypeName.Replace("Attribute", string.Empty)}.cs";
3535

3636
using Stream stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(filename);
3737
using StreamReader reader = new(stream);

0 commit comments

Comments
 (0)