#4880 Ship Csla.Avalonia with the framework packages

Samples/AvaloniaExample/BusinessLibrary/BusinessLibrary.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Csla" Version="10.1.0" />
+    <PackageReference Include="Csla" />
   </ItemGroup>
 
   <ItemGroup>

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>

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" />

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>

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>

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`:

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>
+  <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>