Skip to content

Commit

Permalink
Require .NET 8.x for .NET interface
Browse files Browse the repository at this point in the history
  • Loading branch information
speth committed Dec 27, 2024
1 parent 299264c commit 98dd3ce
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: '8.x'
- name: Build Cantera
run: |
python3 `which scons` build blas_lapack_libs=lapack,blas coverage=y \
Expand Down Expand Up @@ -907,7 +907,7 @@ jobs:
- name: Setup .NET Core SDK
uses: actions/setup-dotnet@v4
with:
dotnet-version: '6.x'
dotnet-version: '8.x'
- name: Download the Cantera shared library (.so)
uses: actions/download-artifact@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion doc/sphinx/develop/compiling/dependencies.md
Original file line number Diff line number Diff line change
Expand Up @@ -212,4 +212,4 @@ compiler is required only if you plan to build the Fortran module.
- [.NET](https://dotnet.microsoft.com/)

- Required for the compilation of the experimental .NET interface
- Known to work for the .NET 6.0 SDK
- Known to work for the .NET 8.0 SDK
2 changes: 1 addition & 1 deletion interfaces/dotnet/Cantera.Tests/Cantera.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion interfaces/dotnet/Cantera/Cantera.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<LangVersion>10</LangVersion>
<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
8 changes: 4 additions & 4 deletions interfaces/dotnet/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

This directory and its children contain the interface to Cantera for .NET languages
such as C# and F#. It is written in C# and supports .NET Standard 2.0
(for the primary project) and .NET 6 (and newer) on all platforms that support both
(for the primary project) and .NET 8 (and newer) on all platforms that support both
.NET and the Cantera C++ library. The .NET interface requires an installation of the
.NET 6.0 SDK.
.NET 8.0 SDK.

## Project Layout

Expand All @@ -14,11 +14,11 @@ interfaces with classes and concepts familiar to a .NET developer. As part of th
process, it invokes [sourcegen](/interfaces/sourcegen)
to scaffold the interop code and some of the code for the wrapper objects, such as
simple properties which can mapped directly to CLib getter and setter functions.
`Cantera.csproj` targets .NET Standard 2.0 and .NET 6. This project will be released as
`Cantera.csproj` targets .NET Standard 2.0 and .NET 8. This project will be released as
a NuGet package.

`Cantera.Tests.csproj` contains the unit tests for the Cantera .NET library and targets
.Net 6.
.Net 8.

The examples directory contains separate projects for each Cantera example. These will
be packaged as a template for use with the .NET CLI, allowing developers to create a
Expand Down
2 changes: 1 addition & 1 deletion interfaces/dotnet/examples/Application/Application.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion interfaces/dotnet/examples/SoundSpeed/SoundSpeed.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down

0 comments on commit 98dd3ce

Please sign in to comment.