Skip to content

Commit

Permalink
Merge pull request #325 from portyanikhin/update-target-frameworks
Browse files Browse the repository at this point in the history
Updated target frameworks to .NET Standard 2.0/2.1 and .NET 9.0
  • Loading branch information
portyanikhin authored Dec 18, 2024
2 parents ddf252e + d425daa commit 316ee22
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-and-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-binaries.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Restore Python dependencies
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Restore tools
run: dotnet tool restore
- name: Check code style
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
with:
dotnet-version: |
6.0.x
8.0.x
9.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Authors>Vladimir Portyanikhin</Authors>
<Copyright>Copyright (c) Vladimir Portyanikhin 2024</Copyright>
<ImplicitUsings>enable</ImplicitUsings>
<LangVersion>12.0</LangVersion>
<LangVersion>13.0</LangVersion>
<Nullable>enable</Nullable>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/portyanikhin/SharpProp</PackageProjectUrl>
Expand Down
2 changes: 1 addition & 1 deletion src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageIcon>icon.png</PackageIcon>
<PackageReadmeFile>NuGet.md</PackageReadmeFile>
<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<TargetFrameworks>netstandard2.0;netstandard2.1;net9.0</TargetFrameworks>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SharpProp/Extensions/FluidsListExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ public static string CoolPropBackend(this FluidsList member) =>
member.GetAttributes()!.Get<FluidInfoAttribute>()!.Backend;

/// <summary>
/// <c>true</c> if the fluid pure of pseudo-pure.
/// <c>true</c> if the fluid is pure of pseudo-pure.
/// </summary>
/// <param name="member">The <see cref="FluidsList"/> member.</param>
/// <returns><c>true</c> if the fluid pure of pseudo-pure.</returns>
/// <returns><c>true</c> if the fluid is pure of pseudo-pure.</returns>
public static bool Pure(this FluidsList member) =>
member.GetAttributes()!.Get<FluidInfoAttribute>()!.Pure;

Expand Down
4 changes: 2 additions & 2 deletions tests/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
</PropertyGroup>

<PropertyGroup Condition="$([MSBuild]::IsOSPlatform('Windows'))">
<TargetFrameworks>net48;net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net48;net6.0;net9.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="!$([MSBuild]::IsOSPlatform('Windows'))">
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net9.0</TargetFrameworks>
</PropertyGroup>

</Project>

0 comments on commit 316ee22

Please sign in to comment.