From 8a8b6bc0074d0ae5c69183fa4f48c8a34881527f Mon Sep 17 00:00:00 2001
From: Bertrand Le Roy <beleroy@microsoft.com>
Date: Tue, 28 Nov 2017 11:50:18 -0800
Subject: Replace strongly-typed resource usage with string.Format calls

This removes the requirement to use the netfx-System.StringResources package to codegen strongly-typed helpers, and fixes a build problem when the projects are included in other solutions. It is a workaround.
---
 Xamarin.PropertyEditing.Mac/Controls/BaseNumericEditorControl.cs  | 2 +-
 .../Controls/BaseRectangleEditorControl.cs                        | 8 ++++----
 Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs      | 6 +-----
 Xamarin.PropertyEditing.Mac/Controls/CGPointEditorControl.cs      | 4 ++--
 Xamarin.PropertyEditing.Mac/Controls/CGSizeEditorControl.cs       | 4 ++--
 Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs        | 4 ++--
 Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs    | 4 ++--
 Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs         | 4 ++--
 Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs       | 2 +-
 Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs                | 4 ++--
 Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj    | 1 -
 Xamarin.PropertyEditing/ViewModels/EnumPropertyViewModel.cs       | 2 +-
 Xamarin.PropertyEditing/ViewModels/PredefinedValuesViewModel.cs   | 2 +-
 Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj            | 1 -
 14 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/Xamarin.PropertyEditing.Mac/Controls/BaseNumericEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BaseNumericEditorControl.cs
index 63f09f9..942742f 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BaseNumericEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BaseNumericEditorControl.cs
@@ -69,7 +69,7 @@ namespace Xamarin.PropertyEditing.Mac
 		protected override void UpdateAccessibilityValues ()
 		{
 			NumericEditor.AccessibilityEnabled = NumericEditor.Enabled;
-			NumericEditor.AccessibilityTitle = Strings.AccessibilityNumeric (ViewModel.Property.Name);
+			NumericEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityNumeric, ViewModel.Property.Name);
 		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs
index 0eef688..e296278 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BaseRectangleEditorControl.cs
@@ -98,16 +98,16 @@ namespace Xamarin.PropertyEditing.Mac
 		protected override void UpdateAccessibilityValues ()
 		{
 			XEditor.AccessibilityEnabled = XEditor.Enabled;
-			XEditor.AccessibilityTitle = Strings.AccessibilityXEditor (ViewModel.Property.Name);
+			XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityXEditor, ViewModel.Property.Name);
 
 			YEditor.AccessibilityEnabled = YEditor.Enabled;
-			YEditor.AccessibilityTitle = Strings.AccessibilityYEditor (ViewModel.Property.Name);
+			YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityYEditor, ViewModel.Property.Name);
 
 			WidthEditor.AccessibilityEnabled = WidthEditor.Enabled;
-			WidthEditor.AccessibilityTitle = Strings.AccessibilityWidthEditor (ViewModel.Property.Name);
+			WidthEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityWidthEditor, ViewModel.Property.Name);
 
 			HeightEditor.AccessibilityEnabled = HeightEditor.Enabled;
-			HeightEditor.AccessibilityTitle = Strings.AccessibilityHeightEditor (ViewModel.Property.Name);
+			HeightEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityHeightEditor, ViewModel.Property.Name);
 		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs
index eb663c2..b4f2fe9 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/BooleanEditorControl.cs
@@ -1,9 +1,5 @@
-using System;
 using System.Collections;
-using System.Diagnostics;
 using AppKit;
-using Foundation;
-using ObjCRuntime;
 using Xamarin.PropertyEditing.Mac.Resources;
 using Xamarin.PropertyEditing.ViewModels;
 
@@ -79,7 +75,7 @@ namespace Xamarin.PropertyEditing.Mac
 		protected override void UpdateAccessibilityValues ()
 		{
 			BooleanEditor.AccessibilityEnabled = BooleanEditor.Enabled;
-			BooleanEditor.AccessibilityTitle = Strings.AccessibilityBoolean (ViewModel.Property.Name);
+			BooleanEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityBoolean, ViewModel.Property.Name);
 		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CGPointEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CGPointEditorControl.cs
index 05c8e52..5691de4 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CGPointEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CGPointEditorControl.cs
@@ -39,10 +39,10 @@ namespace Xamarin.PropertyEditing.Mac
 		protected override void UpdateAccessibilityValues ()
 		{
 			XEditor.AccessibilityEnabled = XEditor.Enabled;
-			XEditor.AccessibilityTitle = Strings.AccessibilityXEditor (ViewModel.Property.Name);
+			XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityXEditor, ViewModel.Property.Name);
 
 			YEditor.AccessibilityEnabled = YEditor.Enabled;
-			YEditor.AccessibilityTitle = Strings.AccessibilityYEditor (ViewModel.Property.Name);
+			YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityYEditor, ViewModel.Property.Name);
 		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/CGSizeEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/CGSizeEditorControl.cs
index 33d8897..472a81e 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/CGSizeEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/CGSizeEditorControl.cs
@@ -39,10 +39,10 @@ namespace Xamarin.PropertyEditing.Mac
 		protected override void UpdateAccessibilityValues ()
 		{
 			XEditor.AccessibilityEnabled = XEditor.Enabled;
-			XEditor.AccessibilityTitle = Strings.AccessibilityWidthEditor (ViewModel.Property.Name);
+			XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityWidthEditor, ViewModel.Property.Name);
 
 			YEditor.AccessibilityEnabled = YEditor.Enabled;
-			YEditor.AccessibilityTitle = Strings.AccessibilityHeightEditor (ViewModel.Property.Name);
+			YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityHeightEditor, ViewModel.Property.Name);
 		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs
index c7ee70c..433288b 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PointEditorControl.cs
@@ -25,10 +25,10 @@ namespace Xamarin.PropertyEditing.Mac
 		protected override void UpdateAccessibilityValues ()
 		{
 			XEditor.AccessibilityEnabled = XEditor.Enabled;
-			XEditor.AccessibilityTitle = Strings.AccessibilityXEditor (ViewModel.Property.Name);
+			XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityXEditor, ViewModel.Property.Name);
 
 			YEditor.AccessibilityEnabled = YEditor.Enabled;
-			YEditor.AccessibilityTitle = Strings.AccessibilityYEditor (ViewModel.Property.Name);
+			YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityYEditor, ViewModel.Property.Name);
 		}
 	}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs
index 98b7e5f..708289b 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/PredefinedValuesEditor.cs
@@ -146,10 +146,10 @@ namespace Xamarin.PropertyEditing.Mac
 		{
 			if (EditorViewModel.IsConstrainedToPredefined) {
 				popUpButton.AccessibilityEnabled = popUpButton.Enabled;
-				popUpButton.AccessibilityTitle = Strings.AccessibilityCombobox (ViewModel.Property.Name);
+				popUpButton.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityCombobox, ViewModel.Property.Name);
 			} else {
 				comboBox.AccessibilityEnabled = comboBox.Enabled;
-				comboBox.AccessibilityTitle = Strings.AccessibilityCombobox (ViewModel.Property.Name);
+				comboBox.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityCombobox, ViewModel.Property.Name);
 			}
 		}
 	}
diff --git a/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs
index a59c44e..428ac6b 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/SizeEditorControl.cs
@@ -24,8 +24,8 @@ namespace Xamarin.PropertyEditing.Mac
 
 		protected override void UpdateAccessibilityValues ()
 		{
-			XEditor.AccessibilityTitle = Strings.AccessibilityWidthEditor (ViewModel.Property.Name);
-			YEditor.AccessibilityTitle = Strings.AccessibilityHeightEditor (ViewModel.Property.Name);
+			XEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityWidthEditor, ViewModel.Property.Name);
+			YEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityHeightEditor, ViewModel.Property.Name);
 		}
 	}
 
diff --git a/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs b/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs
index c23e524..5769ba5 100644
--- a/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs
+++ b/Xamarin.PropertyEditing.Mac/Controls/StringEditorControl.cs
@@ -69,7 +69,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 		protected override void UpdateAccessibilityValues ()
 		{
-			StringEditor.AccessibilityTitle = Strings.AccessibilityString (ViewModel.Property.Name);
+			StringEditor.AccessibilityTitle = string.Format (LocalizationResources.AccessibilityString, ViewModel.Property.Name);
 		}
 	}
 }
diff --git a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
index 943afc6..09f9a70 100644
--- a/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
+++ b/Xamarin.PropertyEditing.Mac/PropertyEditorPanel.cs
@@ -99,7 +99,7 @@ namespace Xamarin.PropertyEditing.Mac
 
 			propertyFilter = new NSSearchField (new CGRect (10, Frame.Height - 25, 170, 24)) {
 				TranslatesAutoresizingMaskIntoConstraints = false,
-				PlaceholderString = Strings.PropertyFilterLabel,
+				PlaceholderString = LocalizationResources.PropertyFilterLabel,
 				ControlSize = NSControlSize.Regular,
 			};
 			AddSubview (propertyFilter);
@@ -110,7 +110,7 @@ namespace Xamarin.PropertyEditing.Mac
 				TextColor = NSColor.Black,
 				Editable = false,
 				Bezeled = false,
-				StringValue = Strings.ArrangeByLabel,
+				StringValue = LocalizationResources.ArrangeByLabel,
 			};
 
 			propertyArrangeMode = new NSComboBox (new CGRect (320, Frame.Height - 25, 153, 24)) {
diff --git a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
index b491216..2c1eb47 100644
--- a/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
+++ b/Xamarin.PropertyEditing.Mac/Xamarin.PropertyEditing.Mac.csproj
@@ -109,5 +109,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
-  <Import Project="..\packages\netfx-System.StringResources.3.0.14\build\netfx-System.StringResources.targets" Condition="Exists('..\packages\netfx-System.StringResources.3.0.14\build\netfx-System.StringResources.targets')" />
 </Project>
diff --git a/Xamarin.PropertyEditing/ViewModels/EnumPropertyViewModel.cs b/Xamarin.PropertyEditing/ViewModels/EnumPropertyViewModel.cs
index cf82e38..0929fc4 100644
--- a/Xamarin.PropertyEditing/ViewModels/EnumPropertyViewModel.cs
+++ b/Xamarin.PropertyEditing/ViewModels/EnumPropertyViewModel.cs
@@ -33,7 +33,7 @@ namespace Xamarin.PropertyEditing.ViewModels
 			{
 				TValue realValue;
 				if (!Enum.TryParse (value, out realValue)) {
-					SetError (Strings.UnableToParseValue (value));
+					SetError (string.Format (LocalizationResources.UnableToParseValue, value));
 					return;
 				}
 
diff --git a/Xamarin.PropertyEditing/ViewModels/PredefinedValuesViewModel.cs b/Xamarin.PropertyEditing/ViewModels/PredefinedValuesViewModel.cs
index d24177f..3d20964 100644
--- a/Xamarin.PropertyEditing/ViewModels/PredefinedValuesViewModel.cs
+++ b/Xamarin.PropertyEditing/ViewModels/PredefinedValuesViewModel.cs
@@ -35,7 +35,7 @@ namespace Xamarin.PropertyEditing.ViewModels
 				TValue realValue;
 				if (!this.predefinedValues.PredefinedValues.TryGetValue (value, out realValue)) {
 					if (this.predefinedValues.IsConstrainedToPredefined) {
-						SetError (Strings.InvalidValue (value)); 
+						SetError (string.Format (LocalizationResources.InvalidValue, value)); 
 						return;
 					}
 
diff --git a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
index e7a95a8..300f939 100644
--- a/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
+++ b/Xamarin.PropertyEditing/Xamarin.PropertyEditing.csproj
@@ -145,5 +145,4 @@
     <Folder Include="Themes\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\netfx-System.StringResources.3.0.14\build\netfx-System.StringResources.targets" Condition="Exists('..\packages\netfx-System.StringResources.3.0.14\build\netfx-System.StringResources.targets')" />
 </Project>
\ No newline at end of file
-- 
cgit v1.2.3