From 829452ca27cabe8d1bb22450e5cf2d0f352318e0 Mon Sep 17 00:00:00 2001
From: memu8 <66331238+memu8@users.noreply.github.com>
Date: Mon, 20 Jul 2020 16:17:41 -0500
Subject: [PATCH] fixes #11471 #11472
---
.../ErrorMessages.Designer.cs | 144 ++++++++++++++++--
.../Xamarin.Forms.Build.Tasks.csproj | 2 +-
.../Xamarin.Forms.ControlGallery.iOS.csproj | 3 +-
.../{CultureInfo.cs => ILocalize.cs} | 0
4 files changed, 133 insertions(+), 16 deletions(-)
rename Xamarin.Forms.Controls/GalleryPages/DateTimePickerGalleries/{CultureInfo.cs => ILocalize.cs} (100%)
diff --git a/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs b/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs
index 3a245de220f..bbda8f5015b 100644
--- a/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs
+++ b/Xamarin.Forms.Build.Tasks/ErrorMessages.Designer.cs
@@ -10,35 +10,48 @@
namespace Xamarin.Forms.Build.Tasks {
using System;
- using System.Reflection;
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class ErrorMessages {
- private static System.Resources.ResourceManager resourceMan;
+ private static global::System.Resources.ResourceManager resourceMan;
- private static System.Globalization.CultureInfo resourceCulture;
+ private static global::System.Globalization.CultureInfo resourceCulture;
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal ErrorMessages() {
}
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static System.Resources.ResourceManager ResourceManager {
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
get {
- if (object.Equals(null, resourceMan)) {
- System.Resources.ResourceManager temp = new System.Resources.ResourceManager("Xamarin.Forms.Build.Tasks.ErrorMessages", typeof(ErrorMessages).Assembly);
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xamarin.Forms.Build.Tasks.ErrorMessages", typeof(ErrorMessages).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- internal static System.Globalization.CultureInfo Culture {
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -47,210 +60,315 @@ internal static System.Globalization.CultureInfo Culture {
}
}
+ ///
+ /// Looks up a localized string similar to No Add() method defined on "{0}{1}"..
+ ///
internal static string AdderMissing {
get {
return ResourceManager.GetString("AdderMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Binding: Indexer did not contain arguments..
+ ///
internal static string BindingIndexerEmpty {
get {
return ResourceManager.GetString("BindingIndexerEmpty", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Binding: Indexer did not contain closing bracket..
+ ///
internal static string BindingIndexerNotClosed {
get {
return ResourceManager.GetString("BindingIndexerNotClosed", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Binding: "{0}" cannot be parsed as an index for a "{1}"..
+ ///
internal static string BindingIndexerParse {
get {
return ResourceManager.GetString("BindingIndexerParse", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Binding: Unsupported indexer index type: "{0}"..
+ ///
internal static string BindingIndexerTypeUnsupported {
get {
return ResourceManager.GetString("BindingIndexerTypeUnsupported", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Binding: Property "{0}" not found on "{1}"..
+ ///
internal static string BindingPropertyNotFound {
get {
return ResourceManager.GetString("BindingPropertyNotFound", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Missing a "public static Get{0}" method or a public instance property getter for the attached property "{1}.{0}Property"..
+ ///
internal static string BPMissingGetter {
get {
return ResourceManager.GetString("BPMissingGetter", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to The name of the BindableProperty {0} does not end with "Property".
+ ///
internal static string BPName {
get {
return ResourceManager.GetString("BPName", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Missing default constructor for "{0}"..
+ ///
internal static string ConstructorDefaultMissing {
get {
return ResourceManager.GetString("ConstructorDefaultMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Missing constructor for "{0}" with matching x:Arguments..
+ ///
internal static string ConstructorXArgsMissing {
get {
return ResourceManager.GetString("ConstructorXArgsMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Cannot set the content of "{0}" as it doesn't have a [ContentProperty] attribute..
+ ///
internal static string ContentPropertyAttributeMissing {
get {
return ResourceManager.GetString("ContentPropertyAttributeMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Cannot convert value "{0}" to "{1}"..
+ ///
internal static string Conversion {
get {
return ResourceManager.GetString("Conversion", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Enum value not found for "{0}"..
+ ///
internal static string EnumValueMissing {
get {
return ResourceManager.GetString("EnumValueMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Invalid Xaml "{0}"..
+ ///
internal static string InvalidXaml {
get {
return ResourceManager.GetString("InvalidXaml", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Markup expression not closed..
+ ///
internal static string MarkupNotClosed {
get {
return ResourceManager.GetString("MarkupNotClosed", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Error while parsing markup expression..
+ ///
internal static string MarkupParsingFailed {
get {
return ResourceManager.GetString("MarkupParsingFailed", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to No property, BindableProperty, or event found for "{0}", or mismatching type between value and property..
+ ///
internal static string MemberResolution {
get {
return ResourceManager.GetString("MemberResolution", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to No static method found for "{0}::{1} ({2})"..
+ ///
internal static string MethodStaticMissing {
get {
return ResourceManager.GetString("MethodStaticMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to EventHandler "{0}" with correct signature not found in type "{1}"..
+ ///
internal static string MissingEventHandler {
get {
return ResourceManager.GetString("MissingEventHandler", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to An element with the name "{0}" already exists in this NameScope..
+ ///
internal static string NamescopeDuplicate {
get {
return ResourceManager.GetString("NamescopeDuplicate", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Missing mandatory property "{0}" on "{1}"..
+ ///
internal static string PropertyMissing {
get {
return ResourceManager.GetString("PropertyMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Cannot resolve property "{0}" on type "{1} (property missing, or missing accessors)"..
+ ///
internal static string PropertyResolution {
get {
return ResourceManager.GetString("PropertyResolution", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to "A resource with the key "{0}" is already present in the ResourceDictionary..
+ ///
internal static string ResourceDictDuplicateKey {
get {
return ResourceManager.GetString("ResourceDictDuplicateKey", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Resources in ResourceDictionary require a x:Key attribute..
+ ///
internal static string ResourceDictMissingKey {
get {
return ResourceManager.GetString("ResourceDictMissingKey", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Resource "{0}" not found..
+ ///
internal static string ResourceMissing {
get {
return ResourceManager.GetString("ResourceMissing", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Multi-valued enums are not valid on sbyte enum types..
+ ///
internal static string SByteEnums {
get {
return ResourceManager.GetString("SByteEnums", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to StyleSheet require either a Source or a content..
+ ///
internal static string StyleSheetNoSourceOrContent {
get {
return ResourceManager.GetString("StyleSheetNoSourceOrContent", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Source property is not a string literal..
+ ///
internal static string StyleSheetSourceNotALiteral {
get {
return ResourceManager.GetString("StyleSheetSourceNotALiteral", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to StyleSheet can not have both a Source and a content..
+ ///
internal static string StyleSheetSourceOrContent {
get {
return ResourceManager.GetString("StyleSheetSourceOrContent", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Style property or Content is not a string literal..
+ ///
internal static string StyleSheetStyleNotALiteral {
get {
return ResourceManager.GetString("StyleSheetStyleNotALiteral", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Cannot resolve type "{0}"..
+ ///
internal static string TypeResolution {
get {
return ResourceManager.GetString("TypeResolution", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to x:DataType expects a string literal, an {{x:Type}} markup or {{x:Nul}l}..
+ ///
internal static string XDataTypeSyntax {
get {
return ResourceManager.GetString("XDataTypeSyntax", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Undeclared xmlns prefix "{0}"..
+ ///
internal static string XmlnsUndeclared {
get {
return ResourceManager.GetString("XmlnsUndeclared", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to x:Static: unable to find a public -- or accessible internal -- static field, static property, const or enum value named "{0}" in "{1}"..
+ ///
internal static string XStaticResolution {
get {
return ResourceManager.GetString("XStaticResolution", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Syntax for x:Static is "[Member=][prefix:]typeName.staticMemberName"..
+ ///
internal static string XStaticSyntax {
get {
return ResourceManager.GetString("XStaticSyntax", resourceCulture);
diff --git a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
index 23bf35f9f37..e959560e2c8 100644
--- a/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
+++ b/Xamarin.Forms.Build.Tasks/Xamarin.Forms.Build.Tasks.csproj
@@ -71,7 +71,7 @@
-
+
diff --git a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
index 6667ba0384d..da94635079e 100644
--- a/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
+++ b/Xamarin.Forms.ControlGallery.iOS/Xamarin.Forms.ControlGallery.iOS.csproj
@@ -5,7 +5,7 @@
Debug
iPhone
- iPhoneSimulator
+ $(iOSPlatform)
{C7131F14-274F-4B55-ACA9-E81731AD012F}
{FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
Exe
@@ -146,7 +146,6 @@
-
diff --git a/Xamarin.Forms.Controls/GalleryPages/DateTimePickerGalleries/CultureInfo.cs b/Xamarin.Forms.Controls/GalleryPages/DateTimePickerGalleries/ILocalize.cs
similarity index 100%
rename from Xamarin.Forms.Controls/GalleryPages/DateTimePickerGalleries/CultureInfo.cs
rename to Xamarin.Forms.Controls/GalleryPages/DateTimePickerGalleries/ILocalize.cs