diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 29cb7e6f392..b539c60c115 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -520,7 +520,7 @@ jobs: - name: Set up .NET SDK uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 with: - dotnet-version: "10.0.x" + dotnet-version: "11.0.x" - name: Show .NET SDKs run: dotnet --list-sdks @@ -578,17 +578,20 @@ jobs: timeout-minutes: 60 strategy: matrix: - dotnet-version: [8, 9, 10] + dotnet-version: [8, 9, 10, 11] fail-fast: false steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false + # The library also targets net11.0, which only the .NET 11 SDK can build - name: Set up .NET SDK ${{ matrix.dotnet-version }} uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 with: - dotnet-version: "${{ matrix.dotnet-version }}.0.x" + dotnet-version: | + ${{ matrix.dotnet-version }}.0.x + 11.0.x - uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2 with: @@ -1723,7 +1726,7 @@ jobs: - name: Set up .NET SDK uses: actions/setup-dotnet@a98b56852c35b8e3190ac28c8c2271da59106c68 # v6.0.0 with: - dotnet-version: "10.0.x" + dotnet-version: "11.0.x" - name: Configure apt retries and timeouts run: sudo cp .github/apt/99-ci-network /etc/apt/apt.conf.d/ diff --git a/LANGUAGES.md b/LANGUAGES.md index 83291ffa783..c4e9b5d24f8 100644 --- a/LANGUAGES.md +++ b/LANGUAGES.md @@ -165,7 +165,7 @@ language; it is the effective minimum the project stands behind for that release .NET 0.13.0 Yes -.NET Standard 2.x, net8, net9, net10 +.NET Standard 2.x, net8, net9, net10, net11 Yes YesYesYesYes YesYes diff --git a/build/docker/README.md b/build/docker/README.md index b8b4058078f..783660446c7 100644 --- a/build/docker/README.md +++ b/build/docker/README.md @@ -186,7 +186,7 @@ Last updated: May 2, 2026 | java | 17 | | | | js | | | Node.js 16.20.2, npm 8.19.4 | | lua | 5.2.4 | | Lua 5.3: see THRIFT-4386 | -| netstd | 9.0 | 9.0 | | +| netstd | 11.0 | 11.0 | | | nodejs | 16.20.2 | | | | ocaml | 4.13.1 | | | | perl | 5.34.0 | | | diff --git a/build/docker/msvc/Dockerfile b/build/docker/msvc/Dockerfile index 14c640eeab4..92c49676811 100644 --- a/build/docker/msvc/Dockerfile +++ b/build/docker/msvc/Dockerfile @@ -19,7 +19,7 @@ # a Build Tools component below, for the C++/CLI test project. # Keep the SDK major in step with the highest TargetFramework in lib/netstd: # an older SDK cannot build a newer target. -FROM mcr.microsoft.com/dotnet/sdk:10.0-windowsservercore-ltsc2025 +FROM mcr.microsoft.com/dotnet/sdk:11.0-windowsservercore-ltsc2025 # Restore the default Windows shell for correct batch processing below. SHELL ["cmd", "/S", "/C"] diff --git a/build/docker/ubuntu-jammy/Dockerfile b/build/docker/ubuntu-jammy/Dockerfile index a629cdeb0d9..5eaabb6c864 100644 --- a/build/docker/ubuntu-jammy/Dockerfile +++ b/build/docker/ubuntu-jammy/Dockerfile @@ -127,10 +127,10 @@ ENV PATH=/usr/lib/dart/bin:$PATH RUN add-apt-repository ppa:dotnet/backports RUN apt-get install -y --no-install-recommends \ `# dotnet core dependencies` \ - dotnet-sdk-10.0 \ - dotnet-runtime-10.0 \ - aspnetcore-runtime-10.0 \ - dotnet-apphost-pack-10.0 + dotnet-sdk-11.0 \ + dotnet-runtime-11.0 \ + aspnetcore-runtime-11.0 \ + dotnet-apphost-pack-11.0 # Erlang dependencies ARG ERLANG_OTP_VERSION=25.3.2.9 diff --git a/build/docker/ubuntu-noble/Dockerfile b/build/docker/ubuntu-noble/Dockerfile index cbd8cd982d3..ca774f39d27 100644 --- a/build/docker/ubuntu-noble/Dockerfile +++ b/build/docker/ubuntu-noble/Dockerfile @@ -126,10 +126,10 @@ ENV PATH=/usr/lib/dart/bin:$PATH RUN add-apt-repository ppa:dotnet/backports RUN apt-get install -y --no-install-recommends \ `# dotnet core dependencies` \ - dotnet-sdk-10.0 \ - dotnet-runtime-10.0 \ - aspnetcore-runtime-10.0 \ - dotnet-apphost-pack-10.0 + dotnet-sdk-11.0 \ + dotnet-runtime-11.0 \ + aspnetcore-runtime-11.0 \ + dotnet-apphost-pack-11.0 # Erlang dependencies ARG ERLANG_OTP_VERSION=25.3.2.9 diff --git a/build/veralign.sh b/build/veralign.sh index 83ba213904b..d7a3c051d8d 100755 --- a/build/veralign.sh +++ b/build/veralign.sh @@ -70,6 +70,7 @@ FILES[lib/js/src/thrift.js]=simpleReplace FILES[lib/lua/Thrift.lua]=simpleReplace FILES[lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj]=simpleReplace FILES[lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net10/Thrift.Compile.net10.csproj]=simpleReplace +FILES[lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Thrift.Compile.net11.csproj]=simpleReplace FILES[lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net8/Thrift.Compile.net8.csproj]=simpleReplace FILES[lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net9/Thrift.Compile.net9.csproj]=simpleReplace FILES[lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.netstd2/Thrift.Compile.netstd2.csproj]=simpleReplace diff --git a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc index bbabce98e45..c9e1c7c633d 100644 --- a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc +++ b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc @@ -83,6 +83,9 @@ t_netstd_generator::t_netstd_generator(t_program* program, const mapfirst.compare("no_deepcopy") == 0) { suppress_deepcopy = true; } + else if (iter->first.compare("net11") == 0) { + target_net_version = 11; + } else if (iter->first.compare("net10") == 0) { target_net_version = 10; } @@ -212,9 +215,12 @@ void t_netstd_generator::reset_indent() { void t_netstd_generator::pragmas_and_directives(ostream& out) { - if( target_net_version >= 10) { + if( target_net_version >= 11) { + out << "// targeting net 11" << '\n'; + out << "#if( !NET11_0_OR_GREATER)" << '\n'; + } else if( target_net_version >= 10) { out << "// targeting net 10" << '\n'; - out << "#if( !NET10_0_OR_GREATER)" << '\n'; + out << "#if( NET11_0_OR_GREATER || !NET10_0_OR_GREATER)" << '\n'; } else if( target_net_version >= 9) { out << "// targeting net 9" << '\n'; out << "#if( NET10_0_OR_GREATER || !NET9_0_OR_GREATER)" << '\n'; @@ -4343,6 +4349,7 @@ THRIFT_REGISTER_GENERATOR( " net8: Enable features that require net8 and C# 12 or higher.\n" " net9: Enable features that require net9 and C# 13 or higher.\n" " net10: Enable features that require net10 and C# 14 or higher.\n" + " net11: Enable features that require net11 and C# 15 or higher.\n" " no_deepcopy: Suppress generation of " + DEEP_COPY_METHOD_NAME + "() method.\n" " async_postfix: Append \"Async\" to all service methods (maintains compatibility with existing code).\n" ) diff --git a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj index aba24f88c5a..098acc85942 100644 --- a/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj +++ b/lib/netstd/Benchmarks/Thrift.Benchmarks/Thrift.Benchmarks.csproj @@ -20,7 +20,7 @@ Exe - net10.0 + net11.0 0.26.0 latestMajor false @@ -29,7 +29,10 @@ - + + diff --git a/lib/netstd/Makefile.am b/lib/netstd/Makefile.am index d811c9ad8c3..94ced310a49 100644 --- a/lib/netstd/Makefile.am +++ b/lib/netstd/Makefile.am @@ -25,6 +25,7 @@ all-local: check-local: precompile-fuzzers $(DOTNETCORE) test Tests/Thrift.Compile.Tests/Thrift.Compile.net8/Thrift.Compile.net8.csproj $(DOTNETCORE) test Tests/Thrift.Compile.Tests/Thrift.Compile.net9/Thrift.Compile.net9.csproj + $(DOTNETCORE) test Tests/Thrift.Compile.Tests/Thrift.Compile.net10/Thrift.Compile.net10.csproj $(DOTNETCORE) test Tests/Thrift.Compile.Tests/Thrift.Compile.netstd2/Thrift.Compile.netstd2.csproj $(DOTNETCORE) test Tests/Thrift.Tests/Thrift.Tests.csproj $(DOTNETCORE) test Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj @@ -58,6 +59,10 @@ clean-local: $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net8/obj $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net9/bin $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net9/obj + $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net10/bin + $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net10/obj + $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net11/bin + $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.net11/obj $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.netstd2/bin $(RM) -r Tests/Thrift.Compile.Tests/Thrift.Compile.netstd2/obj $(RM) -r Tests/Thrift.FuzzTests/bin diff --git a/lib/netstd/README.md b/lib/netstd/README.md index a3623e1c599..f07f6091ebe 100644 --- a/lib/netstd/README.md +++ b/lib/netstd/README.md @@ -78,7 +78,7 @@ additionally requires the SharpFuzz.CommandLine global tool and the ## Prerequisites -1. A .NET 10 SDK (same one used for the rest of `lib/netstd`). +1. A .NET 11 SDK (same one used for the rest of `lib/netstd`). 2. The SharpFuzz IL-rewriter CLI, installed as a .NET global tool: @@ -103,7 +103,7 @@ additionally requires the SharpFuzz.CommandLine global tool and the ## A temporary note on `DOTNET_ROLL_FORWARD` As of SharpFuzz.CommandLine 2.2.0, the global tool's `runtimeconfig.json` pins the -tool to .NET 9, which prevents it from running under a .NET 10-only host. Both +tool to .NET 9, which prevents it from running under a .NET 11-only host. Both `buildfuzzers.sh` and `runfuzzer.sh` therefore export `DOTNET_ROLL_FORWARD=Major` at the top of the script as a workaround. Upstream fix: [SharpFuzz PR #72](https://github.com/Metalnem/sharpfuzz/pull/72) (merged, pending diff --git a/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Impl/Thrift5253/MyService.cs b/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Impl/Thrift5253/MyService.cs new file mode 100644 index 00000000000..c99c94ab2cb --- /dev/null +++ b/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Impl/Thrift5253/MyService.cs @@ -0,0 +1,70 @@ +// Licensed to the Apache Software Foundation(ASF) under one +// or more contributor license agreements.See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership.The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +using System; +using System.Collections.Generic; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Thrift5253; + +namespace Thrift.Compile.net11.Impl.Thrift5253 +{ + class MyServiceImpl : MyService.IAsync + { + public Task AsyncProcessor_(AsyncProcessor? input, CancellationToken cancellationToken = default) + { + return Task.FromResult(new AsyncProcessor() { Foo = input?.Foo ?? 0 }); + } + + public Task Broken(BrokenArgs? input, CancellationToken cancellationToken = default) + { + return Task.FromResult(new BrokenResult() { Foo = input?.Foo ?? 0 }); + } + + public Task Client_(Client? input, CancellationToken cancellationToken = default) + { + _ = cancellationToken; + return Task.FromResult(new Client() { Foo = input?.Foo ?? 0 }); + } + + public Task IAsync_(IAsync? input, CancellationToken cancellationToken = default) + { + return Task.FromResult(new IAsync() { Foo = input?.Foo ?? 0 }); + } + + public Task InternalStructs_(InternalStructs? input, CancellationToken cancellationToken = default) + { + return Task.FromResult(new InternalStructs() { Foo = input?.Foo ?? 0 }); + } + + public Task TestAsync(CancellationToken cancellationToken = default) + { + return Task.CompletedTask; + } + + public Task TestXsync(CancellationToken cancellationToken = default) + { + return Task.CompletedTask; + } + + public Task Works(WorksArrrgs? input, CancellationToken cancellationToken = default) + { + return Task.FromResult(new WorksRslt() { Foo = input?.Foo ?? 0 }); + } + } +} diff --git a/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Properties/AssemblyInfo.cs b/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Properties/AssemblyInfo.cs new file mode 100644 index 00000000000..5bd3c6fb603 --- /dev/null +++ b/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Properties/AssemblyInfo.cs @@ -0,0 +1,40 @@ +// Licensed to the Apache Software Foundation(ASF) under one +// or more contributor license agreements.See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership.The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. + +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("The Apache Software Foundation")] +[assembly: AssemblyProduct("Thrift")] +[assembly: AssemblyCopyright("The Apache Software Foundation")] +[assembly: AssemblyTrademark("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. + +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM + +[assembly: Guid("1b468b7a-a53b-46de-90da-5f9ad7707ef4")] \ No newline at end of file diff --git a/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Thrift.Compile.net11.csproj b/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Thrift.Compile.net11.csproj new file mode 100644 index 00000000000..1a52d241193 --- /dev/null +++ b/lib/netstd/Tests/Thrift.Compile.Tests/Thrift.Compile.net11/Thrift.Compile.net11.csproj @@ -0,0 +1,98 @@ + + + + + 0.26.0 + Thrift version $(ThriftVersion) + net11.0 + latestMajor + $(ThriftVersion).0 + Thrift.Compile.net11 + Thrift.Compile.net11 + false + false + false + false + enable + + $(WarningsAsErrors);CS0108;CS0109;CS0114 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/netstd/Tests/Thrift.FuzzTests/Thrift.FuzzTests.csproj b/lib/netstd/Tests/Thrift.FuzzTests/Thrift.FuzzTests.csproj index f7888e1bf74..ef4ea7a2cc1 100644 --- a/lib/netstd/Tests/Thrift.FuzzTests/Thrift.FuzzTests.csproj +++ b/lib/netstd/Tests/Thrift.FuzzTests/Thrift.FuzzTests.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor enable Exe diff --git a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj index b944a44aa3a..0b265919669 100644 --- a/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj +++ b/lib/netstd/Tests/Thrift.IntegrationTests/Thrift.IntegrationTests.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor Thrift.IntegrationTests Thrift.IntegrationTests diff --git a/lib/netstd/Tests/Thrift.Tests/Protocols/TProtocolRecursionDepthTests.cs b/lib/netstd/Tests/Thrift.Tests/Protocols/TProtocolRecursionDepthTests.cs index 839f834022e..e817e7712f2 100644 --- a/lib/netstd/Tests/Thrift.Tests/Protocols/TProtocolRecursionDepthTests.cs +++ b/lib/netstd/Tests/Thrift.Tests/Protocols/TProtocolRecursionDepthTests.cs @@ -33,7 +33,7 @@ namespace Thrift.Tests.Protocols // payload would hit -- not the protocol's Write/ReadStructBegin methods in isolation. // // The recursive IDL types come from test/Recursive.thrift, generated into the - // Thrift.Compile.net10 test assembly, and cover all three struct-like kinds: + // Thrift.Compile.net11 test assembly, and cover all three struct-like kinds: // * struct -- CoRec <-> CoRec2 (mutually recursive), RecTree (wide tree) // * exception -- CoError <-> CoError2 (mutually recursive) // * union -- CoUnion <-> CoUnion2 (mutually recursive) diff --git a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj index 1110aef3317..7e6c16c4feb 100644 --- a/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj +++ b/lib/netstd/Tests/Thrift.Tests/Thrift.Tests.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor 0.26.0.0 enable @@ -36,7 +36,7 @@ - + diff --git a/lib/netstd/Tests/codegen/run-NetStd-Codegen-Tests.ps1 b/lib/netstd/Tests/codegen/run-NetStd-Codegen-Tests.ps1 index a0ea788b04a..57fb37b8cc6 100644 --- a/lib/netstd/Tests/codegen/run-NetStd-Codegen-Tests.ps1 +++ b/lib/netstd/Tests/codegen/run-NetStd-Codegen-Tests.ps1 @@ -45,7 +45,8 @@ $KNOWN_BUGS = @( $NET_VERSIONS = @( "net8", "net9", - "net10" + "net10", + "net11" ) if ($TargetVersions.Count -gt 0) { $NET_VERSIONS = $TargetVersions } diff --git a/lib/netstd/Thrift.AspNetCore/Thrift.AspNetCore.csproj b/lib/netstd/Thrift.AspNetCore/Thrift.AspNetCore.csproj index 10ae1b3839c..be859b880b6 100644 --- a/lib/netstd/Thrift.AspNetCore/Thrift.AspNetCore.csproj +++ b/lib/netstd/Thrift.AspNetCore/Thrift.AspNetCore.csproj @@ -19,7 +19,7 @@ --> - net8.0;net9.0;net10.0 + net8.0;net9.0;net10.0;net11.0 Thrift.AspNetCore ApacheThrift.AspNetCore true diff --git a/lib/netstd/Thrift.slnx b/lib/netstd/Thrift.slnx index 566cb58ddbe..53362583a5e 100644 --- a/lib/netstd/Thrift.slnx +++ b/lib/netstd/Thrift.slnx @@ -28,6 +28,7 @@ + diff --git a/lib/netstd/Thrift/Thrift.csproj b/lib/netstd/Thrift/Thrift.csproj index 5815b93789c..f579cd79725 100644 --- a/lib/netstd/Thrift/Thrift.csproj +++ b/lib/netstd/Thrift/Thrift.csproj @@ -19,7 +19,7 @@ --> - netstandard2.1;netstandard2.0;net8.0;net9.0;net10.0 + netstandard2.1;netstandard2.0;net8.0;net9.0;net10.0;net11.0 Thrift ApacheThrift true diff --git a/lib/netstd/buildfuzzers.sh b/lib/netstd/buildfuzzers.sh index 4060c09a419..f72a389341c 100755 --- a/lib/netstd/buildfuzzers.sh +++ b/lib/netstd/buildfuzzers.sh @@ -41,7 +41,7 @@ for arg in "$@"; do done # Ensure the SharpFuzz.CommandLine global tool (runtimeconfig-pinned to -# net9.0 in package 2.2.0) can roll forward onto the net10 runtime used +# net9.0 in package 2.2.0) can roll forward onto the net11 runtime used # by this repo. Remove once SharpFuzz 2.3.0 (upstream PR #72) ships with # an updated runtimeconfig. export DOTNET_ROLL_FORWARD=Major @@ -84,7 +84,7 @@ THRIFT=$(realpath "$THRIFT") THRIFT_FILE=$(realpath "$(dirname "$0")/../../test/FuzzTest.thrift") GEN_DIR=$(realpath -m "$(dirname "$0")/Tests/Thrift.FuzzTests/gen-netstd") FUZZERS_DIR=$(realpath "$(dirname "$0")/Tests/Thrift.FuzzTests") -OUTPUT_DIR="$FUZZERS_DIR/bin/Debug/net10.0" +OUTPUT_DIR="$FUZZERS_DIR/bin/Debug/net11.0" # Step 1: Generate C# code from FuzzTest.thrift if [ ! -x "$THRIFT" ]; then @@ -97,7 +97,7 @@ rm -rf "$GEN_DIR" mkdir -p "$GEN_DIR" echo "[1/13] Generating C# code from $THRIFT_FILE ..." -"$THRIFT" --gen netstd:net10 -out "$GEN_DIR" "$THRIFT_FILE" +"$THRIFT" --gen netstd:net11 -out "$GEN_DIR" "$THRIFT_FILE" echo "C# code generated in $GEN_DIR." # Step 2: Build all fuzzer projects diff --git a/lib/netstd/runfuzzer.sh b/lib/netstd/runfuzzer.sh index 507cf9fc6e0..cced29743dd 100755 --- a/lib/netstd/runfuzzer.sh +++ b/lib/netstd/runfuzzer.sh @@ -22,7 +22,7 @@ set -e # Ensure the SharpFuzz.CommandLine global tool (runtimeconfig-pinned to -# net9.0 in package 2.2.0) can roll forward onto the net10 runtime used +# net9.0 in package 2.2.0) can roll forward onto the net11 runtime used # by this repo. Remove once SharpFuzz 2.3.0 (upstream PR #72) ships with # an updated runtimeconfig. export DOTNET_ROLL_FORWARD=Major @@ -137,7 +137,7 @@ if [ ! -f "$LIBFUZZER" ]; then echo "See README for installation instructions." exit 1 fi -OUTPUT_DIR="$(dirname "$0")/Tests/Thrift.FuzzTests/bin/Debug/net10.0" +OUTPUT_DIR="$(dirname "$0")/Tests/Thrift.FuzzTests/bin/Debug/net11.0" CORPUS_DIR="$(dirname "$0")/corpus/$FUZZER_NAME" # Create corpus directory if it doesn't exist diff --git a/test/netstd/Client/Client.csproj b/test/netstd/Client/Client.csproj index 393a9fa2e44..7eee9d12e0d 100644 --- a/test/netstd/Client/Client.csproj +++ b/test/netstd/Client/Client.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor Client Client @@ -51,8 +51,8 @@ - - - + + + diff --git a/test/netstd/Server/Server.csproj b/test/netstd/Server/Server.csproj index eaf959fb364..a806497f996 100644 --- a/test/netstd/Server/Server.csproj +++ b/test/netstd/Server/Server.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor Server Server @@ -54,8 +54,8 @@ - - - + + + diff --git a/test/netstd/ThriftTest.slnx b/test/netstd/ThriftTest.slnx index 1c10a84c378..d80af94057a 100644 --- a/test/netstd/ThriftTest.slnx +++ b/test/netstd/ThriftTest.slnx @@ -25,6 +25,7 @@ + diff --git a/tutorial/netstd/Client/Client.csproj b/tutorial/netstd/Client/Client.csproj index d571fa7d144..9685b1ac3f0 100644 --- a/tutorial/netstd/Client/Client.csproj +++ b/tutorial/netstd/Client/Client.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor Client Client diff --git a/tutorial/netstd/Interfaces/Interfaces.csproj b/tutorial/netstd/Interfaces/Interfaces.csproj index 8ca01c56443..83aa2e2d8c8 100644 --- a/tutorial/netstd/Interfaces/Interfaces.csproj +++ b/tutorial/netstd/Interfaces/Interfaces.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 Interfaces Interfaces 0.26.0.0 @@ -43,8 +43,8 @@ - - - + + + diff --git a/tutorial/netstd/Server/Server.csproj b/tutorial/netstd/Server/Server.csproj index 22dac614e71..577ffbbb267 100644 --- a/tutorial/netstd/Server/Server.csproj +++ b/tutorial/netstd/Server/Server.csproj @@ -19,7 +19,7 @@ --> - net10.0 + net11.0 latestMajor Server Server