Skip to content

Commit a5f20e0

Browse files
author
Sébastien Geiser
committed
Compilation OK
1 parent 39112c7 commit a5f20e0

File tree

7 files changed

+26
-82
lines changed

7 files changed

+26
-82
lines changed

‎CSharpRegexTools4Npp/CSharpRegexTools4Npp.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
<HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
7070
</Reference>
7171
<Reference Include="Microsoft.CSharp" />
72-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
73-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
72+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
73+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
7474
</Reference>
7575
<Reference Include="PresentationCore" />
7676
<Reference Include="PresentationFramework" />

‎CSharpRegexTools4Npp/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Costura.Fody" version="4.1.0" targetFramework="net46" developmentDependency="true" />
44
<package id="Fody" version="6.3.0" targetFramework="net46" developmentDependency="true" />
5-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net47" />
5+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
66
</packages>

‎RegexDialog/RegExToolDialog.xaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<MenuItem Header="Copy" Command="ApplicationCommands.Copy" />
4848
</ContextMenu>
4949

50-
<Style TargetType="{x:Type local:SearchableTextControl}">
50+
<Style TargetType="local:SearchableTextControl">
5151
<Setter Property="Template">
5252
<Setter.Value>
5353
<ControlTemplate TargetType="{x:Type local:SearchableTextControl}">
@@ -432,21 +432,21 @@
432432
</i:Interaction.Behaviors>
433433
<avalonEdit:TextEditor.ContextMenu>
434434
<ContextMenu Name="cmReplacefieldContextMenu">
435-
<MenuItem Name="cmiReplaceGroupByNumber" Header="Groups by number" Visibility="{Binding CSharpReplaceMode, Converter={converters:CustomBoolToVisibilityConverter TrueValue=Collapsed, FalseValue=Visible}}">
435+
<MenuItem Name="cmiReplaceGroupByNumber" Header="Groups by number" Visibility="{Binding CSharpReplaceMode, Converter={CustomBoolToVisibilityConverter TrueValue=Collapsed, FalseValue=Visible}}">
436436
<MenuItem.Style>
437437
<Style TargetType="{x:Type MenuItem}">
438438
<EventSetter Event="Click" Handler="InsertInReplaceFromContextMenu_Click" />
439439
</Style>
440440
</MenuItem.Style>
441441
</MenuItem>
442-
<MenuItem Name="cmiReplaceGroupByName" Header="Groups by name" Visibility="{Binding CSharpReplaceMode, Converter={converters:CustomBoolToVisibilityConverter TrueValue=Collapsed, FalseValue=Visible}}">
442+
<MenuItem Name="cmiReplaceGroupByName" Header="Groups by name" Visibility="{Binding CSharpReplaceMode, Converter={CustomBoolToVisibilityConverter TrueValue=Collapsed, FalseValue=Visible}}">
443443
<MenuItem.Style>
444444
<Style TargetType="{x:Type MenuItem}">
445445
<EventSetter Event="Click" Handler="InsertInReplaceFromContextMenu_Click" />
446446
</Style>
447447
</MenuItem.Style>
448448
</MenuItem>
449-
<Separator Visibility="{Binding CSharpReplaceMode, Converter={converters:CustomBoolToVisibilityConverter TrueValue=Collapsed, FalseValue=Visible}}"/>
449+
<Separator Visibility="{Binding CSharpReplaceMode, Converter={CustomBoolToVisibilityConverter TrueValue=Collapsed, FalseValue=Visible}}"/>
450450
<MenuItem Header="Cut" Command="ApplicationCommands.Cut"/>
451451
<MenuItem Header="Copy" Command="ApplicationCommands.Copy"/>
452452
<MenuItem Header="Paste" Command="ApplicationCommands.Paste"/>
@@ -468,7 +468,7 @@
468468
<Label DockPanel.Dock="Top" Name="MatchesResultLabel" Target="{Binding ElementName=MatchResultsTreeView}" >Matches [Index,Length]</Label>
469469
<Button DockPanel.Dock="Bottom"
470470
Content="Restore Last Search _Selection"
471-
Visibility="{Binding TextSourceOn, Converter={converters:ChainingConverter Converter1={converters:EnumBooleanConverter}, Converter2={converters:CustomBoolToVisibilityConverter}, Converter1Parameter='CurrentSelection'}}"
471+
Visibility="{Binding TextSourceOn, Converter={converters:ChainingConverter Converter1={converters:EnumBooleanConverter}, Converter2={CustomBoolToVisibilityConverter}, Converter1Parameter='CurrentSelection'}}"
472472
Click="RestoreLastMachesSelectionButton_Click" />
473473
<Border Grid.Row="1" BorderBrush="Gray" BorderThickness="0">
474474
<TreeView Name="MatchResultsTreeView"
@@ -653,7 +653,7 @@
653653
<TreeView.Resources>
654654
<Style TargetType="{x:Type TreeViewItem}">
655655
<Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
656-
<Setter Property="Visibility" Value="{Binding Visible, Converter={converters:CustomBoolToVisibilityConverter}}" />
656+
<Setter Property="Visibility" Value="{Binding Visible, Converter={CustomBoolToVisibilityConverter}}" />
657657
</Style>
658658
<HierarchicalDataTemplate DataType="{x:Type local:RegexLanguageElementGroup}"
659659
ItemsSource="{Binding Elements}">
@@ -822,7 +822,7 @@
822822

823823
<StackPanel Margin="5"
824824
DockPanel.Dock="Top"
825-
Visibility="{Binding IsChecked, ElementName=SpecifiedDirectoryTextSourceRadioButton, Converter={converters:CustomBoolToVisibilityConverter}}">
825+
Visibility="{Binding IsChecked, ElementName=SpecifiedDirectoryTextSourceRadioButton, Converter={CustomBoolToVisibilityConverter}}">
826826

827827
<DockPanel>
828828
<Button x:Name="SpecifiedDirectoryTextSourcePathButton"
@@ -866,7 +866,7 @@
866866
</StackPanel>
867867
</StackPanel>
868868

869-
<DockPanel Visibility="{Binding IsChecked, ElementName=CSharpScriptTextSourceRadioButton, Converter={converters:CustomBoolToVisibilityConverter}}" >
869+
<DockPanel Visibility="{Binding IsChecked, ElementName=CSharpScriptTextSourceRadioButton, Converter={CustomBoolToVisibilityConverter}}" >
870870
<WrapPanel DockPanel.Dock="Top">
871871
<WrapPanel.Resources>
872872
<Style BasedOn="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" TargetType="Button" />

‎RegexDialog/RegexDialog.csproj

+9-9
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@
106106
<Reference Include="Mono.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
107107
<HintPath>..\packages\CS-Script.bin.3.30.5.1\lib\net45\Mono.CSharp.dll</HintPath>
108108
</Reference>
109-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
110-
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
109+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
110+
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
111111
</Reference>
112-
<Reference Include="Ookii.Dialogs.WinForms, Version=1.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
113-
<HintPath>..\packages\Ookii.Dialogs.WinForms.1.2.0\lib\net45\Ookii.Dialogs.WinForms.dll</HintPath>
112+
<Reference Include="Ookii.Dialogs.WinForms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
113+
<HintPath>..\packages\Ookii.Dialogs.WinForms.4.0.0\lib\net462\Ookii.Dialogs.WinForms.dll</HintPath>
114114
</Reference>
115-
<Reference Include="Ookii.Dialogs.Wpf, Version=3.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
116-
<HintPath>..\packages\Ookii.Dialogs.Wpf.3.1.0\lib\net45\Ookii.Dialogs.Wpf.dll</HintPath>
115+
<Reference Include="Ookii.Dialogs.Wpf, Version=5.0.0.0, Culture=neutral, PublicKeyToken=66aa232afad40158, processorArchitecture=MSIL">
116+
<HintPath>..\packages\Ookii.Dialogs.Wpf.5.0.1\lib\net462\Ookii.Dialogs.Wpf.dll</HintPath>
117117
</Reference>
118118
<Reference Include="PresentationCore" />
119119
<Reference Include="PresentationFramework" />
@@ -195,6 +195,9 @@
195195
<Reference Include="System.Reflection.Metadata, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
196196
<HintPath>..\packages\System.Reflection.Metadata.5.0.0\lib\net461\System.Reflection.Metadata.dll</HintPath>
197197
</Reference>
198+
<Reference Include="System.Resources.Extensions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
199+
<HintPath>..\packages\System.Resources.Extensions.6.0.0\lib\net461\System.Resources.Extensions.dll</HintPath>
200+
</Reference>
198201
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
199202
<HintPath>..\packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
200203
<Private>True</Private>
@@ -284,7 +287,6 @@
284287
<Compile Include="BracketColorizer.cs" />
285288
<Compile Include="UIHelpers\Converters\BaseConverter.cs" />
286289
<Compile Include="UIHelpers\Converters\ChainingConverter.cs" />
287-
<Compile Include="UIHelpers\Converters\CustomBoolToVisibilityConverter.cs" />
288290
<Compile Include="UIHelpers\Converters\EnumBooleanConverter.cs" />
289291
<Compile Include="UIHelpers\Converters\ExpressionEvalConverter.cs" />
290292
<Compile Include="UIHelpers\Converters\ExpressionEvalMultiBindingConverter.cs" />
@@ -464,12 +466,10 @@
464466
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.props'))" />
465467
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets'))" />
466468
<Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.3.8.0\build\Microsoft.Net.Compilers.props'))" />
467-
<Error Condition="!Exists('..\packages\Ookii.Dialogs.3.1.0\build\Ookii.Dialogs.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Ookii.Dialogs.3.1.0\build\Ookii.Dialogs.targets'))" />
468469
<Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
469470
</Target>
470471
<Import Project="..\packages\Fody.6.3.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.3.0\build\Fody.targets')" />
471472
<Import Project="..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.Analyzers.3.3.2\build\Microsoft.CodeAnalysis.Analyzers.targets')" />
472-
<Import Project="..\packages\Ookii.Dialogs.3.1.0\build\Ookii.Dialogs.targets" Condition="Exists('..\packages\Ookii.Dialogs.3.1.0\build\Ookii.Dialogs.targets')" />
473473
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
474474
Other similar extension points exist, see Microsoft.Common.targets.
475475
<Target Name="BeforeBuild">

‎RegexDialog/UIHelpers/Converters/CustomBoolToVisibilityConverter.cs

-56
This file was deleted.

‎RegexDialog/UIHelpers/Converters/ShowOnOneLineConverter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ internal class ShowOnOneLineConverter : BaseConverter, IValueConverter
88
{
99
public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
1010
{
11-
return value.ToString().Replace("\r", "").Replace("\n", "");
11+
return value?.ToString().Replace("\r", "").Replace("\n", "");
1212
}
1313

1414
public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
1515
{
16-
throw new NotImplementedException();
16+
return value;
1717
}
1818
}
1919
}

‎RegexDialog/packages.config

+4-4
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@
1818
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net47" />
1919
<package id="Microsoft.Net.Compilers" version="3.8.0" targetFramework="net47" developmentDependency="true" />
2020
<package id="Microsoft.SDK.Expression.Blend" version="1.0.0" targetFramework="net452" />
21-
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net46" />
22-
<package id="Ookii.Dialogs" version="3.1.0" targetFramework="net47" />
23-
<package id="Ookii.Dialogs.WinForms" version="1.2.0" targetFramework="net47" />
24-
<package id="Ookii.Dialogs.Wpf" version="3.1.0" targetFramework="net47" />
21+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
22+
<package id="Ookii.Dialogs.WinForms" version="4.0.0" targetFramework="net47" />
23+
<package id="Ookii.Dialogs.Wpf" version="5.0.1" targetFramework="net47" />
2524
<package id="PropertyChanged.Fody" version="3.3.1" targetFramework="net46" />
2625
<package id="System.AppContext" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
2726
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
@@ -46,6 +45,7 @@
4645
<package id="System.Reflection" version="4.3.0" targetFramework="net452" requireReinstallation="true" />
4746
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net452" />
4847
<package id="System.Reflection.Metadata" version="5.0.0" targetFramework="net47" />
48+
<package id="System.Resources.Extensions" version="6.0.0" targetFramework="net47" />
4949
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net452" />
5050
<package id="System.Runtime" version="4.3.1" targetFramework="net46" requireReinstallation="true" />
5151
<package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net47" />

0 commit comments

Comments
 (0)