diff options
| -rw-r--r-- | Xamarin.Forms.Core/Xamarin.Forms.Core.csproj | 5 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs (renamed from Xamarin.Forms.Xaml/TypeConversionExtensions.cs) | 2 | ||||
| -rw-r--r-- | Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs (renamed from Xamarin.Forms.Xaml/ValueConverterProvider.cs) | 1 | ||||
| -rw-r--r-- | Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj | 2 | ||||
| -rw-r--r-- | docs/Xamarin.Forms.Core/index.xml | 3 | ||||
| -rw-r--r-- | docs/Xamarin.Forms.Xaml/index.xml | 3 |
6 files changed, 9 insertions, 7 deletions
diff --git a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj index 1184e012..385ab4c7 100644 --- a/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj +++ b/Xamarin.Forms.Core/Xamarin.Forms.Core.csproj @@ -460,6 +460,8 @@ <Compile Include="ITextElement.cs" /> <Compile Include="TextElement.cs" /> <Compile Include="Internals\ResourceLoader.cs" /> + <Compile Include="Xaml\TypeConversionExtensions.cs" /> + <Compile Include="Xaml\ValueConverterProvider.cs" /> </ItemGroup> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" /> <ItemGroup> @@ -475,4 +477,7 @@ </PropertyGroup> <ItemGroup /> <ItemGroup /> + <ItemGroup> + <Folder Include="Xaml\" /> + </ItemGroup> </Project> diff --git a/Xamarin.Forms.Xaml/TypeConversionExtensions.cs b/Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs index 97d3a082..09df9a24 100644 --- a/Xamarin.Forms.Xaml/TypeConversionExtensions.cs +++ b/Xamarin.Forms.Core/Xaml/TypeConversionExtensions.cs @@ -35,7 +35,7 @@ using Xamarin.Forms.Xaml.Internals; namespace Xamarin.Forms.Xaml { - internal static class TypeConversionExtensions + static class TypeConversionExtensions { internal static object ConvertTo(this object value, Type toType, Func<ParameterInfo> pinfoRetriever, IServiceProvider serviceProvider) diff --git a/Xamarin.Forms.Xaml/ValueConverterProvider.cs b/Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs index 57570803..ef5edc98 100644 --- a/Xamarin.Forms.Xaml/ValueConverterProvider.cs +++ b/Xamarin.Forms.Core/Xaml/ValueConverterProvider.cs @@ -5,7 +5,6 @@ using Xamarin.Forms; using Xamarin.Forms.Xaml; [assembly:Dependency(typeof(ValueConverterProvider))] - namespace Xamarin.Forms.Xaml { class ValueConverterProvider : IValueConverterProvider diff --git a/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj b/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj index 2b9d57de..8a53abf1 100644 --- a/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj +++ b/Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj @@ -58,7 +58,6 @@ <Compile Include="XmlnsHelper.cs" /> <Compile Include="IExpressionParser.cs" /> <Compile Include="MarkupExtensionParser.cs" /> - <Compile Include="TypeConversionExtensions.cs" /> <Compile Include="IDictionaryExtensions.cs" /> <Compile Include="MarkupExtensions\NullExtension.cs" /> <Compile Include="MarkupExtensions\ReferenceExtension.cs" /> @@ -76,7 +75,6 @@ <Compile Include="MarkupExtensions\BindingExtension.cs" /> <Compile Include="MarkupExtensions\StaticResourceExtension.cs" /> <Compile Include="MarkupExtensions\DynamicResourceExtension.cs" /> - <Compile Include="ValueConverterProvider.cs" /> <Compile Include="FillResourceDictionariesVisitor.cs" /> <Compile Include="ExpandMarkupsVisitor.cs" /> <Compile Include="XamlCompilationAttribute.cs" /> diff --git a/docs/Xamarin.Forms.Core/index.xml b/docs/Xamarin.Forms.Core/index.xml index 73ca277f..4531ee11 100644 --- a/docs/Xamarin.Forms.Core/index.xml +++ b/docs/Xamarin.Forms.Core/index.xml @@ -120,6 +120,9 @@ <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName> </Attribute> <Attribute> + <AttributeName>Xamarin.Forms.Dependency(typeof(Xamarin.Forms.Xaml.ValueConverterProvider))</AttributeName> + </Attribute> + <Attribute> <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName> </Attribute> </Attributes> diff --git a/docs/Xamarin.Forms.Xaml/index.xml b/docs/Xamarin.Forms.Xaml/index.xml index 18fecba6..a40dd432 100644 --- a/docs/Xamarin.Forms.Xaml/index.xml +++ b/docs/Xamarin.Forms.Xaml/index.xml @@ -48,9 +48,6 @@ <AttributeName>System.Runtime.Versioning.TargetFramework(".NETPortable,Version=v4.5,Profile=Profile259", FrameworkDisplayName=".NET Portable Subset")</AttributeName> </Attribute> <Attribute> - <AttributeName>Xamarin.Forms.Dependency(typeof(Xamarin.Forms.Xaml.ValueConverterProvider))</AttributeName> - </Attribute> - <Attribute> <AttributeName>Xamarin.Forms.Internals.Preserve</AttributeName> </Attribute> <Attribute> |