Skip to content

Commit dcf3f24

Browse files
michaelstaibmichaelstaib
authored
Added Support for .NET 8 (#6366)
1 parent b4c3ac0 commit dcf3f24

File tree

716 files changed

+40167
-63
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

716 files changed

+40167
-63
lines changed

‎.build/.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dotnet.defaultSolution": ".build.sln"
3+
}

‎.build/Build.sln

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.002.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Build", "Build.csproj", "{3E8AEEC4-1691-4805-9F95-15AD8A4FCF41}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{3E8AEEC4-1691-4805-9F95-15AD8A4FCF41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{3E8AEEC4-1691-4805-9F95-15AD8A4FCF41}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{3E8AEEC4-1691-4805-9F95-15AD8A4FCF41}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{3E8AEEC4-1691-4805-9F95-15AD8A4FCF41}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {E88D3310-24EA-464B-9CBF-790DAF088AE9}
24+
EndGlobalSection
25+
EndGlobal

‎.build/Helpers.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
using System.Net;
12
using System;
23
using System.Collections.Generic;
34
using System.IO;
@@ -52,7 +53,8 @@ static IEnumerable<string> GetAllProjects(
5253
if (!(include?.Invoke(file) ?? true)
5354
|| file.Contains("benchmark", StringComparison.OrdinalIgnoreCase)
5455
|| file.Contains("demo", StringComparison.OrdinalIgnoreCase)
55-
|| file.Contains("sample", StringComparison.OrdinalIgnoreCase))
56+
|| file.Contains("sample", StringComparison.OrdinalIgnoreCase)
57+
|| file.Contains("examples", StringComparison.OrdinalIgnoreCase))
5658
{
5759
continue;
5860
}
@@ -73,7 +75,7 @@ public static IReadOnlyCollection<Output> DotNetBuildSonarSolution(
7375

7476
directories ??= Directories;
7577

76-
IEnumerable<string> projects = GetAllProjects(Path.GetDirectoryName(solutionFile), directories, include);
78+
var projects = GetAllProjects(Path.GetDirectoryName(solutionFile), directories, include);
7779
var workingDirectory = Path.GetDirectoryName(solutionFile);
7880
var list = new List<Output>();
7981

‎.devops/azure-pipelines.release-hotchocolate.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,6 @@ stages:
1111
displayName: "Pack"
1212
dependsOn: []
1313
steps:
14-
- task: DeleteFiles@1
15-
displayName: "Clean AspNetCore resources"
16-
inputs:
17-
SourceFolder: './src/HotChocolate/AspNetCore/src/AspNetCore/Resources'
18-
Contents: '**/*'
19-
RemoveDotFiles: true
20-
- task: DownloadPipelineArtifact@2
21-
displayName: "Integrate Banana Cake pop"
22-
inputs:
23-
buildType: 'specific'
24-
project: 'aefb2b59-b7d8-48cf-8cb0-30fdea720770'
25-
definition: '84'
26-
buildVersionToDownload: 'latest'
27-
artifactName: 'WebApp'
28-
targetPath: './src/HotChocolate/AspNetCore/src/AspNetCore/Resources'
29-
- task: PublishBuildArtifacts@1
30-
displayName: "Upload AspNetCore Code"
31-
inputs:
32-
artifactName: aspnetcore
33-
pathtoPublish: "./src/HotChocolate/AspNetCore/src/AspNetCore"
3414
- task: CmdLine@2
3515
displayName: "Create Packages"
3616
inputs:

‎build.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ else
4444
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "3.1.424" --no-path
4545
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "5.0.408" --no-path
4646
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "6.0.402" --no-path
47+
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "7.0.306" --no-path
4748

4849
# If global.json exists, load expected version
4950
if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.100"
3+
"version": "8.0.100-preview.6.23330.14"
44
}
55
}

‎src/CookieCrumble/src/CookieCrumble/CookieCrumble.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\Transport.Abstractions\HotChocolate.Transport.Abstractions.csproj" />
2424
</ItemGroup>
2525

26-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
26+
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0' OR '$(TargetFramework)' == 'net8.0'">
2727
<ProjectReference Include="..\..\..\HotChocolate\Fusion\src\Core\HotChocolate.Fusion.csproj" />
2828
</ItemGroup>
2929

‎src/CookieCrumble/src/CookieCrumble/TestEnvironment.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,10 @@ public static class TestEnvironment
2525
/// The target framework identifier.
2626
/// </summary>
2727
public const string TargetFramework = "NET7_0";
28+
#elif NET8_0
29+
/// <summary>
30+
/// The target framework identifier.
31+
/// </summary>
32+
public const string TargetFramework = "NET8_0";
2833
#endif
2934
}

‎src/Directory.Build.props

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@
3838
</PropertyGroup>
3939

4040
<PropertyGroup>
41-
<LibraryTargetFrameworks>net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
42-
<Library2TargetFrameworks>net7.0; net6.0</Library2TargetFrameworks>
43-
<TestTargetFrameworks>net7.0; net6.0</TestTargetFrameworks>
44-
<AspNetTargetFrameworks>net7.0; net6.0</AspNetTargetFrameworks>
41+
<LibraryTargetFrameworks>net8.0; net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
42+
<Library2TargetFrameworks>net8.0; net7.0; net6.0</Library2TargetFrameworks>
43+
<Library3TargetFrameworks>net8.0; net7.0</Library3TargetFrameworks>
44+
<TestTargetFrameworks>net8.0; net7.0; net6.0</TestTargetFrameworks>
45+
<AspNetTargetFrameworks>net8.0; net7.0; net6.0</AspNetTargetFrameworks>
4546
<AzfTargetFrameworks>net7.0; net6.0</AzfTargetFrameworks>
46-
<AzfIsoProcTargetFrameworks>net7.0; net6.0</AzfIsoProcTargetFrameworks>
47-
<SourceGenTargetFrameworks>net7.0; net6.0; netstandard2.0</SourceGenTargetFrameworks>
47+
<AzfIsoProcTargetFrameworks>net8.0; net7.0; net6.0</AzfIsoProcTargetFrameworks>
48+
<SourceGenTargetFrameworks>netstandard2.0</SourceGenTargetFrameworks>
4849
</PropertyGroup>
4950

5051
<PropertyGroup>

‎src/HotChocolate/AspNetCore/.vscode/settings.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"dotnet.defaultSolution": "HotChocolate.AspNetCore.sln"
3+
}

0 commit comments

Comments
 (0)