Skip to content

Commit 3bf761a

Browse files
glen-84glen-84
authored
Added .NET 10 (#8248)
1 parent 12c0698 commit 3bf761a

File tree

354 files changed

+17344
-1289
lines changed

Some content is hidden

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

354 files changed

+17344
-1289
lines changed

‎.devcontainer/dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ EXPOSE 22
2424
# Start SSH service
2525
CMD ["/usr/sbin/sshd", "-D"]
2626

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

3637
# Install Node.js LTS
@@ -56,4 +57,4 @@ RUN curl -sL https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor |
5657
# Clean up
5758
RUN rm dotnet-install.sh \
5859
&& apt-get clean \
59-
&& rm -rf /var/lib/apt/lists/*
60+
&& rm -rf /var/lib/apt/lists/*

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
- name: Install .NET
149149
uses: actions/setup-dotnet@v4
150150
with:
151-
dotnet-version: 9.x
151+
dotnet-version: 10.x
152152

153153
- name: Generate Test Matrix
154154
run: dotnet run --project ./.build -- GenerateMatrix
@@ -181,10 +181,11 @@ jobs:
181181
dotnet-version: |
182182
8.x
183183
9.x
184+
10.x
184185
185186
- name: Run Build
186187
id: run-build
187-
run: dotnet build ${{ matrix.path }} --framework net9.0 --verbosity q
188+
run: dotnet build ${{ matrix.path }} --framework net10.0 --verbosity q
188189
timeout-minutes: 5
189190

190191
- name: Log in to Docker Hub
@@ -205,7 +206,7 @@ jobs:
205206
run: >
206207
dotnet test ${{ matrix.path }}
207208
--collect:"XPlat Code Coverage;Format=opencover"
208-
--framework net9.0
209+
--framework net10.0
209210
--logger trx
210211
--no-build
211212
--

‎.github/workflows/coverage.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ jobs:
3232
dotnet-version: |
3333
8.x
3434
9.x
35+
10.x
3536
3637
- name: Generate Test Matrix
3738
run: dotnet run --project ./.build -- GenerateMatrix
@@ -63,10 +64,11 @@ jobs:
6364
dotnet-version: |
6465
8.x
6566
9.x
67+
10.x
6668
6769
- name: Run Build
6870
id: run-build
69-
run: dotnet build ${{ matrix.path }} --framework net9.0 --verbosity q
71+
run: dotnet build ${{ matrix.path }} --framework net10.0 --verbosity q
7072
timeout-minutes: 5
7173

7274
- name: Log in to Docker Hub
@@ -82,7 +84,7 @@ jobs:
8284
run: >
8385
dotnet test ${{ matrix.path }}
8486
--collect:"XPlat Code Coverage;Format=opencover"
85-
--framework net9.0
87+
--framework net10.0
8688
--logger trx
8789
--no-build
8890
--verbosity q

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
dotnet-version: |
2424
8.x
2525
9.x
26+
10.x
2627
2728
- name: 🏷 Get the version from tag
2829
id: get_version
@@ -102,18 +103,18 @@ jobs:
102103
- name: 🛠 Install .NET
103104
uses: actions/setup-dotnet@v4
104105
with:
105-
dotnet-version: 9.x
106+
dotnet-version: 10.x
106107

107108
- name: 🧩 Publish AOT Binary for ${{ matrix.rid }}
108109
shell: bash
109110
run: |
110111
dotnet publish ./src/HotChocolate/Fusion-vnext/src/Fusion.CommandLine \
111112
-c Release \
112113
-r ${{ matrix.rid }} \
113-
-f net9.0 \
114+
-f net10.0 \
114115
--self-contained true \
115116
-p:PublishAot=true \
116-
-p:TargetFrameworks=NET9.0 \
117+
-p:TargetFrameworks=NET10.0 \
117118
-o ./publish
118119
119120
- name: 📦 Zip Binary (Windows)

‎build.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,9 @@ else
4141
DOTNET_DIRECTORY="$TEMP_DIRECTORY/dotnet-unix"
4242

4343
# install older frameworks for tests
44-
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "8.0.404" --no-path
45-
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "9.0.100" --no-path
44+
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "8.0.408" --no-path
45+
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "9.0.203" --no-path
46+
"$DOTNET_INSTALL_FILE" --install-dir "$DOTNET_DIRECTORY" --version "10.0.100-preview.4.25258.110" --no-path
4647

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

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "9.0.200",
3+
"version": "10.0.100-preview.4.25258.110",
44
"rollForward": "latestMinor"
55
}
66
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

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

2323
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

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

2525
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

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

2424
</Project>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ public static class TestEnvironment
1717
/// The target framework identifier.
1818
/// </summary>
1919
public const string TargetFramework = "NET9_0";
20+
#elif NET10_0
21+
/// <summary>
22+
/// The target framework identifier.
23+
/// </summary>
24+
public const string TargetFramework = "NET10_0";
2025
#endif
2126

2227
public static bool IsLocalEnvironment()

0 commit comments

Comments
 (0)