diff --git a/AvaloniaBehaviors.sln b/AvaloniaBehaviors.sln
index 263458b12..afd901025 100644
--- a/AvaloniaBehaviors.sln
+++ b/AvaloniaBehaviors.sln
@@ -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
@@ -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
@@ -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}
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/Core/ExecuteCommandBehaviorBase.cs b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/Core/ExecuteCommandBehaviorBase.cs
index 04efed2f6..0739022a0 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/Core/ExecuteCommandBehaviorBase.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/ExecuteCommand/Core/ExecuteCommandBehaviorBase.cs
@@ -77,6 +77,9 @@ public Control? FocusControl
set => SetValue(FocusControlProperty, value);
}
+ ///
+ ///
+ ///
[ResolveByName]
public Control? SourceControl
{
diff --git a/src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ItemsControlContainerEventsBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ItemsControlContainerEventsBehavior.cs
index 507f8ce7e..64ebc0700 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ItemsControlContainerEventsBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/ItemsControl/ItemsControlContainerEventsBehavior.cs
@@ -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);
}
diff --git a/src/Avalonia.Xaml.Interactions.Custom/SelectingItemsControl/SelectingItemsControlEventsBehavior.cs b/src/Avalonia.Xaml.Interactions.Custom/SelectingItemsControl/SelectingItemsControlEventsBehavior.cs
index 8a4e80315..a07e5a514 100644
--- a/src/Avalonia.Xaml.Interactions.Custom/SelectingItemsControl/SelectingItemsControlEventsBehavior.cs
+++ b/src/Avalonia.Xaml.Interactions.Custom/SelectingItemsControl/SelectingItemsControlEventsBehavior.cs
@@ -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);
}
diff --git a/src/Xaml.Interactions/Properties/AssemblyInfo.cs b/src/Xaml.Behaviors/Properties/AssemblyInfo.cs
similarity index 70%
rename from src/Xaml.Interactions/Properties/AssemblyInfo.cs
rename to src/Xaml.Behaviors/Properties/AssemblyInfo.cs
index d7da54b12..15c093ea4 100644
--- a/src/Xaml.Interactions/Properties/AssemblyInfo.cs
+++ b/src/Xaml.Behaviors/Properties/AssemblyInfo.cs
@@ -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")]
diff --git a/src/Xaml.Behaviors/Xaml.Behaviors.csproj b/src/Xaml.Behaviors/Xaml.Behaviors.csproj
index af2f867c7..d522b2073 100644
--- a/src/Xaml.Behaviors/Xaml.Behaviors.csproj
+++ b/src/Xaml.Behaviors/Xaml.Behaviors.csproj
@@ -2,9 +2,13 @@
netstandard2.0;net6.0;net8.0
+ Library
+ bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
False
enable
$(NoWarn);NU5128
+ False
+ False
@@ -15,15 +19,32 @@
+
+
+ ..\Avalonia.Xaml.Interactivity
+ ..\Avalonia.Xaml.Interactions
+ ..\Avalonia.Xaml.Interactions.Custom
+ ..\Avalonia.Xaml.Interactions.DragAndDrop
+ ..\Avalonia.Xaml.Interactions.Draggable
+ ..\Avalonia.Xaml.Interactions.Events
+ ..\Avalonia.Xaml.Interactions.Responsive
+
+
-
-
+
+
+
+
+
+
+
+
diff --git a/src/Xaml.Interactions/Xaml.Interactions.csproj b/src/Xaml.Interactions/Xaml.Interactions.csproj
deleted file mode 100644
index b9b78429c..000000000
--- a/src/Xaml.Interactions/Xaml.Interactions.csproj
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- netstandard2.0;net6.0;net8.0
- Library
- bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
- enable
- False
- False
-
-
-
- Xaml.Interactions
- Easily add interactivity to your Avalonia apps using XAML Behaviors. Behaviors encapsulate reusable functionalities for elements that can be easily added to your XAML without the need for more imperative code.
- Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml
-
-
-
-
-
-
-
-
- ..\Avalonia.Xaml.Interactions
- ..\Avalonia.Xaml.Interactions.Custom
- ..\Avalonia.Xaml.Interactions.DragAndDrop
- ..\Avalonia.Xaml.Interactions.Draggable
- ..\Avalonia.Xaml.Interactions.Events
- ..\Avalonia.Xaml.Interactions.Responsive
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Xaml.Interactivity/Xaml.Interactivity.csproj b/src/Xaml.Interactivity/Xaml.Interactivity.csproj
deleted file mode 100644
index 00da2c622..000000000
--- a/src/Xaml.Interactivity/Xaml.Interactivity.csproj
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
- netstandard2.0;net6.0;net8.0
- Library
- bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml
- enable
- False
- False
-
-
-
- Xaml.Interactivity
- Easily add interactivity to your Avalonia apps using XAML Behaviors. Behaviors encapsulate reusable functionalities for elements that can be easily added to your XAML without the need for more imperative code.
- Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml
-
-
-
-
-
-
-
- ..\Avalonia.Xaml.Interactivity
-
-
-
-
-
-
-
-
-
-
-
-