From 3cfb4bf0acc84d2d3859f657b7ff578402e4783a Mon Sep 17 00:00:00 2001 From: Mathieu Baudet <1105398+ma2bd@users.noreply.github.com> Date: Thu, 16 Jan 2025 19:55:26 -0500 Subject: [PATCH 1/4] switch to swift 5.10 to fix CI --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dfb5520df..419177e78 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,7 +99,7 @@ jobs: uses: swift-actions/setup-swift@bb83339d1e8577741bdc6c65ba551ce7dc0fb854 with: # older swift versions are having gpg issues https://github.com/swift-actions/setup-swift/issues/520 - swift-version: "5.7" + swift-version: "5.10.1" - name: Setup Additional Languages (ocaml) uses: ocaml/setup-ocaml@v2 From 87149a600ef4242791fd8b101f3129c9839b1f40 Mon Sep 17 00:00:00 2001 From: Mathieu Baudet <1105398+ma2bd@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:22:34 -0500 Subject: [PATCH 2/4] use ocaml/setup-ocaml@v3 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 419177e78..f443442ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -102,7 +102,7 @@ jobs: swift-version: "5.10.1" - name: Setup Additional Languages (ocaml) - uses: ocaml/setup-ocaml@v2 + uses: ocaml/setup-ocaml@v3 with: ocaml-compiler: 5.0 opam-disable-sandboxing: true From 3f0031ecb201dbd662a7941306ce54810916bfc1 Mon Sep 17 00:00:00 2001 From: Mathieu Baudet <1105398+ma2bd@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:44:04 -0500 Subject: [PATCH 3/4] fix c# --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f443442ab..3274c15cd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,8 @@ env: RUST_BACKTRACE: short RUSTFLAGS: "-D warnings" RUSTUP_MAX_RETRIES: 10 + # https://stackoverflow.com/questions/59119904/process-terminated-couldnt-find-a-valid-icu-package-installed-on-the-system-in + DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: 1 jobs: lint: From d75bf9b262505e1c6a62b00034c21ca55334e769 Mon Sep 17 00:00:00 2001 From: Mathieu Baudet <1105398+ma2bd@users.noreply.github.com> Date: Thu, 16 Jan 2025 21:15:34 -0500 Subject: [PATCH 4/4] switch to actions/setup-dotnet@v4 and dotnet 6.0 --- .github/workflows/main.yml | 6 ++---- serde-generate/README.md | 2 +- .../runtime/csharp/Serde.Tests/Serde.Tests.csproj | 2 +- serde-generate/src/lib.rs | 2 +- serde-generate/tests/csharp_runtime.rs | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3274c15cd..30befe7f5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -73,11 +73,9 @@ jobs: echo '/github/home/.local/bin' >> $GITHUB_PATH - name: Setup Additional Languages (.Net) - uses: actions/setup-dotnet@v3 + uses: actions/setup-dotnet@v4 with: - dotnet-version: | - 2.1.x - 3.1.x + dotnet-version: '6.0.x' - name: Setup Additional Languages (golang) uses: actions/setup-go@v3 diff --git a/serde-generate/README.md b/serde-generate/README.md index a7f94ec16..24362263e 100644 --- a/serde-generate/README.md +++ b/serde-generate/README.md @@ -19,7 +19,7 @@ The following programming languages are fully supported as target languages: * Python 3 (requires numpy >= 1.20.1) * Rust 2018 * Go >= 1.14 -* C# (NetCoreApp >= 2.1) +* C# (NetCoreApp >= 6.0) * Swift 5.3 * OCaml * Dart >= 3 diff --git a/serde-generate/runtime/csharp/Serde.Tests/Serde.Tests.csproj b/serde-generate/runtime/csharp/Serde.Tests/Serde.Tests.csproj index 3554b78df..3f55b4e8c 100644 --- a/serde-generate/runtime/csharp/Serde.Tests/Serde.Tests.csproj +++ b/serde-generate/runtime/csharp/Serde.Tests/Serde.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp2.1;netcoreapp3.1 + net6 false 7.2 diff --git a/serde-generate/src/lib.rs b/serde-generate/src/lib.rs index 81520b74c..7e53f20ce 100644 --- a/serde-generate/src/lib.rs +++ b/serde-generate/src/lib.rs @@ -16,7 +16,7 @@ //! * Python 3 (requires numpy >= 1.20.1) //! * Rust 2018 //! * Go >= 1.14 -//! * C# (NetCoreApp >= 2.1) +//! * C# (NetCoreApp >= 6.0) //! * Swift 5.3 //! * OCaml //! * Dart >= 3 diff --git a/serde-generate/tests/csharp_runtime.rs b/serde-generate/tests/csharp_runtime.rs index 93243b29d..36eaf8266 100644 --- a/serde-generate/tests/csharp_runtime.rs +++ b/serde-generate/tests/csharp_runtime.rs @@ -83,7 +83,7 @@ fn make_test_project( - netcoreapp2.1;netcoreapp3.1 + net6 false 7.2