Skip to content

Commit 53625b4

Browse files
authored
Cleanup build by switching to modern practices (#603)
Avalonia axaml files, .NET Directory.Packages.props
1 parent fce4eae commit 53625b4

27 files changed

+54
-97
lines changed

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
</PropertyGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.39" PrivateAssets="All"/>
16+
<PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>
1717
</ItemGroup>
1818

1919
<ItemGroup>

Directory.Packages.props

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<Project>
2+
<PropertyGroup>
3+
<!-- Enable central package management, https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
4+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
8+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
9+
<PackageVersion Include="Avalonia" Version="11.3.11" />
10+
<PackageVersion Include="Avalonia.Desktop" Version="11.3.11" />
11+
<PackageVersion Include="Avalonia.Themes.Simple" Version="11.3.11" />
12+
<PackageVersion Include="MessageBox.Avalonia" Version="3.3.1.1" />
13+
<PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />
14+
<PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.1.1" />
15+
<PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.2.39" />
16+
<PackageVersion Include="Discutils" Version="0.16.13" />
17+
<PackageVersion Include="System.CommandLine" Version="2.0.2" />
18+
</ItemGroup>
19+
</Project>

IsoCreator/IsoCreator.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Discutils" Version="0.16.13" />
9-
<PackageReference Include="System.CommandLine" Version="2.0.0" />
8+
<PackageReference Include="Discutils" />
9+
<PackageReference Include="System.CommandLine" />
1010
</ItemGroup>
1111

1212
</Project>

NuGet.Config

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
5+
<add key="WPILib" value="https://wpilib.jfrog.io/artifactory/api/nuget/wpilib-nuget-development-local/" />
6+
</packageSources>
7+
8+
<packageSourceMapping>
9+
<!-- key value for <packageSource> should match key values from <packageSources> element -->
10+
<packageSource key="nuget.org">
11+
<package pattern="*" />
12+
</packageSource>
13+
</packageSourceMapping>
14+
</configuration>

WPILibInstaller-Avalonia.slnx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
</Folder>
55
<Folder Name="/Solution Items/">
66
<File Path=".editorconfig" />
7+
<File Path="Directory.Packages.props" />
78
</Folder>
89
<Project Path="IsoCreator/IsoCreator.csproj" />
910
<Project Path="WPILibInstaller-Avalonia/WPILibInstaller-Avalonia.csproj" />
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ public class App : Application
1010
{
1111
public override void Initialize()
1212
{
13+
#if DEBUG
14+
Console.WriteLine("Debug build - enabling developer tools");
15+
this.AttachDeveloperTools();
16+
#endif
1317
// Register our view model locator
1418
// TODO view model locator
1519

File renamed without changes.
File renamed without changes.

WPILibInstaller-Avalonia/Views/ConfigurationPage.xaml renamed to WPILibInstaller-Avalonia/Views/ConfigurationPage.axaml

File renamed without changes.

0 commit comments

Comments
 (0)