Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge core libraries. #5831

Merged
merged 36 commits into from
Apr 14, 2022
Merged

Merge core libraries. #5831

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
4e1b40e
Merge core libraries.
grokys Apr 23, 2021
3dceb98
Merge branch 'master' into refactor/merge-core-assemblies
grokys Apr 27, 2021
0552e45
Merge branch 'master' into refactor/merge-core-assemblies
grokys May 7, 2021
df199fb
Merge branch 'master' into refactor/merge-core-assemblies
jmacato May 8, 2021
70ce7ab
Merge branch 'master' into refactor/merge-core-assemblies
grokys May 21, 2021
b7c52fe
Move new files to correct place.
grokys May 21, 2021
bb1893d
Removed unused dirs/projects,
grokys May 21, 2021
60b413f
Merge branch 'master' into refactor/merge-core-assemblies
grokys May 22, 2021
5ff999c
Removed outdated references from theme assemblies.
grokys May 24, 2021
246f805
Merge branch 'master' into refactor/merge-core-assemblies
grokys Jun 15, 2021
5898108
Merge unit tests to match new assembly layout.
grokys Jun 16, 2021
7fd9e23
Fixup test namespaces.
grokys Jun 16, 2021
bb844cd
Make directory match namespace.
grokys Jun 16, 2021
85ff01a
Move files to match namespace.
grokys Jun 16, 2021
1e6f601
Move files to match namespace.
grokys Jun 16, 2021
ed64504
Fix up incorrect namespace.
grokys Jun 16, 2021
06a5e8e
Fix resource URL.
grokys Jun 16, 2021
3bed08f
Removed outdated dependencies.
grokys Jun 23, 2021
4785439
Merge branch 'master' into refactor/merge-core-assemblies
grokys Jun 23, 2021
b57e53a
Added missing project reference.
grokys Jun 23, 2021
f8c6ed7
Merge branch 'master' into refactor/merge-core-assemblies
grokys Oct 1, 2021
0a01ea9
Merge branch 'master' into refactor/merge-core-assemblies
grokys Oct 27, 2021
1575bdf
Update test namespaces.
grokys Oct 27, 2021
ad7f3bd
Merge branch 'master' into refactor/merge-core-assemblies
jmacato Oct 27, 2021
a95a1e3
Merge branch 'master' into refactor/merge-core-assemblies
grokys Nov 26, 2021
4101710
Merge branch 'master' into refactor/merge-core-assemblies
grokys Dec 5, 2021
b8e530c
Fix merge error.
grokys Dec 5, 2021
45270aa
Merge branch 'master' into refactor/merge-core-assemblies
grokys Apr 13, 2022
e130cb8
Fix merge errors.
grokys Apr 13, 2022
9322adc
Merge branch 'master' into refactor/merge-core-assemblies
grokys Apr 14, 2022
332b914
Fix bad merge in WindowsInteropTest.csproj.
grokys Apr 14, 2022
6827476
Fix up merge errors in csprojs.
grokys Apr 14, 2022
0f3f3a7
Remove merged tests from nuke.
grokys Apr 14, 2022
4a3e826
Fix up namespace.
grokys Apr 14, 2022
bf86144
Fix compile error.
grokys Apr 14, 2022
533aeb7
Fix failing tests.
grokys Apr 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
318 changes: 0 additions & 318 deletions Avalonia.sln
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@
<!-- https://github.com/dotnet/msbuild/issues/2661 -->
<AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
<MSBuildEnableWorkloadResolver>false</MSBuildEnableWorkloadResolver>
<RunApiCompat>False</RunApiCompat>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR currently disables ApiCompat. This is because even though git handles merges with file moves pretty well, it does not handle changes to ApiCompatBaseline.txt well, and these files are going to be the main cause of merge conflicts after this change.

Should we leave this disabled until 11.0 (because breaking changes are expected at this point)?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, the only issue I can think is its harder to make a breaking change summary for the release.

</PropertyGroup>
</Project>
6 changes: 0 additions & 6 deletions build/CoreLibraries.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,8 @@
<Project>
<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Base/Avalonia.Base.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Animation/Avalonia.Animation.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Controls/Avalonia.Controls.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.DesignerSupport/Avalonia.DesignerSupport.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Input/Avalonia.Input.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Interactivity/Avalonia.Interactivity.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Layout/Avalonia.Layout.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Visuals/Avalonia.Visuals.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Styling/Avalonia.Styling.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Themes.Default/Avalonia.Themes.Default.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.Themes.Fluent/Avalonia.Themes.Fluent.csproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)/../src/Avalonia.OpenGL/Avalonia.OpenGL.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions nukebuild/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,17 +214,11 @@ void RunCoreTest(string projectName)
.DependsOn(Compile)
.Executes(() =>
{
RunCoreTest("Avalonia.Animation.UnitTests");
RunCoreTest("Avalonia.Base.UnitTests");
RunCoreTest("Avalonia.Controls.UnitTests");
RunCoreTest("Avalonia.Controls.DataGrid.UnitTests");
RunCoreTest("Avalonia.Input.UnitTests");
RunCoreTest("Avalonia.Interactivity.UnitTests");
RunCoreTest("Avalonia.Layout.UnitTests");
RunCoreTest("Avalonia.Markup.UnitTests");
RunCoreTest("Avalonia.Markup.Xaml.UnitTests");
RunCoreTest("Avalonia.Styling.UnitTests");
RunCoreTest("Avalonia.Visuals.UnitTests");
RunCoreTest("Avalonia.Skia.UnitTests");
RunCoreTest("Avalonia.ReactiveUI.UnitTests");
});
Expand Down
40 changes: 40 additions & 0 deletions samples/ControlCatalog.Android/ControlCatalog.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,47 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj">
<Project>{7b92af71-6287-4693-9dcb-bd5b6e927e23}</Project>
<Name>Avalonia.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Avalonia.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Avalonia.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj">
<Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
<Name>Avalonia.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
<Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
<Name>Avalonia.Themes.Default</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
<Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
<Name>Avalonia.Markup.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
<Project>{6417e941-21bc-467b-a771-0de389353ce6}</Project>
<Name>Avalonia.Markup</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
<Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
<Name>Avalonia.Skia</Name>
</ProjectReference>
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj">
<Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
<Name>ControlCatalog</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj" />
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
</ItemGroup>
<Import Project="..\..\build\Rx.props" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\build\AndroidWorkarounds.props" />
<Import Project="..\..\build\LegacyProject.targets" />
</Project>
49 changes: 49 additions & 0 deletions samples/ControlCatalog.iOS/ControlCatalog.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,53 @@
<ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj" />
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Xml" />
<Reference Include="System.Core" />
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\src\iOS\Avalonia.iOS\Avalonia.iOS.csproj">
<Project>{4488ad85-1495-4809-9aa4-ddfe0a48527e}</Project>
<Name>Avalonia.iOS</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
<Project>{3E53A01A-B331-47F3-B828-4A5717E77A24}</Project>
<Name>Avalonia.Markup.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Markup\Avalonia.Markup\Avalonia.Markup.csproj">
<Project>{6417E941-21BC-467B-A771-0DE389353CE6}</Project>
<Name>Avalonia.Markup</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Base\Avalonia.Base.csproj">
<Project>{B09B78D8-9B26-48B0-9149-D64A2F120F3F}</Project>
<Name>Avalonia.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
<Project>{D2221C82-4A25-4583-9B43-D791E3F6820C}</Project>
<Name>Avalonia.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj">
<Project>{7062AE20-5DCC-4442-9645-8195BDECE63E}</Project>
<Name>Avalonia.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
<Project>{3E10A5FA-E8DA-48B1-AD44-6A5B6CB7750F}</Project>
<Name>Avalonia.Themes.Default</Name>
</ProjectReference>
<ProjectReference Include="..\..\src\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
<Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
<Name>Avalonia.Skia</Name>
</ProjectReference>
<ProjectReference Include="..\ControlCatalog\ControlCatalog.csproj">
<Project>{d0a739b9-3c68-4ba6-a328-41606954b6bd}</Project>
<Name>ControlCatalog</Name>
</ProjectReference>
<PackageReference Include="SkiaSharp.HarfBuzz" Version="2.80.2-preview.33" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\..\build\LegacyProject.targets" />
<Import Project="..\..\build\SkiaSharp.props" />
<Import Project="..\..\build\HarfBuzzSharp.props" />
</Project>
6 changes: 0 additions & 6 deletions samples/RenderDemo/Pages/PathMeasurementPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
using System;
using System.Diagnostics;
using System.Drawing.Drawing2D;
using System.Security.Cryptography;
using Avalonia;
using Avalonia.Controls;
using Avalonia.LogicalTree;
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Media.Immutable;
using Avalonia.Threading;
using Avalonia.Visuals.Media.Imaging;

namespace RenderDemo.Pages
{
Expand Down
1 change: 0 additions & 1 deletion samples/RenderDemo/Pages/RenderTargetBitmapPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Threading;
using Avalonia.Visuals.Media.Imaging;

namespace RenderDemo.Pages
{
Expand Down
2 changes: 1 addition & 1 deletion samples/RenderDemo/RenderDemo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\src\Avalonia.Visuals\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
<Compile Include="..\..\src\Avalonia.Base\Rendering\SceneGraph\LineBoundsHelper.cs" Link="LineBoundsHelper.cs" />
<Compile Update="Pages\TextFormatterPage.axaml.cs">
<DependentUpon>TextFormatterPage.axaml</DependentUpon>
<SubType>Code</SubType>
Expand Down
36 changes: 36 additions & 0 deletions src/Android/Avalonia.AndroidTestApplication/Avalonia.AndroidTestApplication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,40 @@
<ProjectReference Include="..\..\..\packages\Avalonia\Avalonia.csproj" />
<ProjectReference Include="..\Avalonia.Android\Avalonia.Android.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\src\Android\Avalonia.Android\Avalonia.Android.csproj">
<Project>{7b92af71-6287-4693-9dcb-bd5b6e927e23}</Project>
<Name>Avalonia.Android</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Markup\Avalonia.Markup.Xaml\Avalonia.Markup.Xaml.csproj">
<Project>{3e53a01a-b331-47f3-b828-4a5717e77a24}</Project>
<Name>Avalonia.Markup.Xaml</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Avalonia.Base\Avalonia.Base.csproj">
<Project>{b09b78d8-9b26-48b0-9149-d64a2f120f3f}</Project>
<Name>Avalonia.Base</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Avalonia.Controls\Avalonia.Controls.csproj">
<Project>{d2221c82-4a25-4583-9b43-d791e3f6820c}</Project>
<Name>Avalonia.Controls</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Avalonia.Diagnostics\Avalonia.Diagnostics.csproj">
<Project>{7062ae20-5dcc-4442-9645-8195bdece63e}</Project>
<Name>Avalonia.Diagnostics</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\src\Avalonia.Themes.Default\Avalonia.Themes.Default.csproj">
<Project>{3e10a5fa-e8da-48b1-ad44-6a5b6cb7750f}</Project>
<Name>Avalonia.Themes.Default</Name>
</ProjectReference>
<ProjectReference Include="..\..\Skia\Avalonia.Skia\Avalonia.Skia.csproj">
<Project>{7d2d3083-71dd-4cc9-8907-39a0d86fb322}</Project>
<Name>Avalonia.Skia</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\..\..\build\Base.props" />
<Import Project="..\..\..\build\Rx.props" />
<Import Project="..\..\..\build\System.Memory.props" />
<Import Project="..\..\..\build\AndroidWorkarounds.props" />
<Import Project="..\..\..\build\LegacyProject.targets" />
</Project>
5 changes: 0 additions & 5 deletions src/Avalonia.Animation/ApiCompatBaseline.txt
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Avalonia.Animation/Avalonia.Animation.csproj
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/Avalonia.Animation/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

0 src/Avalonia.Animation/Animatable.cs → src/Avalonia.Base/Animation/Animatable.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Animation.cs → src/Avalonia.Base/Animation/Animation.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Animation/AnimationInstance`1.cs → ...nia.Base/Animation/AnimationInstance`1.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/AnimatorDrivenTransition.cs → ...ase/Animation/AnimatorDrivenTransition.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/AnimatorKeyFrame.cs → ...alonia.Base/Animation/AnimatorKeyFrame.cs
View file
Open in desktop
File renamed without changes.
0 ...Animation/AnimatorTransitionObservable.cs → ...Animation/AnimatorTransitionObservable.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Animators/Animator`1.cs → ...ia.Base/Animation/Animators/Animator`1.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Animators/BaseBrushAnimator.cs → .../Animation/Animators/BaseBrushAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Animation/Animators/BoolAnimator.cs → ....Base/Animation/Animators/BoolAnimator.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Animators/BoxShadowAnimator.cs → .../Animation/Animators/BoxShadowAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...Animation/Animators/BoxShadowsAnimator.cs → ...Animation/Animators/BoxShadowsAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Animation/Animators/ByteAnimator.cs → ....Base/Animation/Animators/ByteAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...uals/Animation/Animators/ColorAnimator.cs → ...Base/Animation/Animators/ColorAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...imation/Animators/CornerRadiusAnimator.cs → ...imation/Animators/CornerRadiusAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...ia.Animation/Animators/DecimalAnimator.cs → ...se/Animation/Animators/DecimalAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/Animators/DoubleAnimator.cs → ...ase/Animation/Animators/DoubleAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Animators/FloatAnimator.cs → ...Base/Animation/Animators/FloatAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...mation/Animators/GradientBrushAnimator.cs → ...mation/Animators/GradientBrushAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Animators/Int16Animator.cs → ...Base/Animation/Animators/Int16Animator.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Animators/Int32Animator.cs → ...Base/Animation/Animators/Int32Animator.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Animators/Int64Animator.cs → ...Base/Animation/Animators/Int64Animator.cs
View file
Open in desktop
File renamed without changes.
0 ...uals/Animation/Animators/PointAnimator.cs → ...Base/Animation/Animators/PointAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...suals/Animation/Animators/RectAnimator.cs → ....Base/Animation/Animators/RectAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...mation/Animators/RelativePointAnimator.cs → ...mation/Animators/RelativePointAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...suals/Animation/Animators/SizeAnimator.cs → ....Base/Animation/Animators/SizeAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...tion/Animators/SolidColorBrushAnimator.cs → ...tion/Animators/SolidColorBrushAnimator.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Animators/ThicknessAnimator.cs → .../Animation/Animators/ThicknessAnimator.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Animators/TransformAnimator.cs → .../Animation/Animators/TransformAnimator.cs
View file
Open in desktop
File renamed without changes.
0 .../Animators/TransformOperationsAnimator.cs → .../Animators/TransformOperationsAnimator.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/Animators/UInt16Animator.cs → ...ase/Animation/Animators/UInt16Animator.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/Animators/UInt32Animator.cs → ...ase/Animation/Animators/UInt32Animator.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/Animators/UInt64Animator.cs → ...ase/Animation/Animators/UInt64Animator.cs
View file
Open in desktop
File renamed without changes.
0 ...als/Animation/Animators/VectorAnimator.cs → ...ase/Animation/Animators/VectorAnimator.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Clock.cs → src/Avalonia.Base/Animation/Clock.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/ClockBase.cs → src/Avalonia.Base/Animation/ClockBase.cs
View file
Open in desktop
File renamed without changes.
0 ...uals/Animation/CompositePageTransition.cs → ...Base/Animation/CompositePageTransition.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Animation/CrossFade.cs → src/Avalonia.Base/Animation/CrossFade.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Cue.cs → src/Avalonia.Base/Animation/Cue.cs
View file
Open in desktop
File renamed without changes.
0 ...mation/DisposeAnimationInstanceSubject.cs → ...mation/DisposeAnimationInstanceSubject.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/BackEaseIn.cs → ...onia.Base/Animation/Easings/BackEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Easing/BackEaseInOut.cs → ...a.Base/Animation/Easings/BackEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/BackEaseOut.cs → ...nia.Base/Animation/Easings/BackEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Animation/Easing/BounceEaseIn.cs → ...ia.Base/Animation/Easings/BounceEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Animation/Easing/BounceEaseInOut.cs → ...Base/Animation/Easings/BounceEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Easing/BounceEaseOut.cs → ...a.Base/Animation/Easings/BounceEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Animation/Easing/CircularEaseIn.cs → ....Base/Animation/Easings/CircularEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/Easing/CircularEaseInOut.cs → ...se/Animation/Easings/CircularEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Animation/Easing/CircularEaseOut.cs → ...Base/Animation/Easings/CircularEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/CubicEaseIn.cs → ...nia.Base/Animation/Easings/CubicEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Animation/Easing/CubicEaseInOut.cs → ....Base/Animation/Easings/CubicEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Animation/Easing/CubicEaseOut.cs → ...ia.Base/Animation/Easings/CubicEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/Easing.cs → ...Avalonia.Base/Animation/Easings/Easing.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Animation/Easing/EasingTypeConverter.cs → .../Animation/Easings/EasingTypeConverter.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Easing/ElasticEaseIn.cs → ...a.Base/Animation/Easings/ElasticEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Easing/ElasticEaseInOut.cs → ...ase/Animation/Easings/ElasticEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Animation/Easing/ElasticEaseOut.cs → ....Base/Animation/Easings/ElasticEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/Easing/ExponentialEaseIn.cs → ...se/Animation/Easings/ExponentialEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ....Animation/Easing/ExponentialEaseInOut.cs → ...Animation/Easings/ExponentialEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...ia.Animation/Easing/ExponentialEaseOut.cs → ...e/Animation/Easings/ExponentialEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/IEasing.cs → ...valonia.Base/Animation/Easings/IEasing.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Animation/Easing/LinearEasing.cs → ...ia.Base/Animation/Easings/LinearEasing.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Animation/Easing/QuadraticEaseIn.cs → ...Base/Animation/Easings/QuadraticEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...ia.Animation/Easing/QuadraticEaseInOut.cs → ...e/Animation/Easings/QuadraticEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Easing/QuadraticEaseOut.cs → ...ase/Animation/Easings/QuadraticEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Easing/QuarticEaseIn.cs → ...a.Base/Animation/Easings/QuarticEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Easing/QuarticEaseInOut.cs → ...ase/Animation/Easings/QuarticEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Animation/Easing/QuarticEaseOut.cs → ....Base/Animation/Easings/QuarticEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Easing/QuinticEaseIn.cs → ...a.Base/Animation/Easings/QuinticEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Animation/Easing/QuinticEaseInOut.cs → ...ase/Animation/Easings/QuinticEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Animation/Easing/QuinticEaseOut.cs → ....Base/Animation/Easings/QuinticEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/SineEaseIn.cs → ...onia.Base/Animation/Easings/SineEaseIn.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Animation/Easing/SineEaseInOut.cs → ...a.Base/Animation/Easings/SineEaseInOut.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Easing/SineEaseOut.cs → ...nia.Base/Animation/Easings/SineEaseOut.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Animation/Easing/SplineEasing.cs → ...ia.Base/Animation/Easings/SplineEasing.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/FillMode.cs → src/Avalonia.Base/Animation/FillMode.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/IAnimation.cs → src/Avalonia.Base/Animation/IAnimation.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/IAnimationSetter.cs → ...alonia.Base/Animation/IAnimationSetter.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/IAnimator.cs → src/Avalonia.Base/Animation/IAnimator.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/IClock.cs → src/Avalonia.Base/Animation/IClock.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/IGlobalClock.cs → src/Avalonia.Base/Animation/IGlobalClock.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Visuals/Animation/IPageTransition.cs → ...valonia.Base/Animation/IPageTransition.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/ITransition.cs → src/Avalonia.Base/Animation/ITransition.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/IterationCount.cs → ...Avalonia.Base/Animation/IterationCount.cs
View file
Open in desktop
File renamed without changes.
0 ....Animation/IterationCountTypeConverter.cs → .../Animation/IterationCountTypeConverter.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/KeyFrame.cs → src/Avalonia.Base/Animation/KeyFrame.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/KeyFrames.cs → src/Avalonia.Base/Animation/KeyFrames.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/KeySpline.cs → src/Avalonia.Base/Animation/KeySpline.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Animation/KeySplineTypeConverter.cs → ....Base/Animation/KeySplineTypeConverter.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Animation/PageSlide.cs → src/Avalonia.Base/Animation/PageSlide.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/PlayState.cs → src/Avalonia.Base/Animation/PlayState.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/PlaybackDirection.cs → ...lonia.Base/Animation/PlaybackDirection.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Visuals/Animation/RenderLoopClock.cs → ...valonia.Base/Animation/RenderLoopClock.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Transition.cs → src/Avalonia.Base/Animation/Transition.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/TransitionInstance.cs → ...onia.Base/Animation/TransitionInstance.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Animation/TransitionObservableBase.cs → ...ase/Animation/TransitionObservableBase.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Transitions.cs → src/Avalonia.Base/Animation/Transitions.cs
View file
Open in desktop
File renamed without changes.
0 ...ation/Transitions/BoxShadowsTransition.cs → ...ation/Transitions/BoxShadowsTransition.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Transitions/BrushTransition.cs → .../Animation/Transitions/BrushTransition.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Transitions/ColorTransition.cs → .../Animation/Transitions/ColorTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...ion/Transitions/CornerRadiusTransition.cs → ...ion/Transitions/CornerRadiusTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...Animation/Transitions/DoubleTransition.cs → ...Animation/Transitions/DoubleTransition.cs
View file
Open in desktop
File renamed without changes.
0 ....Animation/Transitions/FloatTransition.cs → .../Animation/Transitions/FloatTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...nimation/Transitions/IntegerTransition.cs → ...nimation/Transitions/IntegerTransition.cs
View file
Open in desktop
File renamed without changes.
0 .../Animation/Transitions/PointTransition.cs → .../Animation/Transitions/PointTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...on/Transitions/RelativePointTransition.cs → ...on/Transitions/RelativePointTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...s/Animation/Transitions/SizeTransition.cs → ...e/Animation/Transitions/SizeTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...mation/Transitions/ThicknessTransition.cs → ...mation/Transitions/ThicknessTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...nsitions/TransformOperationsTransition.cs → ...nsitions/TransformOperationsTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...Animation/Transitions/VectorTransition.cs → ...Animation/Transitions/VectorTransition.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Animation/Utils/BounceEaseUtils.cs → ...a.Base/Animation/Utils/BounceEaseUtils.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Animation/Utils/EasingUtils.cs → ...lonia.Base/Animation/Utils/EasingUtils.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Assets/BiDi.trie → src/Avalonia.Base/Assets/BiDi.trie
View file
Open in desktop
File renamed without changes.
0 ...valonia.Visuals/Assets/GraphemeBreak.trie → src/Avalonia.Base/Assets/GraphemeBreak.trie
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Assets/UnicodeData.trie → src/Avalonia.Base/Assets/UnicodeData.trie
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/Avalonia.Base/Avalonia.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<RootNamespace>Avalonia</RootNamespace>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Include="Assets\*.trie" />
</ItemGroup>
<Import Project="..\..\build\Base.props" />
<Import Project="..\..\build\Binding.props" />
<Import Project="..\..\build\Rx.props" />
Expand Down
0 ...nia.Visuals/AvaloniaPropertyExtensions.cs → ...alonia.Base/AvaloniaPropertyExtensions.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Styling/ClassBindingManager.cs → src/Avalonia.Base/ClassBindingManager.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Visuals/Media/CombinedGeometry.cs → src/Avalonia.Base/CombinedGeometry.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...alonia.Styling/Controls/ChildNameScope.cs → src/Avalonia.Base/Controls/ChildNameScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public ChildNameScope(INameScope parentScope)
return new SynchronousCompletionAsyncResult<object?>(found);
// Not found and both current and parent scope are in completed state
if(IsCompleted)
return new SynchronousCompletionAsyncResult<object?>(null);
return new SynchronousCompletionAsyncResult<object?>((object?)null);
return DoFindAsync(name);
}

Expand Down
0 src/Avalonia.Styling/Controls/Classes.cs → src/Avalonia.Base/Controls/Classes.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Styling/Controls/INameScope.cs → src/Avalonia.Base/Controls/INameScope.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Styling/Controls/IPseudoClasses.cs → src/Avalonia.Base/Controls/IPseudoClasses.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Styling/Controls/IResourceDictionary.cs → ...onia.Base/Controls/IResourceDictionary.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Styling/Controls/IResourceHost.cs → src/Avalonia.Base/Controls/IResourceHost.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Styling/Controls/IResourceNode.cs → src/Avalonia.Base/Controls/IResourceNode.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Styling/Controls/IResourceProvider.cs → ...alonia.Base/Controls/IResourceProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...Styling/Controls/ISetInheritanceParent.cs → ...ia.Base/Controls/ISetInheritanceParent.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Styling/Controls/ISetLogicalParent.cs → ...alonia.Base/Controls/ISetLogicalParent.cs
View file
Open in desktop
File renamed without changes.
0 ...ntrols/Metadata/PseudoClassesAttribute.cs → ...ntrols/Metadata/PseudoClassesAttribute.cs
View file
Open in desktop
File renamed without changes.
0 ...ontrols/Metadata/TemplatePartAttribute.cs → ...ontrols/Metadata/TemplatePartAttribute.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/Avalonia.Styling/Controls/NameScope.cs → src/Avalonia.Base/Controls/NameScope.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public void Register(string name, object element)
if (found != null)
return new SynchronousCompletionAsyncResult<object?>(found);
if (IsCompleted)
return new SynchronousCompletionAsyncResult<object?>(null);
return new SynchronousCompletionAsyncResult<object?>((object?)null);
if (!_pendingSearches.TryGetValue(name, out var tcs))
// We are intentionally running continuations synchronously here
_pendingSearches[name] = tcs = new SynchronousCompletionAsyncResultSource<object?>();
Expand Down
0 ...ia.Styling/Controls/NameScopeEventArgs.cs → ...lonia.Base/Controls/NameScopeEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Styling/Controls/NameScopeExtensions.cs → ...onia.Base/Controls/NameScopeExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Styling/Controls/NameScopeLocator.cs → ...valonia.Base/Controls/NameScopeLocator.cs
View file
Open in desktop
File renamed without changes.
0 ...yling/Controls/PseudoClassesExtensions.cs → ....Base/Controls/PseudoClassesExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ia.Styling/Controls/ResourceDictionary.cs → ...lonia.Base/Controls/ResourceDictionary.cs
View file
Open in desktop
File renamed without changes.
0 ...tyling/Controls/ResourceNodeExtensions.cs → ...a.Base/Controls/ResourceNodeExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ing/Controls/ResourcesChangedEventArgs.cs → ...ase/Controls/ResourcesChangedEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/CornerRadius.cs → src/Avalonia.Base/CornerRadius.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Styling/Diagnostics/StyleDiagnostics.cs → ...onia.Base/Diagnostics/StyleDiagnostics.cs
View file
Open in desktop
File renamed without changes.
0 ...ng/Diagnostics/StyledElementExtensions.cs → ...se/Diagnostics/StyledElementExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Visuals/Media/GeometryCollection.cs → src/Avalonia.Base/GeometryCollection.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/GeometryGroup.cs → src/Avalonia.Base/GeometryGroup.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Styling/IDataContextProvider.cs → src/Avalonia.Base/IDataContextProvider.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Styling/INamed.cs → src/Avalonia.Base/INamed.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Styling/IStyledElement.cs → src/Avalonia.Base/IStyledElement.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/AccessKeyHandler.cs → src/Avalonia.Base/Input/AccessKeyHandler.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Cursor.cs → src/Avalonia.Base/Input/Cursor.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/DataFormats.cs → src/Avalonia.Base/Input/DataFormats.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/DataObject.cs → src/Avalonia.Base/Input/DataObject.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/DragDrop.cs → src/Avalonia.Base/Input/DragDrop.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/DragDropDevice.cs → src/Avalonia.Base/Input/DragDropDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/DragDropEffects.cs → src/Avalonia.Base/Input/DragDropEffects.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/DragEventArgs.cs → src/Avalonia.Base/Input/DragEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/FocusManager.cs → src/Avalonia.Base/Input/FocusManager.cs
View file
Open in desktop
File renamed without changes.
0 ...ecognizers/GestureRecognizerCollection.cs → ...ecognizers/GestureRecognizerCollection.cs
View file
Open in desktop
File renamed without changes.
0 .../GestureRecognizers/IGestureRecognizer.cs → .../GestureRecognizers/IGestureRecognizer.cs
View file
Open in desktop
File renamed without changes.
0 ...ureRecognizers/ScrollGestureRecognizer.cs → ...ureRecognizers/ScrollGestureRecognizer.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Gestures.cs → src/Avalonia.Base/Input/Gestures.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/GotFocusEventArgs.cs → src/Avalonia.Base/Input/GotFocusEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IAccessKeyHandler.cs → src/Avalonia.Base/Input/IAccessKeyHandler.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IClickableControl.cs → src/Avalonia.Base/Input/IClickableControl.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/ICloseable.cs → src/Avalonia.Base/Input/ICloseable.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/ICommandSource.cs → src/Avalonia.Base/Input/ICommandSource.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Input/ICustomKeyboardNavigation.cs → ...a.Base/Input/ICustomKeyboardNavigation.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IDataObject.cs → src/Avalonia.Base/Input/IDataObject.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IFocusManager.cs → src/Avalonia.Base/Input/IFocusManager.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IFocusScope.cs → src/Avalonia.Base/Input/IFocusScope.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IInputDevice.cs → src/Avalonia.Base/Input/IInputDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IInputElement.cs → src/Avalonia.Base/Input/IInputElement.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IInputManager.cs → src/Avalonia.Base/Input/IInputManager.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IInputRoot.cs → src/Avalonia.Base/Input/IInputRoot.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IKeyboardDevice.cs → src/Avalonia.Base/Input/IKeyboardDevice.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Input/IKeyboardNavigationHandler.cs → ....Base/Input/IKeyboardNavigationHandler.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IMainMenu.cs → src/Avalonia.Base/Input/IMainMenu.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IMouseDevice.cs → src/Avalonia.Base/Input/IMouseDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/INavigableContainer.cs → ...valonia.Base/Input/INavigableContainer.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IPointer.cs → src/Avalonia.Base/Input/IPointer.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/IPointerDevice.cs → src/Avalonia.Base/Input/IPointerDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/InputElement.cs → src/Avalonia.Base/Input/InputElement.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/InputExtensions.cs → src/Avalonia.Base/Input/InputExtensions.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/InputManager.cs → src/Avalonia.Base/Input/InputManager.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/InputMethod.cs → src/Avalonia.Base/Input/InputMethod.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Key.cs → src/Avalonia.Base/Input/Key.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/KeyBinding.cs → src/Avalonia.Base/Input/KeyBinding.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/KeyEventArgs.cs → src/Avalonia.Base/Input/KeyEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/KeyGesture.cs → src/Avalonia.Base/Input/KeyGesture.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/KeyboardDevice.cs → src/Avalonia.Base/Input/KeyboardDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/KeyboardNavigation.cs → ...Avalonia.Base/Input/KeyboardNavigation.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Input/KeyboardNavigationHandler.cs → ...a.Base/Input/KeyboardNavigationHandler.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/KeyboardNavigationMode.cs → ...onia.Base/Input/KeyboardNavigationMode.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/MouseDevice.cs → src/Avalonia.Base/Input/MouseDevice.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Input/Navigation/FocusExtensions.cs → ....Base/Input/Navigation/FocusExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...valonia.Input/Navigation/TabNavigation.cs → ...ia.Base/Input/Navigation/TabNavigation.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/NavigationDirection.cs → ...valonia.Base/Input/NavigationDirection.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/NavigationMethod.cs → src/Avalonia.Base/Input/NavigationMethod.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Platform/IClipboard.cs → ...valonia.Base/Input/Platform/IClipboard.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Input/Platform/IPlatformDragSource.cs → ...ase/Input/Platform/IPlatformDragSource.cs
View file
Open in desktop
File renamed without changes.
0 ...t/Platform/PlatformHotkeyConfiguration.cs → ...t/Platform/PlatformHotkeyConfiguration.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Pointer.cs → src/Avalonia.Base/Input/Pointer.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/PointerDeltaEventArgs.cs → ...lonia.Base/Input/PointerDeltaEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/PointerEventArgs.cs → src/Avalonia.Base/Input/PointerEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/PointerPoint.cs → src/Avalonia.Base/Input/PointerPoint.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/PointerWheelEventArgs.cs → ...lonia.Base/Input/PointerWheelEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/IDragDropDevice.cs → ...valonia.Base/Input/Raw/IDragDropDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/RawDragEvent.cs → src/Avalonia.Base/Input/Raw/RawDragEvent.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/RawDragEventType.cs → ...alonia.Base/Input/Raw/RawDragEventType.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/RawInputEventArgs.cs → ...lonia.Base/Input/Raw/RawInputEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/RawKeyEventArgs.cs → ...valonia.Base/Input/Raw/RawKeyEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Input/Raw/RawMouseWheelEventArgs.cs → ....Base/Input/Raw/RawMouseWheelEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Input/Raw/RawPointerEventArgs.cs → ...nia.Base/Input/Raw/RawPointerEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Input/Raw/RawPointerGestureEventArgs.cs → ...e/Input/Raw/RawPointerGestureEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/RawSizeEventArgs.cs → ...alonia.Base/Input/Raw/RawSizeEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Input/Raw/RawTextInputEventArgs.cs → ...a.Base/Input/Raw/RawTextInputEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/Raw/RawTouchEventArgs.cs → ...lonia.Base/Input/Raw/RawTouchEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/ScrollGestureEventArgs.cs → ...onia.Base/Input/ScrollGestureEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/TappedEventArgs.cs → src/Avalonia.Base/Input/TappedEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...Input/TextInput/ITextInputMethodClient.cs → ...Input/TextInput/ITextInputMethodClient.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Input/TextInput/ITextInputMethodImpl.cs → ...e/Input/TextInput/ITextInputMethodImpl.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Input/TextInput/InputMethodManager.cs → ...ase/Input/TextInput/InputMethodManager.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Input/TextInput/TextInputContentType.cs → ...e/Input/TextInput/TextInputContentType.cs
View file
Open in desktop
File renamed without changes.
0 ...extInputMethodClientRequestedEventArgs.cs → ...extInputMethodClientRequestedEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Input/TextInput/TextInputOptions.cs → ....Base/Input/TextInput/TextInputOptions.cs
View file
Open in desktop
File renamed without changes.
0 ...nput/TextInput/TransformTrackingHelper.cs → ...nput/TextInput/TransformTrackingHelper.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/TextInputEventArgs.cs → ...Avalonia.Base/Input/TextInputEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/TouchDevice.cs → src/Avalonia.Base/Input/TouchDevice.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Input/VectorEventArgs.cs → src/Avalonia.Base/Input/VectorEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Interactivity/EventRoute.cs → ...Avalonia.Base/Interactivity/EventRoute.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Interactivity/IInteractive.cs → ...alonia.Base/Interactivity/IInteractive.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Interactivity/Interactive.cs → ...valonia.Base/Interactivity/Interactive.cs
View file
Open in desktop
File renamed without changes.
0 ...ia.Interactivity/InteractiveExtensions.cs → ...se/Interactivity/InteractiveExtensions.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Interactivity/RoutedEvent.cs → ...valonia.Base/Interactivity/RoutedEvent.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Interactivity/RoutedEventArgs.cs → ...nia.Base/Interactivity/RoutedEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Interactivity/RoutedEventRegistry.cs → ...Base/Interactivity/RoutedEventRegistry.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/AttachedLayout.cs → src/Avalonia.Base/Layout/AttachedLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...yout/EffectiveViewportChangedEventArgs.cs → ...yout/EffectiveViewportChangedEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/ElementManager.cs → src/Avalonia.Base/Layout/ElementManager.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/FlowLayoutAlgorithm.cs → ...alonia.Base/Layout/FlowLayoutAlgorithm.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/IEmbeddedLayoutRoot.cs → ...alonia.Base/Layout/IEmbeddedLayoutRoot.cs
View file
Open in desktop
File renamed without changes.
0 ...a.Layout/IFlowLayoutAlgorithmDelegates.cs → ...e/Layout/IFlowLayoutAlgorithmDelegates.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/ILayoutManager.cs → src/Avalonia.Base/Layout/ILayoutManager.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/ILayoutRoot.cs → src/Avalonia.Base/Layout/ILayoutRoot.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/ILayoutable.cs → src/Avalonia.Base/Layout/ILayoutable.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/LayoutContext.cs → src/Avalonia.Base/Layout/LayoutContext.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/LayoutContextAdapter.cs → ...lonia.Base/Layout/LayoutContextAdapter.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/LayoutExtensions.cs → src/Avalonia.Base/Layout/LayoutExtensions.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/LayoutHelper.cs → src/Avalonia.Base/Layout/LayoutHelper.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/LayoutManager.cs → src/Avalonia.Base/Layout/LayoutManager.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/LayoutQueue.cs → src/Avalonia.Base/Layout/LayoutQueue.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/Layoutable.cs → src/Avalonia.Base/Layout/Layoutable.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/NonVirtualizingLayout.cs → ...onia.Base/Layout/NonVirtualizingLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...ia.Layout/NonVirtualizingLayoutContext.cs → ...se/Layout/NonVirtualizingLayoutContext.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Layout/NonVirtualizingStackLayout.cs → ...Base/Layout/NonVirtualizingStackLayout.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/Orientation.cs → src/Avalonia.Base/Layout/Orientation.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Layout/OrientationBasedMeasures.cs → ...a.Base/Layout/OrientationBasedMeasures.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/StackLayout.cs → src/Avalonia.Base/Layout/StackLayout.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/StackLayoutState.cs → src/Avalonia.Base/Layout/StackLayoutState.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/UniformGridLayout.cs → ...Avalonia.Base/Layout/UniformGridLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Layout/UniformGridLayoutState.cs → ...nia.Base/Layout/UniformGridLayoutState.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/Utils/ListUtils.cs → src/Avalonia.Base/Layout/Utils/ListUtils.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Layout/VirtualLayoutContextAdapter.cs → ...ase/Layout/VirtualLayoutContextAdapter.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/VirtualizingLayout.cs → ...valonia.Base/Layout/VirtualizingLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Layout/VirtualizingLayoutContext.cs → ....Base/Layout/VirtualizingLayoutContext.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/WrapLayout/UvBounds.cs → ...alonia.Base/Layout/WrapLayout/UvBounds.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/WrapLayout/UvMeasure.cs → ...lonia.Base/Layout/WrapLayout/UvMeasure.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/WrapLayout/WrapItem.cs → ...alonia.Base/Layout/WrapLayout/WrapItem.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Layout/WrapLayout/WrapLayout.cs → ...onia.Base/Layout/WrapLayout/WrapLayout.cs
View file
Open in desktop
File renamed without changes.
0 ...onia.Layout/WrapLayout/WrapLayoutState.cs → ...Base/Layout/WrapLayout/WrapLayoutState.cs
View file
Open in desktop
File renamed without changes.
0 ...LogicalTree/ChildIndexChangedEventArgs.cs → ...LogicalTree/ChildIndexChangedEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 ...nia.Styling/LogicalTree/ControlLocator.cs → ...alonia.Base/LogicalTree/ControlLocator.cs
View file
Open in desktop
File renamed without changes.
0 ...tyling/LogicalTree/IChildIndexProvider.cs → ...a.Base/LogicalTree/IChildIndexProvider.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Styling/LogicalTree/ILogical.cs → src/Avalonia.Base/LogicalTree/ILogical.cs
View file
Open in desktop
File renamed without changes.
0 ...lonia.Styling/LogicalTree/ILogicalRoot.cs → ...Avalonia.Base/LogicalTree/ILogicalRoot.cs
View file
Open in desktop
File renamed without changes.
0 ....Styling/LogicalTree/LogicalExtensions.cs → ...nia.Base/LogicalTree/LogicalExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...calTree/LogicalTreeAttachmentEventArgs.cs → ...calTree/LogicalTreeAttachmentEventArgs.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Matrix.cs → src/Avalonia.Base/Matrix.cs
View file
Open in desktop
File renamed without changes.
0 ....Visuals/Media/AcrylicBackgroundSource.cs → ...nia.Base/Media/AcrylicBackgroundSource.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/AlignmentX.cs → src/Avalonia.Base/Media/AlignmentX.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/AlignmentY.cs → src/Avalonia.Base/Media/AlignmentY.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/ArcSegment.cs → src/Avalonia.Base/Media/ArcSegment.cs
View file
Open in desktop
File renamed without changes.
0 ...alonia.Visuals/Media/BaselineAlignment.cs → src/Avalonia.Base/Media/BaselineAlignment.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/BezierSegment .cs → src/Avalonia.Base/Media/BezierSegment .cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/BoxShadow.cs → src/Avalonia.Base/Media/BoxShadow.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/BoxShadows.cs → src/Avalonia.Base/Media/BoxShadows.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/Brush.cs → src/Avalonia.Base/Media/Brush.cs
View file
Open in desktop
File renamed without changes.
0 src/Avalonia.Visuals/Media/BrushConverter.cs → src/Avalonia.Base/Media/BrushConverter.cs
View file
Open in desktop
File renamed without changes.
0 ...Avalonia.Visuals/Media/BrushExtensions.cs → src/Avalonia.Base/Media/BrushExtensions.cs
View file
Open in desktop
File renamed without changes.
Loading