Skip to content

Merge Xaml.Behaviors packages #19

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

Merged
merged 1 commit into from
Dec 17, 2024
Merged

Merge Xaml.Behaviors packages #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions AvaloniaBehaviors.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Xaml.Interactions.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Behaviors", "src\Xaml.Behaviors\Xaml.Behaviors.csproj", "{4D130812-D955-4C68-B6A6-7D25F2C5DC0A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Interactivity", "src\Xaml.Interactivity\Xaml.Interactivity.csproj", "{33A1FC52-DC9F-470E-BA3F-82FFDCB182E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xaml.Interactions", "src\Xaml.Interactions\Xaml.Interactions.csproj", "{2202D50B-4115-4B6A-856C-5C4919C836B2}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -156,14 +152,6 @@ Global
{4D130812-D955-4C68-B6A6-7D25F2C5DC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4D130812-D955-4C68-B6A6-7D25F2C5DC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4D130812-D955-4C68-B6A6-7D25F2C5DC0A}.Release|Any CPU.Build.0 = Release|Any CPU
{33A1FC52-DC9F-470E-BA3F-82FFDCB182E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{33A1FC52-DC9F-470E-BA3F-82FFDCB182E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{33A1FC52-DC9F-470E-BA3F-82FFDCB182E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{33A1FC52-DC9F-470E-BA3F-82FFDCB182E2}.Release|Any CPU.Build.0 = Release|Any CPU
{2202D50B-4115-4B6A-856C-5C4919C836B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2202D50B-4115-4B6A-856C-5C4919C836B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2202D50B-4115-4B6A-856C-5C4919C836B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2202D50B-4115-4B6A-856C-5C4919C836B2}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -188,8 +176,6 @@ Global
{D647E09E-BBF2-4432-A4E0-80FBB921C1EE} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
{648FFF6A-A8F5-491C-AC1C-19FC2061D6B4} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
{4D130812-D955-4C68-B6A6-7D25F2C5DC0A} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
{33A1FC52-DC9F-470E-BA3F-82FFDCB182E2} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
{2202D50B-4115-4B6A-856C-5C4919C836B2} = {84224365-32B6-46AF-85A2-45640E6D7EEB}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E64CD420-15B1-487C-9806-41EBE6DC15A4}
Expand Down
3 changes: 3 additions & 0 deletions src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/Core/ExecuteCommandBehaviorBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public Control? FocusControl
set => SetValue(FocusControlProperty, value);
}

/// <summary>
///
/// </summary>
[ResolveByName]
public Control? SourceControl
{
Expand Down
2 changes: 1 addition & 1 deletion src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ItemsControlContainerEventsBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ private void ItemsControlOnContainerPrepared(object? sender, ContainerPreparedEv
OnContainerPrepared(sender, e);
}

private void ItemsControlOnContainerIndexChanged(object sender, ContainerIndexChangedEventArgs e)
private void ItemsControlOnContainerIndexChanged(object? sender, ContainerIndexChangedEventArgs e)
{
OnContainerIndexChanged(sender, e);
}
Expand Down
2 changes: 1 addition & 1 deletion ...nia.Xaml.Interactions.Custom/SelectingItemsControl/SelectingItemsControlEventsBehavior.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected override void OnAttached(CompositeDisposable disposables)
() => selectingItemsControl.SelectionChanged -= SelectingItemsControlOnSelectionChanged));
}

private void SelectingItemsControlOnSelectionChanged(object sender, SelectionChangedEventArgs e)
private void SelectingItemsControlOnSelectionChanged(object? sender, SelectionChangedEventArgs e)
{
OnSelectionChanged(sender, e);
}
Expand Down
2 changes: 2 additions & 0 deletions ...l.Interactions/Properties/AssemblyInfo.cs → ...Xaml.Behaviors/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
using System.Runtime.CompilerServices;
using Avalonia.Metadata;

[assembly: InternalsVisibleTo("Avalonia.Xaml.Interactivity.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001002940ed211918fcf63c506fad1d3f7f958b21ff8f06fd2089398296173f9ca93a69b9b380a828bf13fa80d1745beeb917ec3692f4d10e44b4c941619fc7bbd5052b26880697e6fa3f0ce322c4fa902d20b67a48b4144371218f6d39ad39145ea1fe5484052dd51a2ee62af3acd0759bcf92aaefec03978ded3cfaa84798e92de8")]
[assembly: InternalsVisibleTo("Avalonia.Xaml.Interactions.UnitTests, PublicKey=00240000048000009400000006020000002400005253413100040000010001002940ed211918fcf63c506fad1d3f7f958b21ff8f06fd2089398296173f9ca93a69b9b380a828bf13fa80d1745beeb917ec3692f4d10e44b4c941619fc7bbd5052b26880697e6fa3f0ce322c4fa902d20b67a48b4144371218f6d39ad39145ea1fe5484052dd51a2ee62af3acd0759bcf92aaefec03978ded3cfaa84798e92de8")]

[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Xaml.Interactivity")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Xaml.Interactions")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Xaml.Interactions.Core")]
[assembly: XmlnsDefinition("https://github.com/avaloniaui", "Avalonia.Xaml.Interactions.Custom")]
Expand Down
25 changes: 23 additions & 2 deletions src/Xaml.Behaviors/Xaml.Behaviors.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
<OutputType>Library</OutputType>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<IncludeBuildOutput>False</IncludeBuildOutput>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);NU5128</NoWarn>
<EnableDefaultCompileItems>False</EnableDefaultCompileItems>
<EnableDefaultItems>False</EnableDefaultItems>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -15,15 +19,32 @@

<ItemGroup>
<PackageReference Include="Avalonia" />
<PackageReference Include="System.Reactive" />
</ItemGroup>

<Import Project="..\..\build\SignAssembly.props" />
<Import Project="..\..\build\SourceLink.props" />
<Import Project="..\..\build\TrimmingEnable.targets" />

<PropertyGroup>
<InteractivitySourcesBasePath>..\Avalonia.Xaml.Interactivity</InteractivitySourcesBasePath>
<InteractionsSourcesBasePath>..\Avalonia.Xaml.Interactions</InteractionsSourcesBasePath>
<InteractionsCustomSourcesBasePath>..\Avalonia.Xaml.Interactions.Custom</InteractionsCustomSourcesBasePath>
<InteractionsDragAndDropSourcesBasePath>..\Avalonia.Xaml.Interactions.DragAndDrop</InteractionsDragAndDropSourcesBasePath>
<InteractionsDraggableSourcesBasePath>..\Avalonia.Xaml.Interactions.Draggable</InteractionsDraggableSourcesBasePath>
<InteractionsEventsSourcesBasePath>..\Avalonia.Xaml.Interactions.Events</InteractionsEventsSourcesBasePath>
<InteractionsResponsiveSourcesBasePath>..\Avalonia.Xaml.Interactions.Responsive</InteractionsResponsiveSourcesBasePath>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\Xaml.Interactivity\Xaml.Interactivity.csproj" />
<ProjectReference Include="..\Xaml.Interactions\Xaml.Interactions.csproj" />
<Compile Include="**\*.cs" Exclude="bin\**;obj\**" />
<Compile Include="$(InteractivitySourcesBasePath)\**\*.cs" Exclude="$(InteractivitySourcesBasePath)\Properties\**;$(InteractivitySourcesBasePath)\obj\**;$(InteractivitySourcesBasePath)\bin\**" />
<Compile Include="$(InteractionsSourcesBasePath)\**\*.cs" Exclude="$(InteractionsSourcesBasePath)\Properties\**;$(InteractionsSourcesBasePath)\obj\**;$(InteractionsSourcesBasePath)\bin\**" />
<Compile Include="$(InteractionsCustomSourcesBasePath)\**\*.cs" LinkBase="Custom" Exclude="$(InteractionsCustomSourcesBasePath)\Properties\**;$(InteractionsCustomSourcesBasePath)\obj\**;$(InteractionsCustomSourcesBasePath)\bin\**" />
<Compile Include="$(InteractionsDragAndDropSourcesBasePath)\**\*.cs" LinkBase="DragAndDrop" Exclude="$(InteractionsDragAndDropSourcesBasePath)\Properties\**;$(InteractionsDragAndDropSourcesBasePath)\obj\**;$(InteractionsDragAndDropSourcesBasePath)\bin\**" />
<Compile Include="$(InteractionsDraggableSourcesBasePath)\**\*.cs" LinkBase="Draggable" Exclude="$(InteractionsDraggableSourcesBasePath)\Properties\**;$(InteractionsDraggableSourcesBasePath)\obj\**;$(InteractionsDraggableSourcesBasePath)\bin\**" />
<Compile Include="$(InteractionsEventsSourcesBasePath)\**\*.cs" LinkBase="Events" Exclude="$(InteractionsEventsSourcesBasePath)\Properties\**;$(InteractionsEventsSourcesBasePath)\obj\**;$(InteractionsEventsSourcesBasePath)\bin\**" />
<Compile Include="$(InteractionsResponsiveSourcesBasePath)\**\*.cs" LinkBase="Responsive" Exclude="$(InteractionsResponsiveSourcesBasePath)\Properties\**;$(InteractionsResponsiveSourcesBasePath)\obj\**;$(InteractionsResponsiveSourcesBasePath)\bin\**" />
</ItemGroup>

</Project>
50 changes: 0 additions & 50 deletions src/Xaml.Interactions/Xaml.Interactions.csproj
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/Xaml.Interactivity/Xaml.Interactivity.csproj
View file
Open in desktop

This file was deleted.

Loading