Skip to content

Release/1.1.0 ➡️ main #6

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

Merged
DavidRogersDev merged 2 commits into from
Feb 7, 2025
Merged

Release/1.1.0 ➡️ main #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
65eca8b
Added support for .NET 9
DavidRogersDev Jan 14, 2025
a50f872
Upgraded version of .NET to 9 on the github workflow action.
DavidRogersDev Jan 14, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
dotnet-version: ['8.0.x']
dotnet-version: ['9.0.x']
steps:
- name: Setup .NET ${{ matrix.dotnet-version }}
uses: actions/setup-dotnet@v4
Expand Down
176 changes: 92 additions & 84 deletions .nuke/build.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,49 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"$ref": "#/definitions/build",
"title": "Build Schema",
"definitions": {
"build": {
"type": "object",
"Host": {
"type": "string",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"ExecutableTarget": {
"type": "string",
"enum": [
"Clean",
"CleanAndBuild",
"Compile",
"Pack",
"Push",
"Restore"
]
},
"Verbosity": {
"type": "string",
"description": "",
"enum": [
"Verbose",
"Normal",
"Minimal",
"Quiet"
]
},
"NukeBuild": {
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"Continue": {
"type": "boolean",
"description": "Indicates to continue a previously failed build attempt"
Expand All @@ -23,53 +53,13 @@
"description": "Shows the help text for this build assembly"
},
"Host": {
"type": "string",
"description": "Host for execution. Default is 'automatic'",
"enum": [
"AppVeyor",
"AzurePipelines",
"Bamboo",
"Bitbucket",
"Bitrise",
"GitHubActions",
"GitLab",
"Jenkins",
"Rider",
"SpaceAutomation",
"TeamCity",
"Terminal",
"TravisCI",
"VisualStudio",
"VSCode"
]
},
"IgnoreFailedSources": {
"type": "boolean"
},
"LocalPack": {
"type": "boolean"
},
"LocalPackDenyRelease": {
"type": "boolean"
"$ref": "#/definitions/Host"
},
"NoLogo": {
"type": "boolean",
"description": "Disables displaying the NUKE logo"
},
"NUGET_API_KEY": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"NUGET_URL": {
"type": "string"
},
"PACKAGES_GITHUB_NUGET_PAT": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"PACKAGES_GITHUB_NUGET_URL": {
"type": "string"
},
"Partition": {
"type": "string",
"description": "Partition to use on CI"
Expand All @@ -85,9 +75,6 @@
"type": "string"
}
},
"RELEASE_NOTES": {
"type": "string"
},
"Root": {
"type": "string",
"description": "Root directory during build execution"
Expand All @@ -96,47 +83,68 @@
"type": "array",
"description": "List of targets to be skipped. Empty list skips all dependencies",
"items": {
"type": "string",
"enum": [
"Clean",
"CleanAndBuild",
"Compile",
"Pack",
"Push",
"Restore"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
},
"Target": {
"type": "array",
"description": "List of targets to be invoked. Default is '{default_target}'",
"items": {
"type": "string",
"enum": [
"Clean",
"CleanAndBuild",
"Compile",
"Pack",
"Push",
"Restore"
]
"$ref": "#/definitions/ExecutableTarget"
}
},
"Verbosity": {
"type": "string",
"description": "Logging verbosity during build execution. Default is 'Normal'",
"$ref": "#/definitions/Verbosity"
}
}
}
},
"allOf": [
{
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Minimal",
"Normal",
"Quiet",
"Verbose"
"Debug",
"Release"
]
},
"IgnoreFailedSources": {
"type": "boolean"
},
"LocalPack": {
"type": "boolean"
},
"LocalPackDenyRelease": {
"type": "boolean"
},
"NUGET_API_KEY": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"NUGET_URL": {
"type": "string"
},
"PACKAGES_GITHUB_NUGET_PAT": {
"type": "string",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"PACKAGES_GITHUB_NUGET_URL": {
"type": "string"
},
"RELEASE_NOTES": {
"type": "string"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
}
}
},
{
"$ref": "#/definitions/NukeBuild"
}
}
]
}
4 changes: 2 additions & 2 deletions build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFramework>net9.0</TargetFramework>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169;CA1050;CA1822;CA2211;IDE1006</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand All @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.0.0" />
<PackageReference Include="Nuke.Common" Version="9.0.3" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/WinFormsMVP.NET.Autofac/WinFormsMVP.NET.Autofac.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">

<PropertyGroup>
<TargetFrameworks>net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
Expand Down Expand Up @@ -35,6 +35,10 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
<PackageReference Include="Autofac" Version="8.0.0" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-windows'">
<PackageReference Include="Autofac" Version="8.2.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WinFormsMVP.NET\WinFormsMVP.NET.csproj" />
Expand Down
6 changes: 5 additions & 1 deletion src/WinFormsMVP.NET.SimpleInjector/WinFormsMVP.NET.SimpleInjector.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">

<PropertyGroup>
<TargetFrameworks>net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
Expand Down Expand Up @@ -35,6 +35,10 @@
<PackageReference Include="SimpleInjector" Version="5.4.4" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-windows'">
<PackageReference Include="SimpleInjector" Version="5.5.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WinFormsMVP.NET\WinFormsMVP.NET.csproj" />
</ItemGroup>
Expand Down
6 changes: 5 additions & 1 deletion src/WinFormsMVP.NET/Forms/MvpUserControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Windows.Forms;
using System.ComponentModel;
using System.Windows.Forms;
using WinFormsMVP.NET.Binder;

namespace WinFormsMVP.NET.Forms
Expand All @@ -14,6 +15,9 @@ public MvpUserControl()
_presenterBinder.PerformBinding(this);
}

#if NET9_0_OR_GREATER
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
#endif
public bool ThrowExceptionIfNoPresenterBound { get; private set; }
}
}
7 changes: 6 additions & 1 deletion src/WinFormsMVP.NET/WinFormsMVP.NET.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">

<PropertyGroup>
<TargetFrameworks>net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net5.0-windows;net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
Expand Down Expand Up @@ -39,6 +39,11 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net9.0-windows'">
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="Images\icon.png" Pack="true" PackagePath="\" />
<None Include="readme.md" Pack="true" PackagePath="\" />
Expand Down
Loading