Skip to content
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

[release/8.0.1xx-sr7] Remove the 'Resources' prefix from BundleResource #24015

Merged
merged 6 commits into from
Aug 5, 2024
Merged

[release/8.0.1xx-sr7] Remove the 'Resources' prefix from BundleResource #24015

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5ace711
Remove the 'Resources' prefix from BundleResource
mattleibow Aug 2, 2024
892c095
Update Microsoft.Maui.Controls.SingleProject.targets
mattleibow Aug 2, 2024
6bdaaa0
Update Microsoft.Maui.Controls.SingleProject.targets
mattleibow Aug 5, 2024
05f6b1e
Update Versions.props
PureWeen Aug 5, 2024
bf5b96c
Add a test
mattleibow Aug 5, 2024
2990311
string
mattleibow Aug 5, 2024
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 eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project>
<PropertyGroup>
<!-- The .NET product branding version -->
<ProductVersion>8.0.71</ProductVersion>
<ProductVersion>8.0.72</ProductVersion>
<MajorVersion>8</MajorVersion>
<MinorVersion>0</MinorVersion>
<PatchVersion>71</PatchVersion>
<PatchVersion>72</PatchVersion>
<SdkBandVersion>8.0.100</SdkBandVersion>
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
<!-- Servicing builds have different characteristics for the way dependencies, baselines, and versions are handled. -->
Expand Down
18 changes: 18 additions & 0 deletions ....Tasks/nuget/buildTransitive/netstandard2.0/Microsoft.Maui.Controls.SingleProject.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,24 @@

</Target>

<!--
TEMPORARY workaround for the issue where the resource starts with the Resources/ prefix,
either in the Identity or Link metadata. The fix is to assume that was not intended
since that is how it worked in 8.0.60 and earlier.
See: https://github.com/xamarin/xamarin-macios/issues/20968
-->
<Target Name="_MauiBefore_CollectBundleResources" BeforeTargets="_CollectBundleResources">
<PropertyGroup>
<_MauiOld_ResourcePrefix>$(_ResourcePrefix)</_MauiOld_ResourcePrefix>
<_ResourcePrefix>Resources;$(_ResourcePrefix)</_ResourcePrefix>
</PropertyGroup>
</Target>
<Target Name="_MauiAfter_CollectBundleResources" AfterTargets="_CollectBundleResources">
<PropertyGroup>
<_ResourcePrefix>$(_MauiOld_ResourcePrefix)</_ResourcePrefix>
</PropertyGroup>
</Target>

<!-- Import Maui Single Project property pages -->
<PropertyGroup Condition="'$(MauiDesignTimeTargetsPath)' == ''">
<MauiDesignTimeTargetsPath>$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Maui\Maui.DesignTime.targets</MauiDesignTimeTargetsPath>
Expand Down