Skip to content

Commit

Permalink
fix: Adjust for invalid embedded resource inclusion
Browse files Browse the repository at this point in the history
(cherry picked from commit 38770ed)
  • Loading branch information
jeromelaban committed Sep 24, 2024
1 parent b618eb8 commit 3a2e3b8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
<CustomToolNamespace>$(RootNamespace)</CustomToolNamespace>
<!-- The 'ManifestResourceName' metadata changes the default manifest naming scheme -->
<ManifestResourceName>$(RootNamespace).%(Filename)</ManifestResourceName>
<LogicalName>$(RootNamespace).%(Filename).resources</LogicalName>
</EmbeddedResource>
<Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
Expand All @@ -29,8 +28,18 @@
</Compile>
</ItemGroup>


<!-- BEGIN UNO SPECIFIC -->
<Target Name="AdjustResources" BeforeTargets="_UnoEmbeddedResourcesInjection">
<!--
Workaround for issue fixed in later uno where existing
embedded resources are overridden incorrectly
https://github.com/unoplatform/uno/pull/16522
-->
<ItemGroup>
<EmbeddedResource Remove="@(EmbeddedResource)" Condition="'%(EmbeddedResource.LogicalName)'==''" />
</ItemGroup>
</Target>

<!-- BEGIN UNO SPECIFIC -->
<PropertyGroup>
<TargetFrameworks>$(TargetFrameworksOverride)</TargetFrameworks>
<NoWarn>$(NoWarn);Uno0001;NU1701</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "7.1.202",
"version": "7.1.203",
"publicReleaseRefSpec": [
"^refs/heads/main$", // we release out of main
"^refs/heads/dev$", // we release out of dev
Expand All @@ -15,4 +15,4 @@
"enabled": false
}
}
}
}

0 comments on commit 3a2e3b8

Please sign in to comment.