Skip to content

Commit 9f3b0d9

Browse files
HUSSAR-mtrelaHUSSAR-mtrela
authored
Merge pull request #75 from Infragistics/vnext
merge vnext into master after Sept SR
2 parents 70ce4b5 + 1422e1b commit 9f3b0d9

268 files changed

Lines changed: 1829 additions & 1490 deletions

File tree

Some content is hidden

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

‎Examples/IGBarcode/IGBarcode.WPF.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -44,13 +44,13 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="InfragisticsWPF">
47-
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.22\lib\net40\InfragisticsWPF.dll</HintPath>
47+
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.117\lib\net40\InfragisticsWPF.dll</HintPath>
4848
</Reference>
4949
<Reference Include="InfragisticsWPF.Controls.Barcodes">
50-
<HintPath>..\packages\Infragistics.WPF.Barcodes.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Barcodes.dll</HintPath>
50+
<HintPath>..\packages\Infragistics.WPF.Barcodes.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Barcodes.dll</HintPath>
5151
</Reference>
5252
<Reference Include="InfragisticsWPF.DataVisualization">
53-
<HintPath>..\packages\Infragistics.WPF.DataVisualization.Trial.25.1.22\lib\net40\InfragisticsWPF.DataVisualization.dll</HintPath>
53+
<HintPath>..\packages\Infragistics.WPF.DataVisualization.Trial.25.1.117\lib\net40\InfragisticsWPF.DataVisualization.dll</HintPath>
5454
</Reference>
5555
<Reference Include="WindowsBase" />
5656
<Reference Include="PresentationCore" />
@@ -251,4 +251,4 @@
251251
<Target Name="AfterBuild">
252252
</Target>
253253
-->
254-
</Project>
254+
</Project>

‎Examples/IGBarcode/packages.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Infragistics.WPF.Barcodes.Trial" version="25.1.22" targetFramework="net47" />
4-
<package id="Infragistics.WPF.DataVisualization.Trial" version="25.1.22" targetFramework="net47" />
5-
<package id="Infragistics.WPF.Trial" version="25.1.22" targetFramework="net47" />
6-
</packages>
3+
<package id="Infragistics.WPF.Barcodes.Trial" version="25.1.117" targetFramework="net47" />
4+
<package id="Infragistics.WPF.DataVisualization.Trial" version="25.1.117" targetFramework="net47" />
5+
<package id="Infragistics.WPF.Trial" version="25.1.117" targetFramework="net47" />
6+
</packages>

‎Examples/IGBarcodeReader/IGBarcodeReader.WPF.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="InfragisticsWPF">
47-
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.22\lib\net40\InfragisticsWPF.dll</HintPath>
47+
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.117\lib\net40\InfragisticsWPF.dll</HintPath>
4848
</Reference>
4949
<Reference Include="InfragisticsWPF.Controls.Barcodes">
50-
<HintPath>..\packages\Infragistics.WPF.Barcodes.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Barcodes.dll</HintPath>
50+
<HintPath>..\packages\Infragistics.WPF.Barcodes.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Barcodes.dll</HintPath>
5151
</Reference>
5252
<Reference Include="InfragisticsWPF.Controls.Barcodes.BarcodeReader">
53-
<HintPath>..\packages\Infragistics.WPF.BarcodeReader.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Barcodes.BarcodeReader.dll</HintPath>
53+
<HintPath>..\packages\Infragistics.WPF.BarcodeReader.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Barcodes.BarcodeReader.dll</HintPath>
5454
</Reference>
5555
<Reference Include="InfragisticsWPF.DataVisualization">
56-
<HintPath>..\packages\Infragistics.WPF.DataVisualization.Trial.25.1.22\lib\net40\InfragisticsWPF.DataVisualization.dll</HintPath>
56+
<HintPath>..\packages\Infragistics.WPF.DataVisualization.Trial.25.1.117\lib\net40\InfragisticsWPF.DataVisualization.dll</HintPath>
5757
</Reference>
5858
<Reference Include="System.Drawing" />
5959
<Reference Include="System.Windows.Forms" />
@@ -148,4 +148,4 @@
148148
<Target Name="AfterBuild">
149149
</Target>
150150
-->
151-
</Project>
151+
</Project>

‎Examples/IGBarcodeReader/app.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
65
</assemblyBinding>
76
</runtime>
87
</configuration>

‎Examples/IGBarcodeReader/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Infragistics.WPF.BarcodeReader.Trial" version="25.1.22" targetFramework="net47" />
4-
<package id="Infragistics.WPF.Barcodes.Trial" version="25.1.22" targetFramework="net47" />
5-
<package id="Infragistics.WPF.DataVisualization.Trial" version="25.1.22" targetFramework="net47" />
6-
<package id="Infragistics.WPF.Trial" version="25.1.22" targetFramework="net47" />
7-
</packages>
3+
<package id="Infragistics.WPF.BarcodeReader.Trial" version="25.1.117" targetFramework="net47" />
4+
<package id="Infragistics.WPF.Barcodes.Trial" version="25.1.117" targetFramework="net47" />
5+
<package id="Infragistics.WPF.DataVisualization.Trial" version="25.1.117" targetFramework="net47" />
6+
<package id="Infragistics.WPF.Trial" version="25.1.117" targetFramework="net47" />
7+
</packages>

‎Examples/IGBulletGraph/IGBulletGraph.WPF.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,19 +44,19 @@
4444
</PropertyGroup>
4545
<ItemGroup>
4646
<Reference Include="InfragisticsWPF">
47-
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.22\lib\net40\InfragisticsWPF.dll</HintPath>
47+
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.117\lib\net40\InfragisticsWPF.dll</HintPath>
4848
</Reference>
4949
<Reference Include="InfragisticsWPF.Controls.Gauges">
50-
<HintPath>..\packages\Infragistics.WPF.Gauges.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Gauges.dll</HintPath>
50+
<HintPath>..\packages\Infragistics.WPF.Gauges.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Gauges.dll</HintPath>
5151
</Reference>
5252
<Reference Include="InfragisticsWPF.DataPresenter">
53-
<HintPath>..\packages\Infragistics.WPF.DataGrids.Trial.25.1.22\lib\net40\InfragisticsWPF.DataPresenter.dll</HintPath>
53+
<HintPath>..\packages\Infragistics.WPF.DataGrids.Trial.25.1.117\lib\net40\InfragisticsWPF.DataPresenter.dll</HintPath>
5454
</Reference>
5555
<Reference Include="InfragisticsWPF.DataVisualization">
56-
<HintPath>..\packages\Infragistics.WPF.DataVisualization.Trial.25.1.22\lib\net40\InfragisticsWPF.DataVisualization.dll</HintPath>
56+
<HintPath>..\packages\Infragistics.WPF.DataVisualization.Trial.25.1.117\lib\net40\InfragisticsWPF.DataVisualization.dll</HintPath>
5757
</Reference>
5858
<Reference Include="InfragisticsWPF.Editors">
59-
<HintPath>..\packages\Infragistics.WPF.Editors.Trial.25.1.22\lib\net40\InfragisticsWPF.Editors.dll</HintPath>
59+
<HintPath>..\packages\Infragistics.WPF.Editors.Trial.25.1.117\lib\net40\InfragisticsWPF.Editors.dll</HintPath>
6060
</Reference>
6161
<Reference Include="Microsoft.CSharp" />
6262
<Reference Include="WindowsBase" />
@@ -221,4 +221,4 @@
221221
<Target Name="AfterBuild">
222222
</Target>
223223
-->
224-
</Project>
224+
</Project>

‎Examples/IGBulletGraph/app.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
65
</assemblyBinding>
76
</runtime>
87
</configuration>

‎Examples/IGBulletGraph/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Infragistics.WPF.DataGrids.Trial" version="25.1.22" targetFramework="net47" />
4-
<package id="Infragistics.WPF.DataVisualization.Trial" version="25.1.22" targetFramework="net47" />
5-
<package id="Infragistics.WPF.Editors.Trial" version="25.1.22" targetFramework="net47" />
6-
<package id="Infragistics.WPF.Gauges.Trial" version="25.1.22" targetFramework="net47" />
7-
<package id="Infragistics.WPF.Trial" version="25.1.22" targetFramework="net47" />
8-
</packages>
3+
<package id="Infragistics.WPF.DataGrids.Trial" version="25.1.117" targetFramework="net47" />
4+
<package id="Infragistics.WPF.DataVisualization.Trial" version="25.1.117" targetFramework="net47" />
5+
<package id="Infragistics.WPF.Editors.Trial" version="25.1.117" targetFramework="net47" />
6+
<package id="Infragistics.WPF.Gauges.Trial" version="25.1.117" targetFramework="net47" />
7+
<package id="Infragistics.WPF.Trial" version="25.1.117" targetFramework="net47" />
8+
</packages>

‎Examples/IGBusyIndicator/IGBusyIndicator.WPF.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,37 +39,37 @@
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<Reference Include="InfragisticsWPF">
42-
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.22\lib\net40\InfragisticsWPF.dll</HintPath>
42+
<HintPath>..\packages\Infragistics.WPF.Trial.25.1.117\lib\net40\InfragisticsWPF.dll</HintPath>
4343
</Reference>
4444
<Reference Include="InfragisticsWPF.Controls.Editors.XamCalendar">
45-
<HintPath>..\packages\Infragistics.WPF.Calendar.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Editors.XamCalendar.dll</HintPath>
45+
<HintPath>..\packages\Infragistics.WPF.Calendar.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Editors.XamCalendar.dll</HintPath>
4646
</Reference>
4747
<Reference Include="InfragisticsWPF.Controls.Editors.XamColorPicker">
48-
<HintPath>..\packages\Infragistics.WPF.ColorPicker.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Editors.XamColorPicker.dll</HintPath>
48+
<HintPath>..\packages\Infragistics.WPF.ColorPicker.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Editors.XamColorPicker.dll</HintPath>
4949
</Reference>
5050
<Reference Include="InfragisticsWPF.Controls.Editors.XamSlider">
51-
<HintPath>..\packages\Infragistics.WPF.Slider.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Editors.XamSlider.dll</HintPath>
51+
<HintPath>..\packages\Infragistics.WPF.Slider.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Editors.XamSlider.dll</HintPath>
5252
</Reference>
5353
<Reference Include="InfragisticsWPF.Controls.Grids.XamGrid">
54-
<HintPath>..\packages\Infragistics.WPF.Controls.Grids.XamGrid.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Grids.XamGrid.dll</HintPath>
54+
<HintPath>..\packages\Infragistics.WPF.Controls.Grids.XamGrid.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Grids.XamGrid.dll</HintPath>
5555
</Reference>
5656
<Reference Include="InfragisticsWPF.Controls.Menus.XamMenu">
57-
<HintPath>..\packages\Infragistics.WPF.Menus.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Menus.XamMenu.dll</HintPath>
57+
<HintPath>..\packages\Infragistics.WPF.Menus.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Menus.XamMenu.dll</HintPath>
5858
</Reference>
5959
<Reference Include="InfragisticsWPF.Controls.Schedules">
60-
<HintPath>..\packages\Infragistics.WPF.Schedules.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Schedules.dll</HintPath>
60+
<HintPath>..\packages\Infragistics.WPF.Schedules.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Schedules.dll</HintPath>
6161
</Reference>
6262
<Reference Include="InfragisticsWPF.Controls.Schedules.XamGantt">
63-
<HintPath>..\packages\Infragistics.WPF.Gantt.Trial.25.1.22\lib\net40\InfragisticsWPF.Controls.Schedules.XamGantt.dll</HintPath>
63+
<HintPath>..\packages\Infragistics.WPF.Gantt.Trial.25.1.117\lib\net40\InfragisticsWPF.Controls.Schedules.XamGantt.dll</HintPath>
6464
</Reference>
6565
<Reference Include="InfragisticsWPF.DataManager">
66-
<HintPath>..\packages\Infragistics.WPF.DataManager.Trial.25.1.22\lib\net40\InfragisticsWPF.DataManager.dll</HintPath>
66+
<HintPath>..\packages\Infragistics.WPF.DataManager.Trial.25.1.117\lib\net40\InfragisticsWPF.DataManager.dll</HintPath>
6767
</Reference>
6868
<Reference Include="InfragisticsWPF.DataPresenter">
69-
<HintPath>..\packages\Infragistics.WPF.DataGrids.Trial.25.1.22\lib\net40\InfragisticsWPF.DataPresenter.dll</HintPath>
69+
<HintPath>..\packages\Infragistics.WPF.DataGrids.Trial.25.1.117\lib\net40\InfragisticsWPF.DataPresenter.dll</HintPath>
7070
</Reference>
7171
<Reference Include="InfragisticsWPF.Editors">
72-
<HintPath>..\packages\Infragistics.WPF.Editors.Trial.25.1.22\lib\net40\InfragisticsWPF.Editors.dll</HintPath>
72+
<HintPath>..\packages\Infragistics.WPF.Editors.Trial.25.1.117\lib\net40\InfragisticsWPF.Editors.dll</HintPath>
7373
</Reference>
7474
<Reference Include="PresentationCore" />
7575
<Reference Include="PresentationFramework" />
@@ -217,4 +217,4 @@
217217
<Target Name="AfterBuild">
218218
</Target>
219219
-->
220-
</Project>
220+
</Project>

‎Examples/IGBusyIndicator/app.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55

6+
67
</assemblyBinding>
78
</runtime>
89
</configuration>

0 commit comments

Comments
 (0)