Skip to content

Commit

Permalink
Finalize net7.0 migration (#365)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgiannuzzi authored Aug 11, 2023
1 parent 71e9441 commit b66843d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ jobs:
uses: actions/setup-dotnet@v3
with:
dotnet-version: 3.1.x
- name: Setup .NET SDK v7.0.x
if: matrix.dotnet == 'net7.0'
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Setup .NET SDK v6.0.x
if: matrix.dotnet == 'net6.0'
uses: actions/setup-dotnet@v3
with:
dotnet-version: 6.0.x
- name: Setup .NET SDK v7.0.x
uses: actions/setup-dotnet@v3
with:
dotnet-version: 7.0.x
- name: Add local NuGet feed
run: |
dotnet new nugetconfig
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>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<LangVersion>9.0</LangVersion>
<Nullable>enable</Nullable>
<AssemblyName>ParquetSharp.Benchmark</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion csharp.test/ParquetSharp.Test.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net7.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>
Expand Down
2 changes: 1 addition & 1 deletion fsharp.test/ParquetSharp.Test.FSharp.fsproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net6.0</TargetFrameworks>
<TargetFrameworks>net7.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>
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": "6.0.100",
"version": "7.0.100",
"rollForward": "latestMinor"
}
}

0 comments on commit b66843d

Please sign in to comment.