Skip to content
Merged
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
  •  
  •  
  •  
5 changes: 3 additions & 2 deletions .devcontainer/dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ EXPOSE 22
# Start SSH service
CMD ["/usr/sbin/sshd", "-D"]

# Install .NET SDKs (6, 7, 8 and 9)
# Install .NET SDKs (6, 7, 8, 9, and 10)
RUN wget https://dot.net/v1/dotnet-install.sh -O dotnet-install.sh \
&& chmod +x dotnet-install.sh \
&& ./dotnet-install.sh --channel 6.0 --install-dir /usr/share/dotnet \
&& ./dotnet-install.sh --channel 7.0 --install-dir /usr/share/dotnet \
&& ./dotnet-install.sh --channel 8.0 --install-dir /usr/share/dotnet \
&& ./dotnet-install.sh --channel 9.0 --install-dir /usr/share/dotnet \
&& ./dotnet-install.sh --channel 10.0 --install-dir /usr/share/dotnet \
&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet

# Install Node.js LTS
Expand All @@ -56,4 +57,4 @@ RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor |
# Clean up
RUN rm dotnet-install.sh \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
&& rm -rf /var/lib/apt/lists/*
7 changes: 4 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ jobs:
- name: Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.x
dotnet-version: 10.x

- name: Generate Test Matrix
run: dotnet run --project ./.build -- GenerateMatrix
Expand Down Expand Up @@ -181,10 +181,11 @@ jobs:
dotnet-version: |
8.x
9.x
10.x

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

- name: Log in to Docker Hub
Expand All @@ -205,7 +206,7 @@ jobs:
run: >
dotnet test ${{ matrix.path }}
--collect:"XPlat Code Coverage;Format=opencover"
--framework net9.0
--framework net10.0
--logger trx
--no-build
--
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ jobs:
dotnet-version: |
8.x
9.x
10.x

- name: Generate Test Matrix
run: dotnet run --project ./.build -- GenerateMatrix
Expand Down Expand Up @@ -63,10 +64,11 @@ jobs:
dotnet-version: |
8.x
9.x
10.x

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

- name: Log in to Docker Hub
Expand All @@ -82,7 +84,7 @@ jobs:
run: >
dotnet test ${{ matrix.path }}
--collect:"XPlat Code Coverage;Format=opencover"
--framework net9.0
--framework net10.0
--logger trx
--no-build
--verbosity q
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
dotnet-version: |
8.x
9.x
10.x

- name: 🏷 Get the version from tag
id: get_version
Expand Down Expand Up @@ -102,18 +103,18 @@ jobs:
- name: 🛠 Install .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 9.x
dotnet-version: 10.x

- name: 🧩 Publish AOT Binary for ${{ matrix.rid }}
shell: bash
run: |
dotnet publish ./src/HotChocolate/Fusion-vnext/src/Fusion.CommandLine \
-c Release \
-r ${{ matrix.rid }} \
-f net9.0 \
-f net10.0 \
--self-contained true \
-p:PublishAot=true \
-p:TargetFrameworks=NET9.0 \
-p:TargetFrameworks=NET10.0 \
-o ./publish

- name: 📦 Zip Binary (Windows)
Expand Down
5 changes: 3 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,9 @@ else
DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"

# install older frameworks for tests
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "8.0.404" --no-path
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "9.0.100" --no-path
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "8.0.408" --no-path
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "9.0.203" --no-path
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "10.0.100-preview.4.25258.110" --no-path

# If global.json exists, load expected version
if [[ -f "$DOTNET_GLOBAL_FILE" ]]; then
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": "9.0.200",
"version": "10.0.100-preview.4.25258.110",
"rollForward": "latestMinor"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<ItemGroup>
<!-- Package the generator in the analyzer directory of the nuget package -->
<None Include="$(OutputPath)\net9.0\CookieCrumble.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(OutputPath)\net10.0\CookieCrumble.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

<ItemGroup>
<!-- Package the generator in the analyzer directory of the nuget package -->
<None Include="$(OutputPath)\net9.0\CookieCrumble.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(OutputPath)\net10.0\CookieCrumble.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<!-- Package the generator in the analyzer directory of the nuget package -->
<None Include="$(OutputPath)\net9.0\CookieCrumble.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
<None Include="$(OutputPath)\net10.0\CookieCrumble.Analyzers.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@ public static class TestEnvironment
/// The target framework identifier.
/// </summary>
public const string TargetFramework = "NET9_0";
#elif NET10_0
/// <summary>
/// The target framework identifier.
/// </summary>
public const string TargetFramework = "NET10_0";
#endif

public static bool IsLocalEnvironment()
Expand Down
6 changes: 2 additions & 4 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<NuGetAuditMode>direct</NuGetAuditMode>
</PropertyGroup>

<PropertyGroup Condition="'$(TreatWarningsAsErrors)' == ''">
Expand Down Expand Up @@ -44,9 +43,8 @@
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net9.0; net8.0</TargetFrameworks>
<ExtendedTargetFrameworks>net9.0; net8.0; netstandard2.0</ExtendedTargetFrameworks>
<SourceGenTargetFrameworks>netstandard2.0</SourceGenTargetFrameworks>
<TargetFrameworks>net10.0; net9.0; net8.0</TargetFrameworks>
<ExtendedTargetFrameworks>net10.0; net9.0; net8.0; netstandard2.0</ExtendedTargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
41 changes: 28 additions & 13 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
<PackageVersion Include="Aspire.Hosting.RabbitMQ" Version="8.0.0" />
<PackageVersion Include="Aspire.Hosting.Redis" Version="8.0.0" />
<PackageVersion Include="Azure.Storage.Blobs" Version="12.23.0" />
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.7.8" />
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.7.8" />
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.8.2" />
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.8.2" />
<PackageVersion Include="Basic.Reference.Assemblies.Net100" Version="1.8.2" />
<PackageVersion Include="ChilliCream.Nitro.App" Version="$(NitroVersion)" />
<PackageVersion Include="ChilliCream.Testing.Utilities" Version="0.2.0" />
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
Expand Down Expand Up @@ -55,7 +56,6 @@
<PackageVersion Include="StackExchange.Redis" Version="2.6.80" />
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
<PackageVersion Include="Testcontainers" Version="4.3.0" />
<PackageVersion Include="xunit" Version="2.9.3" />
Expand All @@ -69,6 +69,28 @@
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.1" />
<PackageVersion Include="TUnit" Version="0.13.20" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0-preview.3.25172.1" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="10.0.0-preview.3.25172.1" />
<PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="10.0.0-preview.3.25172.1" />
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="10.0.0-preview.3.25171.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.0-preview.3.25171.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-preview.3.25171.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-preview.3.25171.6" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-preview.3.25171.6" />
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-preview.3.25172.1" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.0-preview.3.25171.5" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="10.0.0-preview.3.25172.1" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="10.0.0-preview.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="10.0.0-preview.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="10.0.0-preview.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.2" />
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.2" />
Expand All @@ -90,10 +112,6 @@
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.3" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="9.0.3" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
<PackageVersion Include="System.IO.Packaging" Version="9.0.2" />
<PackageVersion Include="System.IO.Pipelines" Version="9.0.2" />
<PackageVersion Include="System.IO.Hashing" Version="9.0.2" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
Expand All @@ -113,13 +131,10 @@
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.0" />
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="8.0.4" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.8" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="8.0.8" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="8.0.8" />
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
<PackageVersion Include="System.IO.Packaging" Version="8.0.1" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="8.0.10" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NodaTime" Version="8.0.10" />
<PackageVersion Include="System.IO.Pipelines" Version="8.0.0" />
<PackageVersion Include="System.IO.Hashing" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="6.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageReference Include="Squadron.PostgreSql" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" />
</ItemGroup>

</Project>
Loading
Loading