Browse Source

Move DataGrid to a separate assembly and add it to CoreLibraries.props.

pull/2109/head
Jumar Macato 7 years ago
parent
commit
2c0936580e
  1. 26
      Avalonia.sln
  2. 1
      build/CoreLibraries.props
  3. 19
      src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj
  4. 0
      src/Avalonia.Controls.DataGrid/Collections/AvaloniaGroupDescription.cs
  5. 0
      src/Avalonia.Controls.DataGrid/Collections/AvaloniaSortDescription.cs
  6. 0
      src/Avalonia.Controls.DataGrid/Collections/CollectionView.cs
  7. 0
      src/Avalonia.Controls.DataGrid/Collections/ICollectionView.cs
  8. 0
      src/Avalonia.Controls.DataGrid/DataGrid.cs
  9. 0
      src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs
  10. 0
      src/Avalonia.Controls.DataGrid/DataGridCell.cs
  11. 0
      src/Avalonia.Controls.DataGrid/DataGridCellCollection.cs
  12. 0
      src/Avalonia.Controls.DataGrid/DataGridCellCoordinates.cs
  13. 0
      src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs
  14. 0
      src/Avalonia.Controls.DataGrid/DataGridClipboard.cs
  15. 0
      src/Avalonia.Controls.DataGrid/DataGridColumn.cs
  16. 0
      src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs
  17. 0
      src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs
  18. 0
      src/Avalonia.Controls.DataGrid/DataGridColumns.cs
  19. 0
      src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs
  20. 0
      src/Avalonia.Controls.DataGrid/DataGridDisplayData.cs
  21. 0
      src/Avalonia.Controls.DataGrid/DataGridEnumerations.cs
  22. 0
      src/Avalonia.Controls.DataGrid/DataGridError.cs
  23. 0
      src/Avalonia.Controls.DataGrid/DataGridFillerColumn.cs
  24. 0
      src/Avalonia.Controls.DataGrid/DataGridLength.cs
  25. 0
      src/Avalonia.Controls.DataGrid/DataGridRow.cs
  26. 0
      src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs
  27. 0
      src/Avalonia.Controls.DataGrid/DataGridRowGroupInfo.cs
  28. 0
      src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs
  29. 0
      src/Avalonia.Controls.DataGrid/DataGridRows.cs
  30. 0
      src/Avalonia.Controls.DataGrid/DataGridSelectedItemsCollection.cs
  31. 0
      src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs
  32. 0
      src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs
  33. 0
      src/Avalonia.Controls.DataGrid/DataGridValueConverter.cs
  34. 0
      src/Avalonia.Controls.DataGrid/EventArgs.cs
  35. 0
      src/Avalonia.Controls.DataGrid/Extensions.cs
  36. 0
      src/Avalonia.Controls.DataGrid/IndexToValueTable.cs
  37. 0
      src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs
  38. 0
      src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs
  39. 0
      src/Avalonia.Controls.DataGrid/Primitives/DataGridDetailsPresenter.cs
  40. 0
      src/Avalonia.Controls.DataGrid/Primitives/DataGridFrozenGrid.cs
  41. 0
      src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs
  42. 12
      src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs
  43. 0
      src/Avalonia.Controls.DataGrid/Range.cs
  44. 0
      src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs
  45. 0
      src/Avalonia.Controls.DataGrid/Utils/DoubleUtil.cs
  46. 0
      src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs
  47. 0
      src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs
  48. 0
      src/Avalonia.Controls.DataGrid/Utils/TreeHelper.cs
  49. 0
      src/Avalonia.Controls.DataGrid/Utils/ValidationUtil.cs

26
Avalonia.sln

@ -202,6 +202,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PlatformSanityChecks", "sam
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI.UnitTests", "tests\Avalonia.ReactiveUI.UnitTests\Avalonia.ReactiveUI.UnitTests.csproj", "{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avalonia.ReactiveUI.UnitTests", "tests\Avalonia.ReactiveUI.UnitTests\Avalonia.ReactiveUI.UnitTests.csproj", "{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Controls.DataGrid", "src\Avalonia.Controls.DataGrid\Avalonia.Controls.DataGrid.csproj", "{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}"
EndProject
Global Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution GlobalSection(SharedMSBuildProjectFiles) = preSolution
src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13 src\Shared\RenderHelpers\RenderHelpers.projitems*{3c4c0cb4-0c0f-4450-a37b-148c84ff905f}*SharedItemsImports = 13
@ -1845,6 +1847,30 @@ Global
{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhone.Build.0 = Release|Any CPU {AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhone.Build.0 = Release|Any CPU
{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU {AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.Build.0 = Release|Any CPU {AF915D5C-AB00-4EA0-B5E6-001F4AE84E68}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|Any CPU.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhone.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhone.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|Any CPU.Build.0 = Release|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhone.ActiveCfg = Release|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhone.Build.0 = Release|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{3278F3A9-9509-4A3F-A15B-BDC8B5BFF632}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1
build/CoreLibraries.props

@ -3,6 +3,7 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Base/Avalonia.Base.csproj" /> <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Base/Avalonia.Base.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Animation/Avalonia.Animation.csproj" /> <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Animation/Avalonia.Animation.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" /> <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" /> <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj" /> <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Diagnostics/Avalonia.Diagnostics.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Input/Avalonia.Input.csproj" /> <ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Input/Avalonia.Input.csproj" />

19
src/Avalonia.Controls.DataGrid/Avalonia.Controls.DataGrid.csproj

@ -0,0 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Avalonia.Animation\Avalonia.Animation.csproj" />
<ProjectReference Include="..\Avalonia.Base\Avalonia.Base.csproj" />
<ProjectReference Include="..\Avalonia.Input\Avalonia.Input.csproj" />
<ProjectReference Include="..\Avalonia.Interactivity\Avalonia.Interactivity.csproj" />
<ProjectReference Include="..\Avalonia.Layout\Avalonia.Layout.csproj" />
<ProjectReference Include="..\Avalonia.Remote.Protocol\Avalonia.Remote.Protocol.csproj" />
<ProjectReference Include="..\Avalonia.Visuals\Avalonia.Visuals.csproj" />
<ProjectReference Include="..\Avalonia.Styling\Avalonia.Styling.csproj" />
<ProjectReference Include="..\Markup\Avalonia.Markup\Avalonia.Markup.csproj" />
<ProjectReference Include="..\Avalonia.Controls\Avalonia.Controls.csproj" />
</ItemGroup>
<Import Project="..\..\build\Rx.props" />
<Import Project="..\..\build\JetBrains.Annotations.props" />
</Project>

0
src/Avalonia.Controls/DataGrid/Collections/AvaloniaGroupDescription.cs → src/Avalonia.Controls.DataGrid/Collections/AvaloniaGroupDescription.cs

0
src/Avalonia.Controls/DataGrid/Collections/AvaloniaSortDescription.cs → src/Avalonia.Controls.DataGrid/Collections/AvaloniaSortDescription.cs

0
src/Avalonia.Controls/DataGrid/Collections/CollectionView.cs → src/Avalonia.Controls.DataGrid/Collections/CollectionView.cs

0
src/Avalonia.Controls/DataGrid/Collections/ICollectionView.cs → src/Avalonia.Controls.DataGrid/Collections/ICollectionView.cs

0
src/Avalonia.Controls/DataGrid/DataGrid.cs → src/Avalonia.Controls.DataGrid/DataGrid.cs

0
src/Avalonia.Controls/DataGrid/DataGridBoundColumn.cs → src/Avalonia.Controls.DataGrid/DataGridBoundColumn.cs

0
src/Avalonia.Controls/DataGrid/DataGridCell.cs → src/Avalonia.Controls.DataGrid/DataGridCell.cs

0
src/Avalonia.Controls/DataGrid/DataGridCellCollection.cs → src/Avalonia.Controls.DataGrid/DataGridCellCollection.cs

0
src/Avalonia.Controls/DataGrid/DataGridCellCoordinates.cs → src/Avalonia.Controls.DataGrid/DataGridCellCoordinates.cs

0
src/Avalonia.Controls/DataGrid/DataGridCheckBoxColumn.cs → src/Avalonia.Controls.DataGrid/DataGridCheckBoxColumn.cs

0
src/Avalonia.Controls/DataGrid/DataGridClipboard.cs → src/Avalonia.Controls.DataGrid/DataGridClipboard.cs

0
src/Avalonia.Controls/DataGrid/DataGridColumn.cs → src/Avalonia.Controls.DataGrid/DataGridColumn.cs

0
src/Avalonia.Controls/DataGrid/DataGridColumnCollection.cs → src/Avalonia.Controls.DataGrid/DataGridColumnCollection.cs

0
src/Avalonia.Controls/DataGrid/DataGridColumnHeader.cs → src/Avalonia.Controls.DataGrid/DataGridColumnHeader.cs

0
src/Avalonia.Controls/DataGrid/DataGridColumns.cs → src/Avalonia.Controls.DataGrid/DataGridColumns.cs

0
src/Avalonia.Controls/DataGrid/DataGridDataConnection.cs → src/Avalonia.Controls.DataGrid/DataGridDataConnection.cs

0
src/Avalonia.Controls/DataGrid/DataGridDisplayData.cs → src/Avalonia.Controls.DataGrid/DataGridDisplayData.cs

0
src/Avalonia.Controls/DataGrid/DataGridEnumerations.cs → src/Avalonia.Controls.DataGrid/DataGridEnumerations.cs

0
src/Avalonia.Controls/DataGrid/DataGridError.cs → src/Avalonia.Controls.DataGrid/DataGridError.cs

0
src/Avalonia.Controls/DataGrid/DataGridFillerColumn.cs → src/Avalonia.Controls.DataGrid/DataGridFillerColumn.cs

0
src/Avalonia.Controls/DataGrid/DataGridLength.cs → src/Avalonia.Controls.DataGrid/DataGridLength.cs

0
src/Avalonia.Controls/DataGrid/DataGridRow.cs → src/Avalonia.Controls.DataGrid/DataGridRow.cs

0
src/Avalonia.Controls/DataGrid/DataGridRowGroupHeader.cs → src/Avalonia.Controls.DataGrid/DataGridRowGroupHeader.cs

0
src/Avalonia.Controls/DataGrid/DataGridRowGroupInfo.cs → src/Avalonia.Controls.DataGrid/DataGridRowGroupInfo.cs

0
src/Avalonia.Controls/DataGrid/DataGridRowHeader.cs → src/Avalonia.Controls.DataGrid/DataGridRowHeader.cs

0
src/Avalonia.Controls/DataGrid/DataGridRows.cs → src/Avalonia.Controls.DataGrid/DataGridRows.cs

0
src/Avalonia.Controls/DataGrid/DataGridSelectedItemsCollection.cs → src/Avalonia.Controls.DataGrid/DataGridSelectedItemsCollection.cs

0
src/Avalonia.Controls/DataGrid/DataGridTemplateColumn.cs → src/Avalonia.Controls.DataGrid/DataGridTemplateColumn.cs

0
src/Avalonia.Controls/DataGrid/DataGridTextColumn.cs → src/Avalonia.Controls.DataGrid/DataGridTextColumn.cs

0
src/Avalonia.Controls/DataGrid/DataGridValueConverter.cs → src/Avalonia.Controls.DataGrid/DataGridValueConverter.cs

0
src/Avalonia.Controls/DataGrid/EventArgs.cs → src/Avalonia.Controls.DataGrid/EventArgs.cs

0
src/Avalonia.Controls/DataGrid/Extensions.cs → src/Avalonia.Controls.DataGrid/Extensions.cs

0
src/Avalonia.Controls/DataGrid/IndexToValueTable.cs → src/Avalonia.Controls.DataGrid/IndexToValueTable.cs

0
src/Avalonia.Controls/Primitives/DataGridCellsPresenter.cs → src/Avalonia.Controls.DataGrid/Primitives/DataGridCellsPresenter.cs

0
src/Avalonia.Controls/Primitives/DataGridColumnHeadersPresenter.cs → src/Avalonia.Controls.DataGrid/Primitives/DataGridColumnHeadersPresenter.cs

0
src/Avalonia.Controls/Primitives/DataGridDetailsPresenter.cs → src/Avalonia.Controls.DataGrid/Primitives/DataGridDetailsPresenter.cs

0
src/Avalonia.Controls/Primitives/DataGridFrozenGrid.cs → src/Avalonia.Controls.DataGrid/Primitives/DataGridFrozenGrid.cs

0
src/Avalonia.Controls/Primitives/DataGridRowsPresenter.cs → src/Avalonia.Controls.DataGrid/Primitives/DataGridRowsPresenter.cs

12
src/Avalonia.Controls.DataGrid/Properties/AssemblyInfo.cs

@ -0,0 +1,12 @@
// Copyright (c) The Avalonia Project. All rights reserved.
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System.Reflection;
using System.Runtime.CompilerServices;
using Avalonia.Metadata;
[assembly: InternalsVisibleTo("Avalonia.Controls.UnitTests")]
[assembly: InternalsVisibleTo("Avalonia.DesignerSupport")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Controls.DataGrid")]

0
src/Avalonia.Controls/DataGrid/Range.cs → src/Avalonia.Controls.DataGrid/Range.cs

0
src/Avalonia.Controls/Utils/CellEditBinding.cs → src/Avalonia.Controls.DataGrid/Utils/CellEditBinding.cs

0
src/Avalonia.Controls/Utils/DoubleUtil.cs → src/Avalonia.Controls.DataGrid/Utils/DoubleUtil.cs

0
src/Avalonia.Controls/Utils/KeyboardHelper.cs → src/Avalonia.Controls.DataGrid/Utils/KeyboardHelper.cs

0
src/Avalonia.Controls/Utils/ReflectionHelper.cs → src/Avalonia.Controls.DataGrid/Utils/ReflectionHelper.cs

0
src/Avalonia.Controls/Utils/TreeHelper.cs → src/Avalonia.Controls.DataGrid/Utils/TreeHelper.cs

0
src/Avalonia.Controls/Utils/ValidationUtil.cs → src/Avalonia.Controls.DataGrid/Utils/ValidationUtil.cs

Loading…
Cancel
Save