Skip to content
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

Update NuGet dotnet version to 6 and 8 and remove .netcoreapp2.0 #668

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −13
Open

Update NuGet dotnet version to 6 and 8 and remove .netcoreapp2.0 #668

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 README.md
View file
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ dotnet add package FluentNHibernate

* Read the [introduction](https://github.com/FluentNHibernate/fluent-nhibernate/wiki/Getting-started).
* Get latest version from NuGet
- [.NETCore2.0, NETStandard2.0 or NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
- [.NET 6.0, .NET 8.0, NETStandard2.0 or NET 4.6.1 with NHibernate 5.x](https://www.nuget.org/packages/FluentNHibernate)
- [.NET 4.0 with NHibernate 4.x](https://www.nuget.org/packages/FluentNHibernate/2.0.3)
- [.NET 3.5 with NHibernate 3 if you like it vintage](https://www.nuget.org/packages/FluentNHibernate.Net35)

11 changes: 9 additions & 2 deletions build.cake
View file
Original file line number Diff line number Diff line change
@@ -120,8 +120,15 @@ Task("Copy-Files")
msBuildSettings
);
PublishProjects(
SrcProjects, "netcoreapp2.0",
parameters.Paths.Directories.ArtifactsBinNetCoreApp2.FullPath,
SrcProjects, "net6.0",
parameters.Paths.Directories.ArtifactsBinNet60.FullPath,
parameters.Version.DotNetAsterix,
parameters.Configuration,
msBuildSettings
);
PublishProjects(
SrcProjects, "net8.0",
parameters.Paths.Directories.ArtifactsBinNet80.FullPath,
parameters.Version.DotNetAsterix,
parameters.Configuration,
msBuildSettings
16 changes: 11 additions & 5 deletions build/paths.cake
View file
Original file line number Diff line number Diff line change
@@ -25,7 +25,8 @@ public class BuildPaths
var artifactsBinDir = artifactsDir.Combine("bin");
var artifactsBinFullFx = artifactsBinDir.Combine("net461");
var artifactsBinNetStandard20 = artifactsBinDir.Combine("netstandard2.0");
var artifactsBinNetCoreapp2 = artifactsBinDir.Combine("netcoreapp2.0");
var artifactsBinNet60 = artifactsBinDir.Combine("netstandard6.0");
var artifactsBinNet80 = artifactsBinDir.Combine("netstandard8.0");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and above should be "net8.0" and "net6.0" respectively

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Happy to make the change if there's interest in merging this PR. Only ask as it's 12 months old.

var testResultsDir = artifactsDir.Combine("test-results");
var nugetRoot = artifactsDir.Combine("nuget");

@@ -39,7 +40,8 @@ public class BuildPaths
artifactsBinDir,
artifactsBinFullFx,
artifactsBinNetStandard20,
artifactsBinNetCoreapp2);
artifactsBinNet60,
artifactsBinNet80);

// Files
var buildFiles = new BuildFiles(
@@ -74,7 +76,8 @@ public class BuildDirectories
public DirectoryPath ArtifactsBin { get; private set; }
public DirectoryPath ArtifactsBinFullFx { get; private set; }
public DirectoryPath ArtifactsBinNetStandard20 { get; private set; }
public DirectoryPath ArtifactsBinNetCoreApp2 { get; private set; }
public DirectoryPath ArtifactsBinNet60 { get; private set; }
public DirectoryPath ArtifactsBinNet80 { get; private set; }
public ICollection<DirectoryPath> ToClean { get; private set; }

public BuildDirectories(
@@ -84,7 +87,8 @@ public class BuildDirectories
DirectoryPath artifactsBinDir,
DirectoryPath artifactsBinFullFx,
DirectoryPath artifactsBinNetStandard20,
DirectoryPath artifactsBinNetCoreapp2
DirectoryPath artifactsNet60,
DirectoryPath artifactsNet80
)
{
Artifacts = artifactsDir;
@@ -93,7 +97,9 @@ public class BuildDirectories
ArtifactsBin = artifactsBinDir;
ArtifactsBinFullFx = artifactsBinFullFx;
ArtifactsBinNetStandard20 = artifactsBinNetStandard20;
ArtifactsBinNetCoreApp2 = artifactsBinNetCoreapp2;
ArtifactsBinNet60 = artifactsNet60;
ArtifactsBinNet80 = artifactsNet80;

ToClean = new[] {
Artifacts,
TestResults,
6 changes: 1 addition & 5 deletions src/FluentNHibernate/FluentNHibernate.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;net461;netcoreapp2.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net461;net6.0;net8.0</TargetFrameworks>
<PlatformTarget>AnyCpu</PlatformTarget>
<OutputType>Library</OutputType>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -10,10 +10,6 @@
<AssemblyOriginatorKeyFile>../FluentKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<RuntimeFrameworkVersion>2.0.9</RuntimeFrameworkVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NHibernate" Version="5.3.3" />
</ItemGroup>