Skip to content

Commit 7efcbf2

Browse files
maxkatz6maxkatz6
committed
Centralized versionning
1 parent c693bbb commit 7efcbf2

10 files changed

Lines changed: 37 additions & 14 deletions

File tree

‎Avalonia.HtmlRenderer.slnx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<File Path="build/icon.png" />
66
<File Path="Directory.Build.props" />
77
<File Path="Directory.Build.targets" />
8+
<File Path="Directory.Packages.props" />
89
</Folder>
910
<Folder Name="/Build/Props/">
1011
<File Path="build/Props/NullableEnable.targets" />

‎Directory.Build.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111

1212
<PropertyGroup>
1313
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
14-
<AvaloniaVersion>11.1.0</AvaloniaVersion>
15-
<AvaloniaSamplesVersion>11.3.13</AvaloniaSamplesVersion>
1614
</PropertyGroup>
1715

1816
</Project>

‎Directory.Packages.props‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<AvaloniaVersion>11.1.0</AvaloniaVersion> <!-- Used in Avalonia.HtmlRenderer.csproj with VersionOverride -->
5+
<AvaloniaSamplesVersion>11.3.13</AvaloniaSamplesVersion>
6+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<PackageVersion Include="Avalonia" Version="$(AvaloniaSamplesVersion)" />
11+
<PackageVersion Include="Avalonia.Android" Version="$(AvaloniaSamplesVersion)" />
12+
<PackageVersion Include="Avalonia.Browser" Version="$(AvaloniaSamplesVersion)" />
13+
<PackageVersion Include="Avalonia.Desktop" Version="$(AvaloniaSamplesVersion)" />
14+
<PackageVersion Include="Avalonia.iOS" Version="$(AvaloniaSamplesVersion)" />
15+
<PackageVersion Include="Avalonia.Themes.Simple" Version="$(AvaloniaSamplesVersion)" />
16+
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0" />
17+
<PackageVersion Include="System.Drawing.Common" Version="8.0.7" />
18+
<PackageVersion Include="System.Resources.Extensions" Version="8.0.0" />
19+
<PackageVersion Include="System.Text.Json" Version="8.0.5" />
20+
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
21+
</ItemGroup>
22+
23+
</Project>

‎demo/Avalonia/HtmlRenderer.Demo.Avalonia.Android/HtmlRenderer.Demo.Avalonia.Android.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaSamplesVersion)" />
21-
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
20+
<PackageReference Include="Avalonia.Android" />
21+
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" />
2222
</ItemGroup>
2323

2424
<ItemGroup>

‎demo/Avalonia/HtmlRenderer.Demo.Avalonia.Browser/HtmlRenderer.Demo.Avalonia.Browser.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Avalonia.Browser" Version="$(AvaloniaSamplesVersion)" />
9+
<PackageReference Include="Avalonia.Browser" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎demo/Avalonia/HtmlRenderer.Demo.Avalonia.Desktop/HtmlRenderer.Demo.Avalonia.Desktop.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaSamplesVersion)" />
13+
<PackageReference Include="Avalonia.Desktop" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎demo/Avalonia/HtmlRenderer.Demo.Avalonia.iOS/HtmlRenderer.Demo.Avalonia.iOS.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Avalonia.iOS" Version="$(AvaloniaSamplesVersion)" />
9+
<PackageReference Include="Avalonia.iOS" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

‎demo/Avalonia/HtmlRenderer.Demo.Avalonia/HtmlRenderer.Demo.Avalonia.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<ProjectReference Include="..\..\Common\HtmlRenderer.Demo.Common.csproj" />
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Avalonia" Version="$(AvaloniaSamplesVersion)" />
14-
<PackageReference Include="Avalonia.Themes.Simple" Version="$(AvaloniaSamplesVersion)" />
15-
<PackageReference Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.0">
13+
<PackageReference Include="Avalonia" />
14+
<PackageReference Include="Avalonia.Themes.Simple" />
15+
<PackageReference Include="AvaloniaUI.DiagnosticsSupport">
1616
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
1717
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
1818
</PackageReference>

‎demo/Common/HtmlRenderer.Demo.Common.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@
128128
<EmbeddedResource Include="TestSamples\35.Breaking pages 2 - Tables.htm" />
129129
</ItemGroup>
130130
<ItemGroup>
131-
<PackageReference Include="System.Resources.Extensions" Version="8.0.0" />
132-
<PackageReference Include="System.Drawing.Common" Version="8.0.7" />
131+
<PackageReference Include="System.Resources.Extensions" />
132+
<PackageReference Include="System.Drawing.Common" />
133133
</ItemGroup>
134134
<ItemGroup>
135135
<ProjectReference Include="..\..\src\Avalonia.HtmlRenderer\Avalonia.HtmlRenderer.csproj" />

‎src/Avalonia.HtmlRenderer/Avalonia.HtmlRenderer.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
24-
<PackageReference Include="System.Text.Json" Version="8.0.5" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
23+
<!-- Versions are overridden here; central versions are defined in Directory.Packages.props -->
24+
<PackageReference Include="Avalonia" VersionOverride="$(AvaloniaVersion)" />
25+
<PackageReference Include="System.Text.Json" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
2526
</ItemGroup>
2627

2728
<Import Project="$(RepositoryPropsRoot)/PackEnable.targets" />

0 commit comments

Comments
 (0)