Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/AvaloniaDependency.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.7" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="11.0.7" />
<PackageReference Include="Avalonia" Version="12.0.1" />
<PackageReference Include="Avalonia.Markup.Xaml.Loader" Version="12.0.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion build/Base.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Version>8.1.97.11073</Version>
<Version>8.1.97.12000-pre</Version>
<PackageProjectUrl>https://github.com/AvaloniaCommunity/Prism.Avalonia</PackageProjectUrl>
<Copyright>Copyright (c) 2024 Xeno Innovations, Inc.</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
Expand Down
2 changes: 1 addition & 1 deletion build/BuildTargets.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

</Project>
5 changes: 2 additions & 3 deletions build/Nuget.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<PackageReleaseNotes>
* Added .NET 8 support
* Upgraded to support Avalonia v11.0.7
* Removed unused CommonServiceLocator
* Dropped support for .NET Framework and .NET Standard. Only .NET 8 and later are supported
* Upgraded to support Avalonia v12.0.1
</PackageReleaseNotes>
</PropertyGroup>

Expand Down
14 changes: 8 additions & 6 deletions build/SampleApp.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
<Import Project="AvaloniaDependency.props" />

<ItemGroup>
<!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.7" />-->
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.7" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.7" />
<PackageReference Include="Avalonia.LinuxFramebuffer" Version="11.0.7" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.7" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.7" />
<!-- https://docs.avaloniaui.net/docs/avalonia12-breaking-changes -->
<!--<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="12.0.1" />-->
<!--<PackageReference Include="Avalonia.Diagnostics" Version="12.0.1" />-->

<PackageReference Include="Avalonia.Desktop" Version="12.0.1" />
<PackageReference Include="Avalonia.LinuxFramebuffer" Version="12.0.1" />
<PackageReference Include="Avalonia.Themes.Simple" Version="12.0.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.1" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\src\Prism.DryIoc.Avalonia\Prism.DryIoc.Avalonia.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>

<Import Project="../../build/SampleApp.props" />
Expand Down
2 changes: 1 addition & 1 deletion samples/BootstrapperShellSample/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public partial class MainWindow : Window
public MainWindow()
{
this.InitializeComponent();
this.AttachDevTools();
//this.AttachDevTools();
}
}
}
2 changes: 1 addition & 1 deletion samples/DummyModule1/DummyModule1.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/DummyModule2/DummyModule2.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/ModulesSample/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public MainWindow(IEventAggregator eventAggregator)
////public MainWindow(CallbackLogger logger, IEventAggregator eventAggregator)
{
InitializeComponent();
this.AttachDevTools();
//this.AttachDevTools();

_logTextBox = this.FindControl<TextBox>("LogTextBox");
_itemsControl = this.FindControl<ListBox>("ItemsControl1");
Expand Down
2 changes: 1 addition & 1 deletion samples/ModulesSample/ModulesSampleApp.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
</PropertyGroup>

Expand Down
3 changes: 2 additions & 1 deletion samples/SampleDialogApp/SampleDialogApp.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Nullable>enable</Nullable>
<!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
<TrimMode>copyused</TrimMode>
<Authors>Damian Suess</Authors>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>

<Import Project="../../build/SampleApp.props" />
Expand Down
4 changes: 2 additions & 2 deletions samples/SampleDialogApp/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Avalonia;
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;

Expand All @@ -10,7 +10,7 @@ public MainWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
//this.AttachDevTools();
#endif
}

Expand Down
3 changes: 2 additions & 1 deletion samples/SampleMvvmApp/SampleMvvmApp.csproj
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
<Title>Sample MVVM App</Title>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>

<Import Project="../../build/SampleApp.props" />
Expand Down
2 changes: 1 addition & 1 deletion samples/SampleMvvmApp/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public MainWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();
//this.AttachDevTools();
#endif

// Avalonia v11-Preview 5 Breaking Change:
Expand Down
3 changes: 2 additions & 1 deletion samples/ViewDiscovery/ViewDiscovery.csproj
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<Authors>Damian Suess</Authors>
<AvaloniaUseCompiledBindingsByDefault>false</AvaloniaUseCompiledBindingsByDefault>
</PropertyGroup>

<Import Project="../../build/SampleApp.props" />
Expand Down
2 changes: 1 addition & 1 deletion samples/ViewDiscovery/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public MainWindow()
public MainWindow(IRegionManager regionManager)
{
this.InitializeComponent();
this.AttachDevTools();
//this.AttachDevTools();

_regionManager = regionManager;
regionManager.RegisterViewWithRegion(RegionNames.ContentRegion, typeof(ViewA));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Globalization;
Expand Down
Loading