Skip to content

Commit

Permalink
[docs] Stop using the term 'Xamarin'. (#20451)
Browse files Browse the repository at this point in the history
Stop using the term 'Xamarin' in our error messages.

🙈 🙊 🙉

Note: this may not be complete, since we compute error messages in numerous
places, and those aren't fixed here (if there are any that still says
'Xamarin' in any way).

---------

Co-authored-by: Michael Cummings (MSFT) <[email protected]>
  • Loading branch information
rolfbjarne and mcumming committed Apr 18, 2024
1 parent ee31d72 commit fcabca0
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 144 deletions.
9 changes: 4 additions & 5 deletions msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@
<data name="W0020" xml:space="preserve">
<value>Supported iPhone orientations are not matched pairs
</value>
<comment>The iPhone orientation settings do not match iPad, see: https://xamarin.github.io/bugzilla-archives/85/850/bug.html</comment>
</data>

<data name="W0021" xml:space="preserve">
Expand All @@ -117,7 +116,6 @@
<data name="W0022" xml:space="preserve">
<value>Supported iPad orientations are not matched pairs
</value>
<comment>The iPad orientation settings do not match iPhone, see: https://xamarin.github.io/bugzilla-archives/85/850/bug.html</comment>
</data>

<data name="E0023" xml:space="preserve">
Expand Down Expand Up @@ -213,7 +211,7 @@
</data>

<data name="E0053" xml:space="preserve">
<value>Target architecture ARMv6 is no longer supported in Xamarin.iOS. Please select a supported architecture.
<value>Target architecture ARMv6 is no longer supported. Please select a supported architecture.
</value>
</data>

Expand Down Expand Up @@ -881,15 +879,15 @@
</data>

<data name="E0183" xml:space="preserve">
<value>An error occurred while trying to verify the compatibility between Xcode and Xamarin.iOS</value>
<value>An error occurred while trying to verify the compatibility between Xcode and the .NET SDK</value>
</data>

<data name="E0184" xml:space="preserve">
<value>The project was built with a version of Xcode ({0}) that is not compatible which may result in unexpected warnings or errors. Please install Xcode '{1}' or visit the documentation to learn more.</value>
</data>

<data name="E0185" xml:space="preserve">
<value>An error occurred while trying to verify the compatibility between Xcode and Xamarin.iOS. Details: {0}
<value>An error occurred while trying to verify the compatibility between Xcode and the .NET SDK. Details: {0}
</value>
</data>

Expand Down Expand Up @@ -1260,6 +1258,7 @@

<!-- E7068: not in use anymore -->

<!-- legacy only error -->
<data name="E7069" xml:space="preserve">
<value>Xamarin.iOS 14+ does not support watchOS 1 apps. Please migrate your project to watchOS 2+.</value>
</data>
Expand Down
9 changes: 0 additions & 9 deletions src/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions src/Resources.resx
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,6 @@
<value>A target framework (--target-framework) must be specified.</value>
</data>

<data name="BI0087" xml:space="preserve">
<value>Xamarin.Mac Classic binding projects are not supported anymore. Please upgrade the binding project to a Xamarin.Mac Unified binding project.</value>
</data>

<data name="BI0088" xml:space="preserve">
<value>Internal error: don't know how to create ref/out (input) code for {0} in {1}. Please file a bug report with a test case (https://github.com/xamarin/xamarin-macios/issues/new).</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion tests/mtouch/MTouch.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1804,7 +1804,7 @@ static void Main () {

mtouch.FastDev = true;
mtouch.AssertExecute (MTouchAction.BuildDev, "first build");
mtouch.AssertWarning (127, "Incremental builds have been disabled because this version of Xamarin.iOS does not support incremental builds in projects that include more than one third-party binding libraries.");
mtouch.AssertWarning (127, "Incremental builds have been disabled because incremental builds are currently not supported in projects that include more than one third-party binding library.");
}
}

Expand Down
4 changes: 2 additions & 2 deletions tests/mtouch/RegistrarTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,8 @@ class C : NSObject {
mtouch.Linker = MTouchLinker.DontLink;
mtouch.Registrar = MTouchRegistrar.Static;
mtouch.AssertExecuteFailure ();
mtouch.AssertError (4141, "Cannot register the selector 'retain' on the member 'C.Retain' because Xamarin.iOS implicitly registers this selector.", "testApp.cs", 5);
mtouch.AssertError (4141, "Cannot register the selector 'release' on the member 'C.Release' because Xamarin.iOS implicitly registers this selector.", "testApp.cs", 8);
mtouch.AssertError (4141, "Cannot register the selector 'retain' on the member 'C.Retain' because this selector is already implicitly registered.", "testApp.cs", 5);
mtouch.AssertError (4141, "Cannot register the selector 'release' on the member 'C.Release' because this selector is already implicitly registered.", "testApp.cs", 8);
mtouch.AssertErrorCount (2);
mtouch.AssertNoWarnings ();
}
Expand Down
84 changes: 2 additions & 82 deletions tools/mtouch/Errors.designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

8 comments on commit fcabca0

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

@vs-mobiletools-engineering-service2

This comment was marked as outdated.

Please sign in to comment.