Use central package management

2023-06-15 11:46:17 +02:00 · 2023-06-15 11:46:17 +02:00 · 0d82bee025
--- a/AvaloniaBehaviors.sln
+++ b/AvaloniaBehaviors.sln
@ -28,22 +28,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{2913483A
 		build.sh = build.sh
 		global.json = global.json
 		azure-pipelines.yml = azure-pipelines.yml
+		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{40A43022-EBA7-4E1D-8BB0-2691E41B5622}"
 	ProjectSection(SolutionItems) = preProject
-		build\Avalonia.Desktop.props = build\Avalonia.Desktop.props
-		build\Avalonia.Diagnostics.props = build\Avalonia.Diagnostics.props
-		build\Avalonia.props = build\Avalonia.props
-		build\Base.props = build\Base.props
-		build\ReferenceAssemblies.props = build\ReferenceAssemblies.props
 		build\SignAssembly.props = build\SignAssembly.props
 		build\SourceLink.props = build\SourceLink.props
 		build\XUnit.props = build\XUnit.props
-		build\Avalonia.ReactiveUI.props = build\Avalonia.ReactiveUI.props
-		build\Avalonia.Themes.Fluent.props = build\Avalonia.Themes.Fluent.props
-		build\Avalonia.Web.props = build\Avalonia.Web.props
-		build\System.Reactive.props = build\System.Reactive.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{721A55B7-C5B0-44E2-803A-56E291C672FE}"
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project>
  <PropertyGroup>
    <VersionPrefix>11.0.0</VersionPrefix>
    <VersionSuffix>rc1.1</VersionSuffix>
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@ -0,0 +1,16 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Avalonia.Browser" Version="11.0.0-rc1.1" />
+    <PackageVersion Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
+    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+  </ItemGroup>
+</Project>
--- a/NuGet.Config
+++ b/NuGet.Config
@ -4,6 +4,5 @@
  <packageSources>
    <clear />
    <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
-    <add key="avalonia" value="https://nuget.avaloniaui.net/repository/avalonia-all/index.json" protocolVersion="3" />
  </packageSources>
 </configuration>
--- a/build/Avalonia.Desktop.props
+++ b/build/Avalonia.Desktop.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
-  </ItemGroup>
-</Project>
--- a/build/Avalonia.Diagnostics.props
+++ b/build/Avalonia.Diagnostics.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
-  </ItemGroup>
-</Project>
--- a/build/Avalonia.ReactiveUI.props
+++ b/build/Avalonia.ReactiveUI.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0-rc1.1" />
-  </ItemGroup>
-</Project>
--- a/build/Avalonia.Themes.Fluent.props
+++ b/build/Avalonia.Themes.Fluent.props
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-rc1.1" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-rc1.1" />
-  </ItemGroup>
-</Project>
--- a/build/Avalonia.Web.props
+++ b/build/Avalonia.Web.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Avalonia.Browser" Version="11.0.0-rc1.1" />
-  </ItemGroup>
-</Project>
--- a/build/Avalonia.props
+++ b/build/Avalonia.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
-  </ItemGroup>
-</Project>
--- a/build/ReferenceAssemblies.props
+++ b/build/ReferenceAssemblies.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
-</Project>
--- a/build/System.Reactive.props
+++ b/build/System.Reactive.props
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="5.0.0" />
-  </ItemGroup>
-</Project>
--- a/samples/BehaviorsTestApplication/BehaviorsTestApplication.csproj
+++ b/samples/BehaviorsTestApplication/BehaviorsTestApplication.csproj
@ -8,14 +8,17 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <!--<Import Project="..\..\build\SignAssembly.props" />-->
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />
-  <Import Project="..\..\build\Avalonia.Desktop.props" />
-  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
-  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
-  <Import Project="..\..\build\Avalonia.ReactiveUI.props" />

  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions\Avalonia.Xaml.Interactions.csproj" />
--- a/samples/DragAndDropSample/DragAndDropSample.csproj
+++ b/samples/DragAndDropSample/DragAndDropSample.csproj
@ -12,14 +12,17 @@
    <AvaloniaResource Include="Assets\**" />
  </ItemGroup>

-  <Import Project="..\..\build\Base.props" />
-  <!--<Import Project="..\..\build\SignAssembly.props"/>-->
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />
-  <Import Project="..\..\build\Avalonia.Desktop.props" />
-  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
-  <Import Project="..\..\build\Avalonia.ReactiveUI.props" />
-  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
+  <!--<Import Project="..\..\build\SignAssembly.props" />-->

  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions\Avalonia.Xaml.Interactions.csproj" />
--- a/samples/DraggableDemo/DraggableDemo.csproj
+++ b/samples/DraggableDemo/DraggableDemo.csproj
@ -12,13 +12,17 @@
    <AvaloniaResource Include="Assets\**" />
  </ItemGroup>

-  <Import Project="..\..\build\Base.props" />
-  <Import Project="..\..\build\SignAssembly.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />
-  <Import Project="..\..\build\Avalonia.Desktop.props" />
-  <Import Project="..\..\build\Avalonia.Diagnostics.props" />
-  <Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Desktop" />
+    <PackageReference Include="Avalonia.Diagnostics" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
+  <!--<Import Project="..\..\build\SignAssembly.props" />-->

  <ItemGroup>
    <ProjectReference Include="..\..\src\Avalonia.Xaml.Interactions\Avalonia.Xaml.Interactions.csproj" />
--- a/src/Avalonia.Xaml.Behaviors/Avalonia.Xaml.Behaviors.csproj
+++ b/src/Avalonia.Xaml.Behaviors/Avalonia.Xaml.Behaviors.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions.Custom/Avalonia.Xaml.Interactions.Custom.csproj
+++ b/src/Avalonia.Xaml.Interactions.Custom/Avalonia.Xaml.Interactions.Custom.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions.DragAndDrop/Avalonia.Xaml.Interactions.DragAndDrop.csproj
+++ b/src/Avalonia.Xaml.Interactions.DragAndDrop/Avalonia.Xaml.Interactions.DragAndDrop.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions.Draggable/Avalonia.Xaml.Interactions.Draggable.csproj
+++ b/src/Avalonia.Xaml.Interactions.Draggable/Avalonia.Xaml.Interactions.Draggable.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions.Events/Avalonia.Xaml.Interactions.Events.csproj
+++ b/src/Avalonia.Xaml.Interactions.Events/Avalonia.Xaml.Interactions.Events.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions.Reactive/Avalonia.Xaml.Interactions.Reactive.csproj
+++ b/src/Avalonia.Xaml.Interactions.Reactive/Avalonia.Xaml.Interactions.Reactive.csproj
@ -13,12 +13,14 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="System.Reactive" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />
-  <Import Project="..\..\build\System.Reactive.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions.Responsive/Avalonia.Xaml.Interactions.Responsive.csproj
+++ b/src/Avalonia.Xaml.Interactions.Responsive/Avalonia.Xaml.Interactions.Responsive.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactions/Avalonia.Xaml.Interactions.csproj
+++ b/src/Avalonia.Xaml.Interactions/Avalonia.Xaml.Interactions.csproj
@ -13,11 +13,13 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

  <ItemGroup>
    <ProjectReference Include="..\Avalonia.Xaml.Interactivity\Avalonia.Xaml.Interactivity.csproj" />
--- a/src/Avalonia.Xaml.Interactivity/Avalonia.Xaml.Interactivity.csproj
+++ b/src/Avalonia.Xaml.Interactivity/Avalonia.Xaml.Interactivity.csproj
@ -13,10 +13,12 @@
    <PackageTags>Avalonia;Behavior;Action;Behaviors;Actions;Managed;C#;Interaction;Interactivity;Interactions;Xaml</PackageTags>
  </PropertyGroup>

-  <Import Project="..\..\build\Base.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" />
+  </ItemGroup>
+
  <Import Project="..\..\build\SignAssembly.props" />
  <Import Project="..\..\build\SourceLink.props" />
-  <Import Project="..\..\build\ReferenceAssemblies.props" />
-  <Import Project="..\..\build\Avalonia.props" />

 </Project>
--- a/tests/Avalonia.Xaml.Interactions.UnitTests/Avalonia.Xaml.Interactions.UnitTests.csproj
+++ b/tests/Avalonia.Xaml.Interactions.UnitTests/Avalonia.Xaml.Interactions.UnitTests.csproj
@ -9,7 +9,10 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <Import Project="..\..\build\Avalonia.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+  </ItemGroup>
+
  <Import Project="..\..\build\XUnit.props" />

  <ItemGroup>
--- a/tests/Avalonia.Xaml.Interactivity.UnitTests/Avalonia.Xaml.Interactivity.UnitTests.csproj
+++ b/tests/Avalonia.Xaml.Interactivity.UnitTests/Avalonia.Xaml.Interactivity.UnitTests.csproj
@ -9,7 +9,10 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <Import Project="..\..\build\Avalonia.props" />
+  <ItemGroup>
+    <PackageReference Include="Avalonia" />
+  </ItemGroup>
+
  <Import Project="..\..\build\XUnit.props" />

  <ItemGroup>