Merge pull request #280 from AvaloniaUI/directory-packages

Optional Directory.Packages.props (enabled by default)
AvaloniaUI · Nov 15, 2024 · 1f69a9c · 1f69a9c
2 parents 11d9a54 + 6028455
commit 1f69a9c
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -5,7 +5,7 @@ steps:
     displayName: 'Use .NET SDK'
     inputs:
       packageType: 'sdk'
-      version: 8.0.100
+      version: 9.0.100
   - task: DotNetCoreCLI@2
     displayName: 'Pack Templates'
     inputs:

diff --git a/readme.md b/readme.md
@@ -169,6 +169,14 @@ Available parameters:
 
 *By default*: false
 
+``-cpm``
+
+*Description*: Defines if your app will Central Package Management (CPM). If disabled, Directory.Build.props will be created with shared Avalonia version.
+
+*Options*: **true**, **false**
+
+*By default*: true
+
 # Creating a new Window
 
 To create a new `Window` called `MyNewWindow`, in the namespace `MyApp` run:

diff --git a/templates/csharp/xplat/.template.config/dotnetcli.host.json b/templates/csharp/xplat/.template.config/dotnetcli.host.json
@@ -15,6 +15,10 @@
     },
     "RemoveViewLocator": {
       "longName": "remove-view-locator"
+    },
+    "UseCentralPackageManagement": {
+      "longName": "cpm",
+      "shortName": "cpm"
     }
   },
   "usageExamples": [

diff --git a/templates/csharp/xplat/.template.config/ide.host.json b/templates/csharp/xplat/.template.config/ide.host.json
@@ -29,6 +29,13 @@
         "text": "Remove View Locator"
       },
       "isVisible": true
+    },
+    {
+      "id": "UseCentralPackageManagement",
+      "name": {
+        "text": "Use Central Package Management (CPM)"
+      },
+      "isVisible": true
     }
   ]
 }
diff --git a/templates/csharp/xplat/.template.config/template.json b/templates/csharp/xplat/.template.config/template.json
@@ -77,6 +77,13 @@
       "displayName": "Remove Avalonia ViewLocator",
       "defaultValue": "false"
     },
+    "UseCentralPackageManagement": {
+      "type": "parameter",
+      "description": "Defines if your app will Central Package Management (CPM). If disabled, Directory.Build.props will be created with shared Avalonia version.",
+      "datatype": "bool",
+      "displayName": "Use Central Package Management (CPM)",
+      "defaultValue": "true"
+    },
     "HostIdentifier": {
       "type": "bind",
       "binding": "HostIdentifier"
@@ -100,6 +107,18 @@
           "exclude": [
             "AvaloniaTest/App.RemoveViewLocator.axaml"
           ]
+        },
+        {
+          "condition": "(UseCentralPackageManagement)",
+          "exclude": [
+            "Directory.Build.props"
+          ]
+        },
+        {
+          "condition": "(!UseCentralPackageManagement)",
+          "exclude": [
+            "Directory.Packages.props"
+          ]
         }
       ]
     }

diff --git a/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj b/templates/csharp/xplat/AvaloniaTest.Android/AvaloniaTest.Android.csproj
@@ -18,8 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!--#if (UseCentralPackageManagement) -->
+    <PackageReference Include="Avalonia.Android" />
+    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
+    <!--#else -->
     <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
+    <!--#endif -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj b/templates/csharp/xplat/AvaloniaTest.Browser/AvaloniaTest.Browser.csproj
@@ -3,10 +3,15 @@
     <TargetFramework>FrameworkParameter-browser</TargetFramework>
     <OutputType>Exe</OutputType>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
+    <!--#if (UseCentralPackageManagement) -->
+    <PackageReference Include="Avalonia.Browser" />
+    <!--#else -->
     <PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+    <!--#endif -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj b/templates/csharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.csproj
@@ -13,12 +13,21 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!--#if (UseCentralPackageManagement) -->
+    <PackageReference Include="Avalonia.Desktop" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Include="Avalonia.Diagnostics" >
+      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    </PackageReference>
+    <!--#else -->
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="AvaloniaVersionTemplateParameter">
+    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
+    <!--#endif -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj b/templates/csharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.csproj
@@ -7,7 +7,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <!--#if (UseCentralPackageManagement) -->
+    <PackageReference Include="Avalonia.iOS" />
+    <!--#else -->
     <PackageReference Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
+    <!--#endif -->
   </ItemGroup>
 
   <ItemGroup>

diff --git a/templates/csharp/xplat/AvaloniaTest.sln b/templates/csharp/xplat/AvaloniaTest.sln
@@ -15,7 +15,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaTest.Android", "Ava
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3DA99C4E-89E3-4049-9C22-0A7EC60D83D8}"
 	ProjectSection(SolutionItems) = preProject
+#if (UseCentralPackageManagement)
 		Directory.Build.props = Directory.Build.props
+#else
+		Directory.Build.props = Directory.Build.props
+#endif
 	EndProjectSection
 EndProject
 Global

diff --git a/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj b/templates/csharp/xplat/AvaloniaTest/AvaloniaTest.csproj
@@ -13,11 +13,26 @@
   </ItemGroup>
 
   <ItemGroup>
+    <!--#if (UseCentralPackageManagement) -->
+    <PackageReference Include="Avalonia" />
+    <PackageReference Include="Avalonia.Themes.Fluent" />
+    <PackageReference Include="Avalonia.Fonts.Inter" />
+    <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+    <PackageReference Include="Avalonia.Diagnostics">
+      <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
+      <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
+    </PackageReference>
+    <!--#if (ReactiveUIToolkitChosen) -->
+    <PackageReference Include="Avalonia.ReactiveUI" />
+    <!--#elif (CommunityToolkitChosen)-->
+    <PackageReference Include="CommunityToolkit.Mvvm" />
+    <!--#endif -->
+    <!--#else -->
     <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />    
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="AvaloniaVersionTemplateParameter">
+    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>
@@ -26,5 +41,6 @@
     <!--#elif (CommunityToolkitChosen)-->
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <!--#endif -->
+    <!--#endif -->
   </ItemGroup>
 </Project>
diff --git a/templates/csharp/xplat/Directory.Build.props b/templates/csharp/xplat/Directory.Build.props
@@ -1,6 +1,5 @@
 <Project>
   <PropertyGroup>
-    <Nullable>enable</Nullable>
     <AvaloniaVersion>AvaloniaVersionTemplateParameter</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/templates/csharp/xplat/Directory.Packages.props b/templates/csharp/xplat/Directory.Packages.props
@@ -0,0 +1,27 @@
+<Project>
+    <!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+        <AvaloniaVersion>11.1.0</AvaloniaVersion>
+    </PropertyGroup>
+    <ItemGroup>
+        <!-- Avalonia packages -->
+        <!-- Important: keep version in sync! -->
+        <PackageVersion Include="Avalonia" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
+        <PackageVersion Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
+        <!--#if (ReactiveUIToolkitChosen) -->
+        <PackageVersion Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
+        <!--#elif (CommunityToolkitChosen)-->
+
+        <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" />
+        <!--#endif -->
+
+        <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
+    </ItemGroup>
+</Project>
diff --git a/templates/fsharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.fsproj b/templates/fsharp/xplat/AvaloniaTest.Desktop/AvaloniaTest.Desktop.fsproj
@@ -18,7 +18,7 @@
   <ItemGroup>
     <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="AvaloniaVersionTemplateParameter">
+    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>

diff --git a/templates/fsharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.fsproj b/templates/fsharp/xplat/AvaloniaTest.iOS/AvaloniaTest.iOS.fsproj
@@ -4,7 +4,6 @@
     <TargetFramework>FrameworkParameter-ios</TargetFramework>
     <SupportedOSPlatformVersion>13.0</SupportedOSPlatformVersion>
     <ProvisioningType>manual</ProvisioningType>
-    <Nullable>enable</Nullable>
     <RuntimeIdentifier>iossimulator-x64</RuntimeIdentifier>
 
     <!-- These properties need to be set in order to run on a real iDevice -->

diff --git a/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj b/templates/fsharp/xplat/AvaloniaTest/AvaloniaTest.fsproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>FrameworkParameter</TargetFramework>
-    <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
     <!--#if (UseCompiledBindings) -->
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
@@ -28,7 +27,7 @@
     <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
     <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />    
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Avalonia.Diagnostics" Version="AvaloniaVersionTemplateParameter">
+    <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
       <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
       <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
     </PackageReference>

diff --git a/tests/build-test.ps1 b/tests/build-test.ps1
@@ -130,7 +130,10 @@ Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "cb" "false" $binlog
 Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "rvl" "true" $binlog
 Create-And-Build "avalonia.mvvm" "AvaloniaMvvm" "C#" "rvl" "false" $binlog
 
+Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "f" "net8.0" $binlog
 Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "f" "net9.0" $binlog
+Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cpm" "true" $binlog
+Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "cpm" "false" $binlog
 Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "av" "11.2.1" $binlog
 Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "m" "ReactiveUI" $binlog
 Create-And-Build "avalonia.xplat" "AvaloniaXplat" "C#" "m" "CommunityToolkit" $binlog