diff --git a/Samples/AvaloniaExample/BusinessLibrary/BusinessLibrary.csproj b/Samples/AvaloniaExample/BusinessLibrary/BusinessLibrary.csproj
index a5590e6ca2..cd1f55261c 100644
--- a/Samples/AvaloniaExample/BusinessLibrary/BusinessLibrary.csproj
+++ b/Samples/AvaloniaExample/BusinessLibrary/BusinessLibrary.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="10.1.0" />
+    <PackageReference Include="Csla" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Samples/AvaloniaExample/CslaAvaloniaExample.Tests/CslaAvaloniaExample.Tests.csproj b/Samples/AvaloniaExample/CslaAvaloniaExample.Tests/CslaAvaloniaExample.Tests.csproj
index 90ceec9f67..bb05dba323 100644
--- a/Samples/AvaloniaExample/CslaAvaloniaExample.Tests/CslaAvaloniaExample.Tests.csproj
+++ b/Samples/AvaloniaExample/CslaAvaloniaExample.Tests/CslaAvaloniaExample.Tests.csproj
@@ -7,16 +7,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia.Headless.XUnit" Version="12.1.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.1" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
-    <PackageReference Include="xunit.v3" Version="3.2.2" />
+    <PackageReference Include="Avalonia.Headless.XUnit" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Csla.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit.v3" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\BusinessLibrary\BusinessLibrary.csproj" />
     <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
-    <ProjectReference Include="..\..\..\Source\Csla.Xaml.Avalonia\Csla.Xaml.Avalonia.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Samples/AvaloniaExample/CslaAvaloniaExample.slnx b/Samples/AvaloniaExample/CslaAvaloniaExample.slnx
index fdf63d8717..d9923aa795 100644
--- a/Samples/AvaloniaExample/CslaAvaloniaExample.slnx
+++ b/Samples/AvaloniaExample/CslaAvaloniaExample.slnx
@@ -1,4 +1,9 @@
 <Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
+    <File Path="README.md" />
+  </Folder>
   <Project Path="DataAccess/DataAccess.csproj" />
   <Project Path="BusinessLibrary/BusinessLibrary.csproj" />
   <Project Path="CslaAvaloniaExample/CslaAvaloniaExample.csproj" />
diff --git a/Samples/AvaloniaExample/CslaAvaloniaExample/CslaAvaloniaExample.csproj b/Samples/AvaloniaExample/CslaAvaloniaExample/CslaAvaloniaExample.csproj
index 68d8ab105a..42e229dd20 100644
--- a/Samples/AvaloniaExample/CslaAvaloniaExample/CslaAvaloniaExample.csproj
+++ b/Samples/AvaloniaExample/CslaAvaloniaExample/CslaAvaloniaExample.csproj
@@ -8,16 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="12.1.1" />
-    <PackageReference Include="Avalonia.Desktop" Version="12.1.1" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.1" />
-    <PackageReference Include="Csla" Version="10.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Csla.Avalonia" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\BusinessLibrary\BusinessLibrary.csproj" />
     <ProjectReference Include="..\DataAccess\DataAccess.csproj" />
-    <ProjectReference Include="..\..\..\Source\Csla.Xaml.Avalonia\Csla.Xaml.Avalonia.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Samples/AvaloniaExample/Directory.Packages.props b/Samples/AvaloniaExample/Directory.Packages.props
new file mode 100644
index 0000000000..bc24e2e266
--- /dev/null
+++ b/Samples/AvaloniaExample/Directory.Packages.props
@@ -0,0 +1,18 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CslaVersion>10.2.0-beta.1</CslaVersion>
+    <AvaloniaVersion>12.1.1</AvaloniaVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Csla" Version="$(CslaVersion)" />
+    <PackageVersion Include="Csla.Avalonia" Version="$(CslaVersion)" />
+    <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Headless.XUnit" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+    <PackageVersion Include="xunit.v3" Version="3.2.2" />
+  </ItemGroup>
+</Project>
diff --git a/Samples/AvaloniaExample/README.md b/Samples/AvaloniaExample/README.md
index 82c44d517c..6ba37224c4 100644
--- a/Samples/AvaloniaExample/README.md
+++ b/Samples/AvaloniaExample/README.md
@@ -1,15 +1,22 @@
 # CSLA Avalonia Example
 
 This sample is a small Avalonia desktop application used to exercise the
-`Csla.Xaml.Avalonia` implementation against real CSLA business objects.
+`Csla.Avalonia` package against real CSLA business objects.
 
 ## Projects
 
 - `DataAccess` — in-memory `IPersonDal` implementation.
 - `BusinessLibrary` — `PersonEdit`, `PersonInfo`, and `PersonList` CSLA objects.
-- `CslaAvaloniaExample` — Avalonia desktop UI using the local `Csla.Xaml.Avalonia` project.
+- `CslaAvaloniaExample` — Avalonia desktop UI using the `Csla.Avalonia` package.
 - `CslaAvaloniaExample.Tests` — Avalonia headless tests for CSLA/Avalonia integration.
 
+## Package versions
+
+Package versions are managed centrally in `Directory.Packages.props`. The CSLA
+packages use the `CslaVersion` property, so to run the sample against a different
+CSLA build (for example, packages you packed locally from `Source/csla.build.sln`),
+change that value and make sure the package source is available to NuGet.
+
 ## Run the sample
 
 From `Samples/AvaloniaExample`:
diff --git a/Source/Csla.Xaml.Avalonia/Csla.Xaml.Avalonia.csproj b/Source/Csla.Xaml.Avalonia/Csla.Xaml.Avalonia.csproj
index 5c0eb33943..10df14c099 100644
--- a/Source/Csla.Xaml.Avalonia/Csla.Xaml.Avalonia.csproj
+++ b/Source/Csla.Xaml.Avalonia/Csla.Xaml.Avalonia.csproj
@@ -1,35 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <Import Project="..\Directory.Package.props" />
-
-    <PropertyGroup>
-        <TargetFramework>net10.0</TargetFramework>
-        <AssemblyName>Csla.Xaml</AssemblyName>
-        <RootNamespace>Csla.Xaml</RootNamespace>
-
-        <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
-
-        <Title>CSLA .NET for Avalonia</Title>
-        <PackageTags>CSLA;Business;Avalonia;XAML</PackageTags>
-        <PackageId>Csla.Avalonia</PackageId>
-
-        <Nullable>enable</Nullable>
-        <WarningsAsErrors>nullable</WarningsAsErrors>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Avalonia" Version="12.1.1" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'=='Release'">
-        <PackageReference Include="Csla" Version="10.0.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(Configuration)'!='Release'">
-        <ProjectReference Include="..\Csla\Csla.csproj" />
-    </ItemGroup>
-
-    <Import Project="..\Csla.Xaml.Shared\Csla.Xaml.Shared.projitems"
-            Label="Shared" />
-
-</Project>
\ No newline at end of file
+  <Import Project="..\Directory.Package.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <AssemblyName>Csla.Xaml</AssemblyName>
+    <RootNamespace>Csla.Xaml</RootNamespace>
+    <PackageId>Csla.Avalonia</PackageId>
+    <Product>CSLA .NET Avalonia</Product>
+    <Description>UI helpers for using CSLA .NET business types with Avalonia.</Description>
+    <SignAssembly>true</SignAssembly>
+    <BaseOutputPath>..\..\Bin</BaseOutputPath>
+    <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
+
+    <Title>CSLA .NET Avalonia</Title>
+    <PackageTags>CSLA;Avalonia;XAML</PackageTags>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia" Version="12.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Csla\Csla.csproj" />
+  </ItemGroup>
+
+  <Import Project="..\Csla.Xaml.Shared\Csla.Xaml.Shared.projitems" Label="Shared" />
+
+</Project>
diff --git a/Source/csla.build.sln b/Source/csla.build.sln
index 056f3127f5..59604984fd 100644
--- a/Source/csla.build.sln
+++ b/Source/csla.build.sln
@@ -77,6 +77,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Channels.Wcf", "Csla.C
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Testing", "Csla.Testing\Csla.Testing.csproj", "{5ECC7150-E415-4FD6-99A4-08110DB54EE1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Xaml.Avalonia", "Csla.Xaml.Avalonia\Csla.Xaml.Avalonia.csproj", "{F6080E51-675F-47A8-B125-55DCF66359F8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -4181,6 +4183,206 @@ Global
 		{5ECC7150-E415-4FD6-99A4-08110DB54EE1}.Testing|x64.Build.0 = Debug|Any CPU
 		{5ECC7150-E415-4FD6-99A4-08110DB54EE1}.Testing|x86.ActiveCfg = Debug|Any CPU
 		{5ECC7150-E415-4FD6-99A4-08110DB54EE1}.Testing|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.AppStore|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.CD_ROM|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Debug|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.DVD-5|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Debug|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Mono Release|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|AnyOS.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|AnyOS.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|ARM.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|ARM.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|iPhone.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Win32.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Win32.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Win64.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|Win64.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|x64.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|x64.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|x86.ActiveCfg = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Release|x86.Build.0 = Release|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.SingleImage|x86.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Any CPU.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Any CPU.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|AnyOS.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|AnyOS.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|ARM.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|ARM.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|iPhone.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|iPhone.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Win32.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Win32.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Win64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|Win64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|x64.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|x64.Build.0 = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|x86.ActiveCfg = Debug|Any CPU
+		{F6080E51-675F-47A8-B125-55DCF66359F8}.Testing|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -4211,6 +4413,7 @@ Global
 		{0F476655-B155-432F-ADAC-CE9C77881950} = {42F5FFB7-B37F-9894-5E51-AB6A953DA79E}
 		{50A9114F-5D22-43EF-43CF-559234473966} = {580424DE-C982-4E80-A948-EF42FC3AB110}
 		{5ECC7150-E415-4FD6-99A4-08110DB54EE1} = {85799E16-9B3B-4BD5-98D6-238E31291134}
+		{F6080E51-675F-47A8-B125-55DCF66359F8} = {A26EBA9F-1777-46F2-994A-4C4D3055873D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A9AB8D62-C92D-4E97-A981-46E0A5AF56D1}
diff --git a/Source/csla.test.sln b/Source/csla.test.sln
index 0d5a43b9f4..8376e00bd1 100644
--- a/Source/csla.test.sln
+++ b/Source/csla.test.sln
@@ -103,6 +103,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Testing", "Csla.Testin
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Testing.Tests", "tests\Csla.Testing.Tests\Csla.Testing.Tests.csproj", "{8276B605-DBCF-484A-9603-BA1A6201A9F3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Csla.Xaml.Avalonia", "Csla.Xaml.Avalonia\Csla.Xaml.Avalonia.csproj", "{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1607,6 +1609,46 @@ Global
 		{8276B605-DBCF-484A-9603-BA1A6201A9F3}.Testing|x64.Build.0 = Debug|Any CPU
 		{8276B605-DBCF-484A-9603-BA1A6201A9F3}.Testing|x86.ActiveCfg = Debug|Any CPU
 		{8276B605-DBCF-484A-9603-BA1A6201A9F3}.Testing|x86.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|x64.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Debug|x86.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|ARM.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|x64.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|x64.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|x86.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Debug|x86.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|Any CPU.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|ARM.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|ARM.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|x64.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|x64.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|x86.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Mono Release|x86.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|ARM.Build.0 = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|x64.ActiveCfg = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|x64.Build.0 = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|x86.ActiveCfg = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Release|x86.Build.0 = Release|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|Any CPU.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|Any CPU.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|ARM.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|ARM.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|x64.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|x64.Build.0 = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|x86.ActiveCfg = Debug|Any CPU
+		{E2AEFDFF-EEB3-4EAC-96C7-760DD8FE34ED}.Testing|x86.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE