Skip to content

Commit 1ef5a92

Browse files
rolfbjarneCopilot
andcommitted
[msbuild] Fix Xcode warning wording
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent f48096e commit 1ef5a92

3 files changed

Lines changed: 12 additions & 12 deletions

File tree

msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,19 +1629,19 @@
16291629
</data>
16301630

16311631
<data name="W7171" xml:space="preserve">
1632-
<value>The environment variable '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode.</value>
1632+
<value>The environment variable '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode.</value>
16331633
</data>
16341634

16351635
<data name="W7172" xml:space="preserve">
1636-
<value>The environment variable '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode.</value>
1636+
<value>The environment variable '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode.</value>
16371637
</data>
16381638

16391639
<data name="W7173" xml:space="preserve">
1640-
<value>The settings file '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode.</value>
1640+
<value>The settings file '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode.</value>
16411641
</data>
16421642

16431643
<data name="W7174" xml:space="preserve">
1644-
<value>The settings file '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode.</value>
1644+
<value>The settings file '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode.</value>
16451645
</data>
16461646

16471647
<data name="E7175" xml:space="preserve">

msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,16 +151,16 @@ bool ExecuteImpl ()
151151

152152
if (appleSdkSettings.SystemHasEnvironmentVariable) {
153153
if (isNet11OrNewer) {
154-
Log.LogWarning (MSBStrings.W7172 /* The environment variable '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode. */, XcodeLocator.EnvironmentVariableName);
154+
Log.LogWarning (MSBStrings.W7172 /* The environment variable '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode. */, XcodeLocator.EnvironmentVariableName);
155155
} else {
156-
Log.LogWarning (MSBStrings.W7171 /* The environment variable '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode. */, XcodeLocator.EnvironmentVariableName);
156+
Log.LogWarning (MSBStrings.W7171 /* The environment variable '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode. */, XcodeLocator.EnvironmentVariableName);
157157
}
158158
}
159159
foreach (var file in appleSdkSettings.SystemExistingSettingsFiles) {
160160
if (isNet11OrNewer) {
161-
Log.LogWarning (MSBStrings.W7174 /* The settings file '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode. */, file);
161+
Log.LogWarning (MSBStrings.W7174 /* The settings file '{0}' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode. */, file);
162162
} else {
163-
Log.LogWarning (MSBStrings.W7173 /* The settings file '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode. */, file);
163+
Log.LogWarning (MSBStrings.W7173 /* The settings file '{0}' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode. */, file);
164164
}
165165
}
166166

tests/dotnet/UnitTests/Extensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -131,13 +131,13 @@ public static bool IsFilteredWarning (BuildLogEvent evt, ApplePlatform platform,
131131
return true;
132132

133133
if (filterXcodeLocation) {
134-
if (v.Contains ("The environment variable 'MD_APPLE_SDK_ROOT' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode."))
134+
if (v.Contains ("The environment variable 'MD_APPLE_SDK_ROOT' is deprecated, and will be ignored. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode."))
135135
return true;
136-
if (v.Contains ("The environment variable 'MD_APPLE_SDK_ROOT' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode."))
136+
if (v.Contains ("The environment variable 'MD_APPLE_SDK_ROOT' is deprecated, and will be ignored in .NET 11+. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode."))
137137
return true;
138-
if (Regex.IsMatch (v, @"The settings file '/.*/Library/Preferences/maui/Settings\.plist' is deprecated, and will be ignored\. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode\."))
138+
if (Regex.IsMatch (v, @"The settings file '/.*/Library/Preferences/maui/Settings\.plist' is deprecated, and will be ignored\. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode\."))
139139
return true;
140-
if (Regex.IsMatch (v, @"The settings file '/.*/Library/Preferences/Xamarin/Settings\.plist' is deprecated, and will be ignored\. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use another Xcode than the system's current default version of Xcode\."))
140+
if (Regex.IsMatch (v, @"The settings file '/.*/Library/Preferences/Xamarin/Settings\.plist' is deprecated, and will be ignored\. Use the 'DEVELOPER_DIR' environment variable or the 'XcodeLocation' MSBuild property to use an Xcode other than the system's current default Xcode\."))
141141
return true;
142142
}
143143

0 commit comments

Comments
 (0)