Skip to content

Commit fa6b0e4

Browse files
notesjornotesjor
committed
// commit
1 parent 1950dc0 commit fa6b0e4

File tree

56 files changed

+1723
-1985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+1723
-1985
lines changed

‎CorpusExplorer.Core/CorpusExplorer.Core.csproj

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -78,25 +78,21 @@
7878
<Reference Include="System.Xaml" />
7979
<Reference Include="System.Xml" />
8080
<Reference Include="System.Xml.Linq" />
81-
<Reference Include="Telerik.Windows.Documents, Version=2022.1.117.45, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
81+
<Reference Include="Telerik.Windows.Documents.Core, Version=2022.2.428.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
8282
<SpecificVersion>False</SpecificVersion>
83-
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.dll</HintPath>
83+
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2022\Bin40\Telerik.Windows.Documents.Core.dll</HintPath>
8484
</Reference>
85-
<Reference Include="Telerik.Windows.Documents.Core, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
85+
<Reference Include="Telerik.Windows.Documents.Fixed, Version=2022.2.428.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
8686
<SpecificVersion>False</SpecificVersion>
87-
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Core.dll</HintPath>
87+
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2022\Bin40\Telerik.Windows.Documents.Fixed.dll</HintPath>
8888
</Reference>
89-
<Reference Include="Telerik.Windows.Documents.Fixed, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
89+
<Reference Include="Telerik.Windows.Documents.Flow, Version=2022.2.428.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
9090
<SpecificVersion>False</SpecificVersion>
91-
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Fixed.dll</HintPath>
91+
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2022\Bin40\Telerik.Windows.Documents.Flow.dll</HintPath>
9292
</Reference>
93-
<Reference Include="Telerik.Windows.Documents.Flow, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
93+
<Reference Include="Telerik.Windows.Documents.Flow.FormatProviders.Pdf, Version=2022.2.428.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
9494
<SpecificVersion>False</SpecificVersion>
95-
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Flow.dll</HintPath>
96-
</Reference>
97-
<Reference Include="Telerik.Windows.Documents.Flow.FormatProviders.Pdf, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
98-
<SpecificVersion>False</SpecificVersion>
99-
<HintPath>W:\Telerik\Telerik UI for WPF R1 2022\Binaries.NoXaml\WPF45\Telerik.Windows.Documents.Flow.FormatProviders.Pdf.dll</HintPath>
95+
<HintPath>W:\Telerik\Telerik UI for WinForms R1 2022\Bin40\Telerik.Windows.Documents.Flow.FormatProviders.Pdf.dll</HintPath>
10096
</Reference>
10197
<Reference Include="Telerik.Windows.Zip, Version=2022.1.106.40, Culture=neutral, PublicKeyToken=5803cfa389c90ce7, processorArchitecture=MSIL">
10298
<SpecificVersion>False</SpecificVersion>

‎CorpusExplorer.Core/RepositoryManifest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ public class RepositoryManifest : AbstractAddonRepository
136136
{ "TreeTagger (*.treetagger)|*.treetagger", new ExporterTreeTagger() },
137137
{ "TreeTagger + Satzgrenze (*.treetagger)|*.treetagger", new ExporterTreeTagger { UseSentenceTag = true } },
138138
{ "CorpusWorkBench (*.vrt)|*.vrt", new ExporterCorpusWorkBench { UseSentenceTag = false } },
139-
{ "CorpusWorkBench + Satzgrenze (*.vrt)|*.vrt", new ExporterCorpusWorkBench { UseSentenceTag = true } },
139+
{ "CorpusWorkBench + Satzgrenze (*.vrt, *.vrt.xml)|*.vrt;*.vrt.xml", new ExporterCorpusWorkBench { UseSentenceTag = true } },
140140
{ "Sketch Engine VERT (*.vert)|*.vert", new ExporterSketchEngine() },
141141
};
142142

‎CorpusExplorer.Sdk.Db.Addon/CorpusExplorer.Sdk.Db.ElasticSearch.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
</PropertyGroup>
4848
<ItemGroup>
4949
<Reference Include="Elasticsearch.Net, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Elasticsearch.Net.7.17.1\lib\net461\Elasticsearch.Net.dll</HintPath>
50+
<HintPath>..\packages\Elasticsearch.Net.7.17.2\lib\net461\Elasticsearch.Net.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.CSharp" />
5353
<Reference Include="Nest, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NEST.7.17.1\lib\net461\Nest.dll</HintPath>
54+
<HintPath>..\packages\NEST.7.17.2\lib\net461\Nest.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

‎CorpusExplorer.Sdk.Db.Addon/app.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</dependentAssembly>
1313
<dependentAssembly>
1414
<assemblyIdentity name="Telerik.WinControls" publicKeyToken="5bb2a467cbec794e" culture="neutral" />
15-
<bindingRedirect oldVersion="0.0.0.0-2022.1.222.40" newVersion="2022.1.222.40" />
15+
<bindingRedirect oldVersion="0.0.0.0-2022.2.510.40" newVersion="2022.2.510.40" />
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="Telerik.Windows.Documents.Flow" publicKeyToken="5803cfa389c90ce7" culture="neutral" />
@@ -48,11 +48,11 @@
4848
</dependentAssembly>
4949
<dependentAssembly>
5050
<assemblyIdentity name="Telerik.WinControls.UI" publicKeyToken="5bb2a467cbec794e" culture="neutral" />
51-
<bindingRedirect oldVersion="0.0.0.0-2022.1.222.40" newVersion="2022.1.222.40" />
51+
<bindingRedirect oldVersion="0.0.0.0-2022.2.510.40" newVersion="2022.2.510.40" />
5252
</dependentAssembly>
5353
<dependentAssembly>
5454
<assemblyIdentity name="TelerikCommon" publicKeyToken="5bb2a467cbec794e" culture="neutral" />
55-
<bindingRedirect oldVersion="0.0.0.0-2022.1.222.40" newVersion="2022.1.222.40" />
55+
<bindingRedirect oldVersion="0.0.0.0-2022.2.510.40" newVersion="2022.2.510.40" />
5656
</dependentAssembly>
5757
<dependentAssembly>
5858
<assemblyIdentity name="Telerik.Windows.Documents.Fixed" publicKeyToken="5803cfa389c90ce7" culture="neutral" />

‎CorpusExplorer.Sdk.Db.Addon/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Elasticsearch.Net" version="7.17.1" targetFramework="net461" />
3+
<package id="Elasticsearch.Net" version="7.17.2" targetFramework="net461" />
44
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
5-
<package id="NEST" version="7.17.1" targetFramework="net461" />
5+
<package id="NEST" version="7.17.2" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
88
<package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net461" />

‎CorpusExplorer.Sdk.Db.Elastic.Sdk/CorpusExplorer.Sdk.Db.Elastic.Sdk.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
</PropertyGroup>
4848
<ItemGroup>
4949
<Reference Include="Elasticsearch.Net, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Elasticsearch.Net.7.17.1\lib\net461\Elasticsearch.Net.dll</HintPath>
50+
<HintPath>..\packages\Elasticsearch.Net.7.17.2\lib\net461\Elasticsearch.Net.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.CSharp" />
5353
<Reference Include="Nest, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NEST.7.17.1\lib\net461\Nest.dll</HintPath>
54+
<HintPath>..\packages\NEST.7.17.2\lib\net461\Nest.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

‎CorpusExplorer.Sdk.Db.Elastic.Sdk/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Elasticsearch.Net" version="7.17.1" targetFramework="net461" />
3+
<package id="Elasticsearch.Net" version="7.17.2" targetFramework="net461" />
44
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
5-
<package id="NEST" version="7.17.1" targetFramework="net461" />
5+
<package id="NEST" version="7.17.2" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
88
<package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net461" />

‎CorpusExplorer.Sdk.Db.Elastic/CorpusExplorer.Sdk.Db.Elastic.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@
4747
</PropertyGroup>
4848
<ItemGroup>
4949
<Reference Include="Elasticsearch.Net, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Elasticsearch.Net.7.17.1\lib\net461\Elasticsearch.Net.dll</HintPath>
50+
<HintPath>..\packages\Elasticsearch.Net.7.17.2\lib\net461\Elasticsearch.Net.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.CSharp" />
5353
<Reference Include="Nest, Version=7.0.0.0, Culture=neutral, PublicKeyToken=96c599bbe3e70f5d, processorArchitecture=MSIL">
54-
<HintPath>..\packages\NEST.7.17.1\lib\net461\Nest.dll</HintPath>
54+
<HintPath>..\packages\NEST.7.17.2\lib\net461\Nest.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>

‎CorpusExplorer.Sdk.Db.Elastic/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Elasticsearch.Net" version="7.17.1" targetFramework="net461" />
3+
<package id="Elasticsearch.Net" version="7.17.2" targetFramework="net461" />
44
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net461" />
5-
<package id="NEST" version="7.17.1" targetFramework="net461" />
5+
<package id="NEST" version="7.17.2" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
77
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
88
<package id="System.Diagnostics.DiagnosticSource" version="6.0.0" targetFramework="net461" />

‎CorpusExplorer.Sdk.EchtzeitEngine.Reporting/CorpusExplorer.Sdk.EchtzeitEngine.Reporting.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@
5151
<Reference Include="System.Data" />
5252
<Reference Include="System.Drawing" />
5353
<Reference Include="System.Windows.Forms" />
54+
<Reference Include="Telerik.Reporting, Version=16.1.22.511, Culture=neutral, PublicKeyToken=a9d7983dfcc261be">
55+
<HintPath>W:\Telerik\Telerik Reporting R2 2022\bin\Telerik.Reporting.dll</HintPath>
56+
<SpecificVersion>True</SpecificVersion>
57+
</Reference>
58+
<Reference Include="Telerik.ReportViewer.WinForms, Version=16.1.22.511, Culture=neutral, PublicKeyToken=a9d7983dfcc261be">
59+
<HintPath>W:\Telerik\Telerik Reporting R2 2022\bin\Telerik.ReportViewer.WinForms.dll</HintPath>
60+
<SpecificVersion>True</SpecificVersion>
61+
</Reference>
5462
<Reference Include="Telerik.WinControls, Version=2022.1.222.40, Culture=neutral, PublicKeyToken=5bb2a467cbec794e, processorArchitecture=MSIL">
5563
<HintPath>..\lib\RCWF\2022.1.222.40\Telerik.WinControls.dll</HintPath>
5664
<Private>True</Private>
@@ -67,14 +75,6 @@
6775
<HintPath>..\lib\RCWF\2022.1.222.40\TelerikCommon.dll</HintPath>
6876
<Private>True</Private>
6977
</Reference>
70-
<Reference Include="Telerik.Reporting, Version=16.0.22.225, Culture=neutral, PublicKeyToken=a9d7983dfcc261be">
71-
<HintPath>W:\Telerik\Telerik Reporting R1 2022\bin\Telerik.Reporting.dll</HintPath>
72-
<SpecificVersion>True</SpecificVersion>
73-
</Reference>
74-
<Reference Include="Telerik.ReportViewer.WinForms, Version=16.0.22.225, Culture=neutral, PublicKeyToken=a9d7983dfcc261be">
75-
<HintPath>W:\Telerik\Telerik Reporting R1 2022\bin\Telerik.ReportViewer.WinForms.dll</HintPath>
76-
<SpecificVersion>True</SpecificVersion>
77-
</Reference>
7878
</ItemGroup>
7979
<ItemGroup>
8080
<Compile Include="Forms\Model\ReportTreeItem.cs" />

0 commit comments

Comments
 (0)