Skip to content

Commit

Permalink
Use net8.0 SDK (#456)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgiannuzzi authored Jun 10, 2024
1 parent 129feaa commit c6efd91
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 22 deletions.
7 changes: 3 additions & 4 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/devcontainers/dotnet:0-7.0-bullseye-slim AS dotnet
FROM mcr.microsoft.com/devcontainers/dotnet:1-8.0-bookworm-slim AS dotnet

#====================================================================

Expand All @@ -19,13 +19,12 @@ RUN for project in /tmp/build/csharp*; do \
FROM dotnet AS cpp

# Install the C++ dev tools
RUN echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y install --no-install-recommends \
bison \
build-essential \
cmake/bullseye-backports \
cmake \
cppcheck \
flex \
gdb \
Expand Down
27 changes: 16 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup .NET SDK v7.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Code formating check
run: |
dotnet tool restore
Expand Down Expand Up @@ -121,10 +121,10 @@ jobs:
run: brew install bison

# .NET Core Setup (and also MSBuild for Windows).
- name: Setup .NET SDK v7.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Setup MSBuild
if: runner.os == 'Windows'
uses: microsoft/setup-msbuild@v2
Expand Down Expand Up @@ -188,10 +188,10 @@ jobs:
run: |
mkdir bin
cp -rv artifacts/*-native-library/* bin/
- name: Setup .NET SDK v7.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
- name: Get version
id: get-version
shell: pwsh
Expand Down Expand Up @@ -219,13 +219,13 @@ jobs:
test-nuget:
strategy:
matrix:
os: [ubuntu-20.04, macos-11, macos-12, macos-13-xlarge, windows-2022, ubuntu-20.04-arm64]
dotnet: [netcoreapp3.1, net6.0, net7.0]
os: [ubuntu-20.04, macos-12, macos-13, macos-14, windows-2022, ubuntu-20.04-arm64]
dotnet: [netcoreapp3.1, net6.0, net7.0, net8.0]
include:
- os: windows-2022
dotnet: net472
exclude:
- os: macos-13-xlarge
- os: macos-14
dotnet: netcoreapp3.1
fail-fast: false
name: Test NuGet package (${{ matrix.dotnet }} on ${{ matrix.os }})
Expand All @@ -250,9 +250,14 @@ jobs:
with:
dotnet-version: 6.0.x
- name: Setup .NET SDK v7.0.x
if: matrix.dotnet == 'net7.0'
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
- name: Add local NuGet feed
run: |
dotnet new nugetconfig
Expand Down Expand Up @@ -307,10 +312,10 @@ jobs:
with:
name: nuget-package
path: nuget
- name: Setup .NET SDK v7.0.x
- name: Setup .NET SDK v8.0.x
uses: actions/setup-dotnet@v4
with:
dotnet-version: 7.0.x
dotnet-version: 8.0.x
# if version contains "-" treat it as pre-release
# example: 1.0.0-beta1
- name: Create release
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ devcontainer exec dotnet test csharp.test

Building ParquetSharp natively requires the following dependencies:
- A modern C++ compiler toolchain
- .NET SDK 7.0
- .NET SDK 8.0
- Apache Arrow (15.0.2)

For building Arrow (including Parquet) and its dependencies, we recommend using Microsoft's [vcpkg](https://vcpkg.io).
Expand Down
2 changes: 1 addition & 1 deletion csharp.benchmark/ParquetSharp.Benchmark.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>
<AssemblyName>ParquetSharp.Benchmark</AssemblyName>
Expand Down
4 changes: 2 additions & 2 deletions csharp.test/ParquetSharp.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<!-- Avoid building for older frameworks when testing locally. -->
<!-- This is to speed up the build process and avoid errors when the required runtimes are not installed. -->
<TargetFrameworks Condition="'$(CI)' == 'true'">$(TargetFrameworks);netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(CI)' == 'true'">$(TargetFrameworks);netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(CI)' == 'true' AND '$(OS)'=='Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>
Expand Down
4 changes: 2 additions & 2 deletions fsharp.test/ParquetSharp.Test.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<!-- Avoid building for older frameworks when testing locally. -->
<!-- This is to speed up the build process and avoid errors when the required runtimes are not installed. -->
<TargetFrameworks Condition="'$(CI)' == 'true'">$(TargetFrameworks);netcoreapp3.1;net6.0</TargetFrameworks>
<TargetFrameworks Condition="'$(CI)' == 'true'">$(TargetFrameworks);netcoreapp3.1;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(CI)' == 'true' AND '$(OS)'=='Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
<PlatformTarget Condition="'$(TargetFramework)'=='net472'">x64</PlatformTarget>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "7.0.100",
"version": "8.0.100",
"rollForward": "latestMinor"
}
}

0 comments on commit c6efd91

Please sign in to comment.