[Backport release-24.11] dotnet-sdk_10: update and related fixes

pkgs/development/compilers/dotnet/10/default.nix

@@ -8,5 +8,5 @@ callPackage ../dotnet.nix {
   bootstrapSdkFile = ./bootstrap-sdk.nix;
   allowPrerelease = true;
   depsFile = ./deps.json;
-  fallbackTargetPackages = dotnetCorePackages.sdk_10_0-bin.targetPackages;
+  fallbackTargetPackages = dotnetCorePackages.sdk_10_0.targetPackages;
 }

pkgs/development/compilers/dotnet/10/release-info.json

@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-JJMGyXFJPJYOD9c+V6M8ZkHXjvbBgfeUSqRatuMhhWQ=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.1.25078.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-q8wMaUmbcDbvCKjm1oliz7/HGqf5X4rnympuG18HzgE="
+  "tarballHash": "sha256-pTGkjxQ4T0PhpBkb+R+qKuA7n66JVi+V6VB18W5RfR0=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.2.25113.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-1vm1bsHMe9ynKBhJE7Xkwnjc2JYVT/lK/EaKywycnXE="
 }

pkgs/development/compilers/dotnet/10/release.json

@@ -1,10 +1,10 @@
 {
-  "release": "10.0.0-preview.1",
+  "release": "10.0.0-preview.2",
   "channel": "10.0",
-  "tag": "v10.0.0-preview.1.25080.5",
-  "sdkVersion": "10.0.100-preview.1.25121.1",
-  "runtimeVersion": "10.0.0-preview.1.25080.5",
-  "aspNetCoreVersion": "10.0.0-preview.1.25120.3",
+  "tag": "v10.0.0-preview.2.25163.2",
+  "sdkVersion": "10.0.100-preview.2.25164.1",
+  "runtimeVersion": "10.0.0-preview.2.25163.2",
+  "aspNetCoreVersion": "10.0.0-preview.2.25164.1",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "cd6837f843092ac26057787149a098851e8dc9c9"
+  "sourceVersion": "7c509c46e0f6df3473129f2dcb7ae7710c200c3e"
 }

pkgs/development/compilers/dotnet/9/default.nix

@@ -4,7 +4,6 @@
   releaseManifestFile = ./release.json;
   releaseInfoFile = ./release-info.json;
   bootstrapSdkFile = ./bootstrap-sdk.nix;
-  allowPrerelease = true;
   depsFile = ./deps.json;
   fallbackTargetPackages = dotnetCorePackages.sdk_9_0.targetPackages;
 }

pkgs/development/compilers/dotnet/combine-packages.nix

@@ -20,50 +20,57 @@ assert lib.assertMsg ((builtins.length dotnetPackages) > 0) ''
         `with dotnetCorePackages; combinePackages [
             sdk_6_0 aspnetcore_7_0
          ];`'';
-mkWrapper "sdk" (buildEnv {
-  name = "dotnet-combined";
-  paths = dotnetPackages;
-  pathsToLink = map (x: "/share/dotnet/${x}") [
-    "host"
-    "packs"
-    "sdk"
-    "sdk-manifests"
-    "shared"
-    "templates"
-  ];
-  ignoreCollisions = true;
-  nativeBuildInputs = [ makeWrapper ];
-  postBuild =
-    ''
-      mkdir -p "$out"/share/dotnet
-      cp "${cli}"/share/dotnet/dotnet $out/share/dotnet
-      cp -R "${cli}"/nix-support "$out"/
-      mkdir "$out"/bin
-      ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
-    ''
-    + lib.optionalString (cli ? man) ''
-      ln -s ${cli.man} $man
-    '';
-  passthru = {
-    pname = "dotnet";
-    version = "combined";
-    inherit (cli) icu;
+mkWrapper "sdk" (
+  (buildEnv {
+    name = "dotnet-combined";
+    paths = dotnetPackages;
+    pathsToLink = map (x: "/share/dotnet/${x}") [
+      "host"
+      "packs"
+      "sdk"
+      "sdk-manifests"
+      "shared"
+      "templates"
+    ];
+    ignoreCollisions = true;
+    nativeBuildInputs = [ makeWrapper ];
+    postBuild =
+      ''
+        mkdir -p "$out"/share/dotnet
+        cp "${cli}"/share/dotnet/dotnet $out/share/dotnet
+        cp -R "${cli}"/nix-support "$out"/
+        mkdir "$out"/bin
+        ln -s "$out"/share/dotnet/dotnet "$out"/bin/dotnet
+      ''
+      + lib.optionalString (cli ? man) ''
+        ln -s ${cli.man} $man
+      '';
+    passthru = {
+      pname = "dotnet";
+      version = "combined";
+      inherit (cli) icu;
 
-    versions = lib.catAttrs "version" dotnetPackages;
-    packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages);
-    targetPackages = lib.zipAttrsWith (_: lib.concatLists) (
-      lib.catAttrs "targetPackages" dotnetPackages
-    );
-  };
+      versions = lib.catAttrs "version" dotnetPackages;
+      packages = lib.concatLists (lib.catAttrs "packages" dotnetPackages);
+      targetPackages = lib.zipAttrsWith (_: lib.concatLists) (
+        lib.catAttrs "targetPackages" dotnetPackages
+      );
+    };
 
-  meta = {
-    description = "${cli.meta.description or "dotnet"} (combined)";
-    inherit (cli.meta)
-      homepage
-      license
-      mainProgram
-      maintainers
-      platforms
-      ;
-  };
-})
+    meta = {
+      description = "${cli.meta.description or "dotnet"} (combined)";
+      inherit (cli.meta)
+        homepage
+        license
+        mainProgram
+        maintainers
+        platforms
+        ;
+    };
+  }).overrideAttrs
+    {
+      propagatedSandboxProfile = toString (
+        lib.unique (lib.concatLists (lib.catAttrs "__propagatedSandboxProfile" dotnetPackages))
+      );
+    }
+)

pkgs/development/compilers/dotnet/update.nix

@@ -91,7 +91,7 @@ writeScript "update-dotnet-vmr.sh" ''
 
   (
       curl -fsSL https://api.github.com/repos/dotnet/dotnet/releases | \
-      jq -r "$query" \
+      jq -er "$query" \
   ) | (
       read tagName
       read releaseUrl
@@ -140,7 +140,7 @@ writeScript "update-dotnet-vmr.sh" ''
 
       artifactsHash=$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url "$artifactsUrl")")
 
-      sdkVersion=$(jq -r .tools.dotnet global.json)
+      sdkVersion=$(jq -er .tools.dotnet global.json)
 
       # below needs to be run in nixpkgs because toOutputPath uses relative paths
       cd -

pkgs/development/compilers/dotnet/update.sh

@@ -10,22 +10,22 @@ release () {
     local content="$1"
     local version="$2"
 
-    jq -r '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content"
+    jq -er '.releases[] | select(."release-version" == "'"$version"'")' <<< "$content"
 }
 
 release_files () {
     local release="$1"
     local expr="$2"
 
-    jq -r '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release"
+    jq -er '[('"$expr"').files[] | select(.name | test("^.*.tar.gz$"))]' <<< "$release"
 }
 
 release_platform_attr () {
     local release_files="$1"
     local platform="$2"
     local attr="$3"
 
-    jq -r '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files"
+    jq -er '.[] | select((.rid == "'"$platform"'") and (.name | contains("composite") | not)) | ."'"$attr"'"' <<< "$release_files"
 }
 
 platform_sources () {
@@ -53,7 +53,7 @@ platform_sources () {
 nuget_index="$(curl -fsSL "https://api.nuget.org/v3/index.json")"
 
 get_nuget_resource() {
-    jq -r '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index"
+    jq -er '.resources[] | select(."@type" == "'"$1"'")."@id"' <<<"$nuget_index"
 }
 
 nuget_package_base_url="$(get_nuget_resource "PackageBaseAddress/3.0.0")"
@@ -256,26 +256,26 @@ update() {
     content=$(curl -fsSL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json)
     if [[ -n $sdk ]]; then
         major_minor_patch=$(
-            jq -r --arg version "$sem_version" '
+            jq -er --arg version "$sem_version" '
                 .releases[] |
                 select(.sdks[].version == $version) |
                 ."release-version"' <<< "$content")
     else
-        major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content")
+        major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -er '."latest-release"' <<< "$content")
     fi
     local major_minor_underscore=${major_minor/./_}
 
     local release_content aspnetcore_version runtime_version
     local -a sdk_versions
 
     release_content=$(release "$content" "$major_minor_patch")
-    aspnetcore_version=$(jq -r '."aspnetcore-runtime".version' <<< "$release_content")
-    runtime_version=$(jq -r '.runtime.version' <<< "$release_content")
+    aspnetcore_version=$(jq -er '."aspnetcore-runtime".version' <<< "$release_content")
+    runtime_version=$(jq -er '.runtime.version' <<< "$release_content")
 
     if [[ -n $sdk ]]; then
         sdk_versions=("$sem_version")
     else
-        mapfile -t sdk_versions < <(jq -r '.sdks[] | .version' <<< "$release_content" | sort -rn)
+        mapfile -t sdk_versions < <(jq -er '.sdks[] | .version' <<< "$release_content" | sort -rn)
     fi
 
     # If patch was not specified, check if the package is already the latest version
@@ -291,7 +291,7 @@ update() {
             }); (x: builtins.deepSeq x x) [
                 runtime_${major_minor_underscore}.version
                 sdk_${major_minor_underscore}.version
-            ]" --argstr output "$output" | jq --raw-output0 .[])
+            ]" --argstr output "$output" | jq -e --raw-output0 .[])
         if [[ "${versions[0]}" == "$major_minor_patch" && "${versions[1]}" == "${sdk_versions[0]}" ]]; then
             echo "Nothing to update."
             return
@@ -303,8 +303,8 @@ update() {
     runtime_files="$(release_files "$release_content" .runtime)"
 
     local channel_version support_phase
-    channel_version=$(jq -r '."channel-version"' <<< "$content")
-    support_phase=$(jq -r '."support-phase"' <<< "$content")
+    channel_version=$(jq -er '."channel-version"' <<< "$content")
+    support_phase=$(jq -er '."support-phase"' <<< "$content")
 
     local aspnetcore_sources runtime_sources
     aspnetcore_sources="$(platform_sources "$aspnetcore_files")"