Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

[Xaml] move ValueConverterProvider to Core #890

Merged
merged 2 commits into from
Apr 28, 2017
Merged

[Xaml] move ValueConverterProvider to Core #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
695cd34
[Xaml] move ValueConverterProvider to Core
StephaneDelcroix Apr 28, 2017
be70c36
[docs] fix docs
StephaneDelcroix Apr 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Xamarin.Forms.Core/Xamarin.Forms.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -475,4 +477,7 @@
</PropertyGroup>
<ItemGroup />
<ItemGroup />
<ItemGroup>
<Folder Include="Xaml\" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion ...in.Forms.Xaml/TypeConversionExtensions.cs → ...rms.Core/Xaml/TypeConversionExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

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)
Expand Down
1 change: 0 additions & 1 deletion Xamarin.Forms.Xaml/ValueConverterProvider.cs → ...Forms.Core/Xaml/ValueConverterProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Xamarin.Forms.Xaml;

[assembly:Dependency(typeof(ValueConverterProvider))]

namespace Xamarin.Forms.Xaml
{
class ValueConverterProvider : IValueConverterProvider
Expand Down
2 changes: 0 additions & 2 deletions Xamarin.Forms.Xaml/Xamarin.Forms.Xaml.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
3 changes: 3 additions & 0 deletions docs/Xamarin.Forms.Core/index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@
<Attribute>
<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>
Expand Down
3 changes: 0 additions & 3 deletions docs/Xamarin.Forms.Xaml/index.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@
<Attribute>
<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>
Expand Down