[Localization] Localization changes for OneLocBuild - #11395
Merged
Conversation
…ect. This makes it easier to test localized strings used in mtouch, since we don't have to replicate the build for all the resources. This required a few changes to avoid including code in the mtouch tests that already exists in the mtouch executable.
This way the test project can reference the actual mtouch.csproj without causing conflicts due to having two projects with the same name.
tj-devel709
requested review from
emaf,
mandel-macaque,
rolfbjarne and
spouliot
as code owners
April 30, 2021 01:12
rolfbjarne
reviewed
Apr 30, 2021
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dont link", "tests\linker\ios\dont link\dont link.csproj", "{839212D5-C25B-4284-AA96-59C3872B8184}" | ||
| EndProject | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mtouch", "tests\mtouch\mtouch.csproj", "{9A1177F5-16E6-45DE-AA69-DC9924EC39B8}" | ||
| Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mtouchtests", "tests\mtouch\mtouchtests.csproj", "{9A1177F5-16E6-45DE-AA69-DC9924EC39B8}" |
Member
There was a problem hiding this comment.
I've created a separate PR with my changes, to not complicate this one too much: #11400
Member
Author
There was a problem hiding this comment.
Just to make sure I don't mess this up again haha are these the steps I should do?
- land your PR first
- 'git rm -cached' on the files that are in your PR
- fetch and merge main in my branch and push to this PR?
Member
There was a problem hiding this comment.
That's right! You probably don't need step #2, but it shouldn't hurt either.
Comment on lines
+21
to
+24
| <EmbeddedResource Update="MSBStrings.resx"> | ||
| </EmbeddedResource> | ||
| <EmbeddedResource Include="MSBStrings.resx"> | ||
| </EmbeddedResource> |
Member
There was a problem hiding this comment.
I don't think you need the Update + Include entries, since nothing is updated, nor nothing new is included:
Suggested change
| <EmbeddedResource Update="MSBStrings.resx"> | |
| </EmbeddedResource> | |
| <EmbeddedResource Include="MSBStrings.resx"> | |
| </EmbeddedResource> |
Member
Author
There was a problem hiding this comment.
I tried removing them, but the include creates the Xamarin.Localization.MSBuild.MSBStrings.resources and without this, the tests fail when trying to get the english dll. Therefore, I think Update can go away but include needs to stay?
Member
Author
There was a problem hiding this comment.
Or perhaps, I can change the Update for MSBStrings.resx a few lines above these to an Include?
Member
Author
|
Forgot to remove Rolf's changes he put in his PR, but I am going to wait til this build finishes to remove those files! |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results70 tests failed, 37 tests passed.Failed tests
Pipeline on Agent XAMBOT-1105.BigSur' |
Contributor
|
@tj-devel709 fix those files on monday. I merge with main to remove possible conflicts, remember to pull in to your local branch!!! |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results70 tests failed, 37 tests passed.Failed tests
Pipeline on Agent XAMBOT-1103.BigSur' |
Contributor
|
Test run does not look good :( |
Member
Author
|
@mandel-macaque Yeaahhh I noticed, not really sure what's up with it :/ |
Member
|
This is the error: Note the resource name it's complaining about: "Errors.mtouch.resources" which is probably because you changed this line: https://github.com/xamarin/xamarin-macios/pull/11395/files#diff-f27f05df0e0185389a6be051b565792fa4c8141e0a6695cc9e63caa0715afec3R514 |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results3 tests failed, 104 tests passed.Failed tests
Pipeline on Agent XAMBOT-1101.BigSur' |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results2 tests failed, 105 tests passed.Failed tests
Pipeline on Agent XAMBOT-1104.BigSur' |
mandel-macaque
approved these changes
May 5, 2021
Member
Author
|
Adding this issue here: #11454 |
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results4 tests failed, 103 tests passed.Failed tests
Pipeline on Agent XAMBOT-1100.BigSur |
Member
Author
|
Fails 4 tests due to this issue: #11456
|
rolfbjarne
approved these changes
May 6, 2021
Collaborator
❌ [PR Build] Tests failed on Build ❌Tests failed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) Test results4 tests failed, 103 tests passed.Failed tests
Pipeline on Agent XAMBOT-1097.BigSur' |
Collaborator
✅ [PR Build] Tests passed on Build. ✅Tests passed on Build. API diff✅ API Diff from stable View API diffAPI & Generator diff✅ API Diff (from PR only) (no change) 🎉 All 107 tests passed 🎉Pipeline on Agent XAMBOT-1098.BigSur |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Co-Authored by @rolfbjarne
These are the changes to allow MSBuild and Mtouch to use the resx files that we will be receiving back from OneLocBuild.
We should be failing tests since these resx files are not yet translated by the Loc team.
Although most of the tests should not pass, I altered some values in the non-translated resx files (since we will override them anyways) and we can see those values getting picked up in the tests showing that the localization is taking place.