Use central package management

AvaloniaUI · Jun 15, 2023 · 0d82bee · 0d82bee
1 parent 6316250
commit 0d82bee
Show file tree

Hide file tree

Showing 26 changed files with 105 additions and 112 deletions.
diff --git 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}"

diff --git a/build/Base.props → Directory.Build.props b/build/Base.props → 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>

diff --git 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>
diff --git 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>
diff --git a/build/Avalonia.Desktop.props b/build/Avalonia.Desktop.props
diff --git a/build/Avalonia.Diagnostics.props b/build/Avalonia.Diagnostics.props
diff --git a/build/Avalonia.ReactiveUI.props b/build/Avalonia.ReactiveUI.props
diff --git a/build/Avalonia.Themes.Fluent.props b/build/Avalonia.Themes.Fluent.props
diff --git a/build/Avalonia.Web.props b/build/Avalonia.Web.props
diff --git a/build/Avalonia.props b/build/Avalonia.props
diff --git a/build/ReferenceAssemblies.props b/build/ReferenceAssemblies.props
diff --git a/build/System.Reactive.props b/build/System.Reactive.props
diff --git 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" />

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

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

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

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

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

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

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

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

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

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

diff --git 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>
diff --git 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>

diff --git 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>