Skip to content

Update supported .NET versions (Housekeeping) #210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update supported .NET versions (Housekeeping) #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
506dd59
added .NET Framework 4.6.2, .NET 8 and 9, dropped netcoreapp3.1 and .…
Insire Dec 18, 2024
ff1a559
use more recent windows image during CI
Insire Dec 18, 2024
41bdc3c
updated .NET version references in readme and docs
Insire Dec 18, 2024
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
9 changes: 4 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@
[![Build Status](https://dev.azure.com/devruehl/AdonisUI/_apis/build/status/benruehl.adonis-ui?branchName=master)](https://dev.azure.com/devruehl/AdonisUI/_build/latest?definitionId=1&branchName=master)
[![NuGet version](https://img.shields.io/nuget/v/AdonisUi.ClassicTheme.svg)](https://www.nuget.org/packages/AdonisUI.ClassicTheme/)
[![NuGet downloads](https://img.shields.io/nuget/dt/AdonisUi.ClassicTheme.svg)](https://www.nuget.org/packages/AdonisUI.ClassicTheme/)
![.NET Version: >= 5.0](https://img.shields.io/badge/.NET-%3E%3D%205.0-green.svg)
![.NET Core Version: >= 3.1](https://img.shields.io/badge/.NET%20Core-%3E%3D%203.1-green.svg)
![.NET Framework version: >= 4.5](https://img.shields.io/badge/.NET%20Framework-%3E%3D%204.5-green.svg)
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)
![.NET Version: >= 8.0](https://img.shields.io/badge/.NET-%3E%3D%205.0-green.svg)
![.NET Framework version: >= 4.6.2](https://img.shields.io/badge/.NET%20Framework-%3E%3D%204.5-green.svg)
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://opensource.org/licenses/MIT)

Lightweight UI toolkit for WPF applications offering classic but enhanced windows visuals

Expand Down Expand Up @@ -34,7 +33,7 @@ Lightweight UI toolkit for WPF applications offering classic but enhanced window

## Getting started

1. Reference `AdonisUI` and `AdonisUI.ClassicTheme` in your WPF project. It is available via [NuGet](https://www.nuget.org/packages/AdonisUI.ClassicTheme/) or [manual download](https://github.com/benruehl/adonis-ui/releases). Currently it requires at least .NET Framework 4.5 or .NET Core 3.0.
1. Reference `AdonisUI` and `AdonisUI.ClassicTheme` in your WPF project. It is available via [NuGet](https://www.nuget.org/packages/AdonisUI.ClassicTheme/) or [manual download](https://github.com/benruehl/adonis-ui/releases). Currently it requires at least .NET Framework 4.6.2 or .NET 8.0.
2. Add resources to your application in your `App.xaml` like so:

```xml
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net

pool:
vmImage: 'windows-2019'
vmImage: 'windows-2022'

variables:
solution: '**/*.sln'
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/getting-started/introduction.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Get started with Adonis UI, a lightweight UI toolkit for WPF applications. Inclu

## Quick start

1. Reference `AdonisUI` and `AdonisUI.ClassicTheme` in your WPF project. It is available via [NuGet](https://www.nuget.org/packages/AdonisUI.ClassicTheme/) or [manual download](https://github.com/benruehl/adonis-ui/releases). Currently it requires at least .NET 4.5 or .NET Core 3.0.
1. Reference `AdonisUI` and `AdonisUI.ClassicTheme` in your WPF project. It is available via [NuGet](https://www.nuget.org/packages/AdonisUI.ClassicTheme/) or [manual download](https://github.com/benruehl/adonis-ui/releases). Currently it requires at least .NET 4.6.2 or .NET 8.0.
2. Add resources to your application in your `App.xaml`:

```xml
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "5.0.400",
"version": "9.0.101",
"rollForward": "latestMajor"
}
}
12 changes: 4 additions & 8 deletions src/AdonisUI.ClassicTheme/AdonisUI.ClassicTheme.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<!-- Build Settings -->
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net8.0-windows;net9.0-windows</TargetFrameworks>
<LangVersion>latest</LangVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<UseWpf>true</UseWpf>
<NoWarn>CS1591</NoWarn>
</PropertyGroup>

<!-- Package metadata -->
Expand Down Expand Up @@ -34,12 +35,7 @@
</PropertyGroup>

<!-- Project References -->
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AdonisUI\AdonisUI.csproj" />
</ItemGroup>
Expand Down
14 changes: 4 additions & 10 deletions src/AdonisUI.Demo/AdonisUI.Demo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<TargetFramework>net8.0-windows</TargetFramework>
<LangVersion>latest</LangVersion>
<RootNamespace>AdonisUI.Demo</RootNamespace>
<StartupObject>AdonisUI.Demo.App</StartupObject>
Expand All @@ -26,18 +26,12 @@
<ApplicationManifest>App.manifest</ApplicationManifest>
<ApplicationIcon>App.ico</ApplicationIcon>
<Platforms>AnyCPU;x64;x86</Platforms>
<PublishTrimmed>true</PublishTrimmed>
<PublishTrimmed>false</PublishTrimmed>
<PublishReadyToRun>true</PublishReadyToRun>
<PublishSingleFile>false</PublishSingleFile>
<NoWarn>CS1591</NoWarn>
</PropertyGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp3.1'">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AdonisUI\AdonisUI.csproj" />
<ProjectReference Include="..\AdonisUI.ClassicTheme\AdonisUI.ClassicTheme.csproj" />
Expand Down
15 changes: 5 additions & 10 deletions src/AdonisUI/AdonisUI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
<Project Sdk="Microsoft.NET.Sdk">
<!-- Build Settings -->
<PropertyGroup>
<TargetFrameworks>net45;netcoreapp3.1;net5.0-windows</TargetFrameworks>
<TargetFrameworks>net462;net8.0-windows;net9.0-windows</TargetFrameworks>
<LangVersion>latest</LangVersion>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<UseWpf>true</UseWpf>
<NoWarn>CS1591</NoWarn>
</PropertyGroup>

<!-- Package metadata -->
Expand Down Expand Up @@ -34,13 +35,7 @@
</PropertyGroup>

<!-- Project References -->
<ItemGroup Condition="'$(TargetFramework)' == 'net45'">
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
<PackageReference Include="System.Drawing.Common" Version="4.6.0" />
<ItemGroup Condition="'$(TargetFramework)' != 'net462'">
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
</ItemGroup>
</Project>