Merge staging-next into staging

pkgs/development/compilers/dotnet/vmr.nix

@@ -230,6 +230,8 @@ stdenv.mkDerivation rec {
       substituteInPlace \
         src/runtime/src/coreclr/ilasm/CMakeLists.txt \
         --replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
+    ''
+    + lib.optionalString (lib.versionOlder version "10") ''
 
       # https://github.com/dotnet/source-build/issues/4444
       xmlstarlet ed \
@@ -237,8 +239,6 @@ stdenv.mkDerivation rec {
         -s '//Project/Target/MSBuild[@Targets="Restore"]' \
         -t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
         src/aspnetcore/eng/Tools.props
-    ''
-    + lib.optionalString (lib.versionOlder version "10") ''
       # patch packages installed from npm cache
       xmlstarlet ed \
         --inplace \

pkgs/development/compilers/dotnet/wrapper.nix

@@ -18,6 +18,8 @@
   replaceVars,
   nugetPackageHook,
   xmlstarlet,
+  pkgs,
+  recurseIntoAttrs,
 }:
 type: unwrapped:
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -280,6 +282,17 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         };
       }
       // lib.optionalAttrs (type == "sdk") ({
+        buildDotnetModule = recurseIntoAttrs (
+          (pkgs.appendOverlays [
+            (self: super: {
+              dotnet-sdk = finalAttrs.finalPackage;
+              dotnet-runtime = finalAttrs.finalPackage.runtime;
+            })
+          ]).callPackage
+            ../../../test/dotnet/default.nix
+            { }
+        );
+
         console = lib.recurseIntoAttrs {
           # yes, older SDKs omit the comma
           cs = mkConsoleTests "C#" "cs" "Hello,?\\ World!";