Skip to content

Commit ba1b41b

Browse files
kentcbghuntley
authored andcommitted
fix: removed duplicate ComponentModelTypeConverter for WPF (#1433)
1 parent 60a26df commit ba1b41b

4 files changed

Lines changed: 6 additions & 83 deletions

File tree

src/ReactiveUI.Wpf/ComponentModelTypeConverter.cs

Lines changed: 0 additions & 76 deletions
This file was deleted.

src/ReactiveUI.Wpf/ReactiveUI.Wpf.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@
6464
<Compile Include="..\ReactiveUI\Platforms\windows-common\RoutedViewHost.cs" Link="RoutedViewHost.cs" />
6565
<Compile Include="..\ReactiveUI\Platforms\windows-common\ViewModelViewHost.cs" Link="ViewModelViewHost.cs" />
6666
<Compile Include="Attributes.cs" />
67-
<Compile Include="ComponentModelTypeConverter.cs" />
6867
<Compile Include="Registrations.cs" />
6968
<Compile Include="TransitioningContentControl.cs" />
7069
<Compile Include="WpfAutoSuspendHelper.cs" />

src/ReactiveUI/Platforms/net45/ComponentModelTypeConverter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MS-PL license.
33
// See the LICENSE file in the project root for more information.
44

@@ -10,7 +10,7 @@ namespace ReactiveUI
1010
{
1111

1212
/// <summary>
13-
/// This binding type converter uses the built-in WPF component model
13+
/// This binding type converter uses the built-in component model
1414
/// conversions to get a whole bunch of conversions for free. Unfortunately,
1515
/// these are pretty gutted on some other platforms like Silverlight.
1616
/// </summary>
@@ -59,7 +59,7 @@ public bool TryConvert(object from, Type toType, object conversionHint, out obje
5959
result = null;
6060
return false;
6161
} catch (Exception e) {
62-
// Errors from ConvertFrom end up here but wrapped in
62+
// Errors from ConvertFrom end up here but wrapped in
6363
// outer exception. Add more types here as required.
6464
// IndexOutOfRangeException is given when trying to
6565
// convert empty strings with some/all? converters

src/ReactiveUI/Platforms/xamarin-common/ComponentModelTypeConverter.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Licensed to the .NET Foundation under one or more agreements.
1+
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MS-PL license.
33
// See the LICENSE file in the project root for more information.
44

@@ -10,7 +10,7 @@ namespace ReactiveUI
1010
{
1111

1212
/// <summary>
13-
/// This binding type converter uses the built-in WPF component model
13+
/// This binding type converter uses the built-in component model
1414
/// conversions to get a whole bunch of conversions for free. Unfortunately,
1515
/// these are pretty gutted on some other platforms like Silverlight.
1616
/// </summary>
@@ -59,7 +59,7 @@ public bool TryConvert(object from, Type toType, object conversionHint, out obje
5959
result = null;
6060
return false;
6161
} catch (Exception e) {
62-
// Errors from ConvertFrom end up here but wrapped in
62+
// Errors from ConvertFrom end up here but wrapped in
6363
// outer exception. Add more types here as required.
6464
// IndexOutOfRangeException is given when trying to
6565
// convert empty strings with some/all? converters

0 commit comments

Comments
 (0)