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.

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

Updated target frameworks #7471

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
26 changes: 0 additions & 26 deletions .build/.vscode/launch.json

This file was deleted.

3 changes: 0 additions & 3 deletions .build/.vscode/settings.json

This file was deleted.

24 changes: 0 additions & 24 deletions .build/.vscode/tasks.json

This file was deleted.

1 change: 0 additions & 1 deletion .build/Build.Environment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ partial class Build
const string Release = "Release";
const string Net50 = "net5.0";
const string Net60 = "net6.0";
const string Net70 = "net7.0";

readonly int DegreeOfParallelism = 2;

Expand Down
2 changes: 1 addition & 1 deletion .build/Build.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>
<RootNamespace></RootNamespace>
<NoWarn>CS0649;CS0169</NoWarn>
<NukeRootDirectory>..</NukeRootDirectory>
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,8 +150,8 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.x
8.x
9.x

- name: Generate Test Matrix
run: dotnet run --project ./.build -- GenerateMatrix
Expand Down Expand Up @@ -180,13 +180,12 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.x
7.x
8.x
9.x

- name: Run Build
id: run-build
run: dotnet build ${{ matrix.path }} --framework net8.0 --verbosity q
run: dotnet build ${{ matrix.path }} --framework net9.0 --verbosity q
timeout-minutes: 5

- name: Run tests
Expand All @@ -196,7 +195,7 @@ jobs:
run: >
dotnet test ${{ matrix.path }}
--collect:"XPlat Code Coverage;Format=opencover"
--framework net8.0
--framework net9.0
--logger trx
--no-build
--
Expand Down Expand Up @@ -243,9 +242,8 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.x
7.x
8.x
9.x

- name: Create All.sln
if: ${{ !cancelled() }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
7.x
8.x
9.x

- name: Generate Test Matrix
run: dotnet run --project ./.build -- GenerateMatrix
Expand Down Expand Up @@ -58,13 +58,12 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.x
7.x
8.x
9.x

- name: Run Build
id: run-build
run: dotnet build ${{ matrix.path }} --framework net8.0 --verbosity q
run: dotnet build ${{ matrix.path }} --framework net9.0 --verbosity q
timeout-minutes: 5

- name: Run tests
Expand All @@ -74,7 +73,7 @@ jobs:
run: >
dotnet test ${{ matrix.path }}
--collect:"XPlat Code Coverage;Format=opencover"
--framework net8.0
--framework net9.0
--logger trx
--no-build
--verbosity q
Expand Down Expand Up @@ -127,9 +126,8 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.x
7.x
8.x
9.x

- name: Create All.sln
if: ${{ !cancelled() }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.x
7.x
8.x
9.x

- name: Get the version
id: get_version
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": "8.0.101",
"version": "9.0.100-rc.1.24452.12",
"rollForward": "latestMinor"
}
}
4 changes: 0 additions & 4 deletions src/CookieCrumble/src/CookieCrumble/CookieCrumble.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(Library2TargetFrameworks)</TargetFrameworks>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<AssemblyName>CookieCrumble</AssemblyName>
<RootNamespace>CookieCrumble</RootNamespace>
Expand All @@ -19,9 +18,6 @@
<ProjectReference Include="..\..\..\HotChocolate\Core\src\Core\HotChocolate.Core.csproj" />
<ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\AspNetCore\HotChocolate.AspNetCore.csproj" />
<ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\Transport.Abstractions\HotChocolate.Transport.Abstractions.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<ProjectReference Include="..\..\..\HotChocolate\Fusion\src\Core\HotChocolate.Fusion.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
#if NET8_0_OR_GREATER
using System.Buffers;
using HotChocolate.Fusion.Execution.Nodes;

Expand All @@ -9,4 +8,3 @@ internal sealed class QueryPlanSnapshotValueFormatter() : SnapshotValueFormatter
protected override void Format(IBufferWriter<byte> snapshot, QueryPlan value)
=> value.Format(snapshot);
}
#endif
2 changes: 0 additions & 2 deletions src/CookieCrumble/src/CookieCrumble/Snapshot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ public class Snapshot
new HttpResponseSnapshotValueFormatter(),
new OperationResultSnapshotValueFormatter(),
new JsonElementSnapshotValueFormatter(),
#if NET8_0_OR_GREATER
new QueryPlanSnapshotValueFormatter(),
#endif
});
private static readonly JsonSnapshotValueFormatter _defaultFormatter = new();

Expand Down
13 changes: 4 additions & 9 deletions src/CookieCrumble/src/CookieCrumble/TestEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,16 @@ namespace CookieCrumble;
/// </summary>
public static class TestEnvironment
{
#if NET6_0
#if NET8_0
/// <summary>
/// The target framework identifier.
/// </summary>
public const string TargetFramework = "NET6_0";
#elif NET7_0
/// <summary>
/// The target framework identifier.
/// </summary>
public const string TargetFramework = "NET7_0";
#elif NET8_0
public const string TargetFramework = "NET8_0";
#elif NET9_0
/// <summary>
/// The target framework identifier.
/// </summary>
public const string TargetFramework = "NET8_0";
public const string TargetFramework = "NET9_0";
#endif

public static bool IsLocalEnvironment()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>$(Library2TargetFrameworks)</TargetFrameworks>

<IsPackable>false</IsPackable>

<AssemblyName>CookieCrumble.Tests</AssemblyName>
Expand Down
9 changes: 2 additions & 7 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,8 @@
</PropertyGroup>

<PropertyGroup>
<LibraryTargetFrameworks>net8.0; net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
<Library2TargetFrameworks>net8.0; net7.0; net6.0</Library2TargetFrameworks>
<Library3TargetFrameworks>net8.0; net7.0</Library3TargetFrameworks>
<TestTargetFrameworks>net8.0; net7.0; net6.0</TestTargetFrameworks>
<AspNetTargetFrameworks>net8.0; net7.0; net6.0</AspNetTargetFrameworks>
<AzfTargetFrameworks>net7.0; net6.0</AzfTargetFrameworks>
<AzfIsoProcTargetFrameworks>net8.0; net7.0; net6.0</AzfIsoProcTargetFrameworks>
<TargetFrameworks>net9.0; net8.0</TargetFrameworks>
<ExtendedTargetFrameworks>net9.0; net8.0; netstandard2.0</ExtendedTargetFrameworks>
<SourceGenTargetFrameworks>netstandard2.0</SourceGenTargetFrameworks>
</PropertyGroup>

Expand Down
Loading
Loading