diff --git a/pkgs/development/compilers/dotnet/11/deps.json b/pkgs/development/compilers/dotnet/11/deps.json index 4f622a757332..6ba3dcb4dfc5 100644 --- a/pkgs/development/compilers/dotnet/11/deps.json +++ b/pkgs/development/compilers/dotnet/11/deps.json @@ -1,50 +1,50 @@ [ { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm", - "sha256": "76ac9477afc9e9a465520a3a698bf540d4a3d3083375daeb07b7bc00d7b15f4b", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/11.0.0-alpha.1.26064.118/runtime.linux-arm64.microsoft.netcore.ilasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "sha256": "4769bb254bbf09d5187f7715f543853704706d08f3c1e631485de971cb3eaab9", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/11.0.0-preview.1.26104.118/runtime.linux-arm64.microsoft.netcore.ilasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "03787a6f7a6b6b561a133d5e860ea86b8b5208dfe8860b8d8201f72a721d1e21", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/11.0.0-alpha.1.26064.118/runtime.linux-arm64.microsoft.netcore.ildasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "sha256": "f083e2ed7ed2b68e5c67acf35cf22cb39b1abebbaed1eeae63e4e252a7862ace", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/11.0.0-preview.1.26104.118/runtime.linux-arm64.microsoft.netcore.ildasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { - "hash": "sha256-WiGzRWqdzmzAKF1z9nGimnIzhgR+w/mAfgu0hyc7Z94=", + "hash": "sha256-R30CdutUwlxhMtRup5pIohQ9bxSNmYinjdVQrdnKt34=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/11.0.0-alpha.1.26064.118/runtime.linux-x64.microsoft.netcore.ilasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/11.0.0-preview.1.26104.118/runtime.linux-x64.microsoft.netcore.ilasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { - "hash": "sha256-1uNInV5TiH+mWgG1HJ1BQ+qjvBYJbxFoytGHexmyuZ4=", + "hash": "sha256-uqACs2PRwZ2TGmZWMxI4L9T5HAS3Fvg83XA1XqeWyoM=", "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/11.0.0-alpha.1.26064.118/runtime.linux-x64.microsoft.netcore.ildasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/11.0.0-preview.1.26104.118/runtime.linux-x64.microsoft.netcore.ildasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm", - "sha256": "8640de8d404dd63b4bfc307237ff79ed54e8a7461eecf575843e00566e72d2e8", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/11.0.0-alpha.1.26064.118/runtime.osx-arm64.microsoft.netcore.ilasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "sha256": "860ae678b0fd6a1cafcde63537ba8ab8be90ae7a78309f1900ef51faeda9bdca", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/11.0.0-preview.1.26104.118/runtime.osx-arm64.microsoft.netcore.ilasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm", - "sha256": "dbcd4f940a3cab45e299089ed182d3ccd8cf2a5835bdf84fafdf701b0dacb649", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/11.0.0-alpha.1.26064.118/runtime.osx-arm64.microsoft.netcore.ildasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "sha256": "bac49fb5e2ed95d2831a3eb97d5a184495488bc7f4d4582716c64fea3a3d95dd", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/11.0.0-preview.1.26104.118/runtime.osx-arm64.microsoft.netcore.ildasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm", - "sha256": "f29d2fc3773cf012383f916e940d0fc48e5c471710958c186d2fbc213483af08", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/11.0.0-alpha.1.26064.118/runtime.osx-x64.microsoft.netcore.ilasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "sha256": "a728ed931daf34be6ee34725c6018392a770f3700d44c7a78418f788daf340ec", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/11.0.0-preview.1.26104.118/runtime.osx-x64.microsoft.netcore.ilasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" }, { "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm", - "sha256": "211b93b546ea0f5ab51703dfc222671b79d0c39d150178172e5f139e2532a34f", - "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/2303eb2b-8177-4b47-977a-e7278e3abf72/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/11.0.0-alpha.1.26064.118/runtime.osx-x64.microsoft.netcore.ildasm.11.0.0-alpha.1.26064.118.nupkg", - "version": "11.0.0-alpha.1.26064.118" + "sha256": "c7cc3e16f47a292d9e9352602641ad7a609a844f23ba2cab76773f50b21d4eaf", + "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/11.0.0-preview.1.26104.118/runtime.osx-x64.microsoft.netcore.ildasm.11.0.0-preview.1.26104.118.nupkg", + "version": "11.0.0-preview.1.26104.118" } ] diff --git a/pkgs/development/compilers/dotnet/11/release-info.json b/pkgs/development/compilers/dotnet/11/release-info.json index 528ea7fea1ac..770e033a0619 100644 --- a/pkgs/development/compilers/dotnet/11/release-info.json +++ b/pkgs/development/compilers/dotnet/11/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-ok/2h/mtOsu/WFkAVIQVPv3NObkhRw/nbtgejIlcQzg=", - "artifactsUrl": "https://ci.dot.net/public/source-build/Private.SourceBuilt.Artifacts.11.0.100-alpha.1.26064.118.centos.10-x64.tar.gz", - "artifactsHash": "sha256-RELKBYeNs2Doi0jKsJsXLh4xzWbikTcXtIJUqPbLoQA=" + "tarballHash": "sha256-0Q4LXKvppQGdaSjXX1A5umMJQ56yHKG+Q+i7swSF9PI=", + "artifactsUrl": "https://builds.dotnet.microsoft.com/dotnet/source-build/Private.SourceBuilt.Artifacts.11.0.100-preview.1.26104.118.centos.10-x64.tar.gz", + "artifactsHash": "sha256-iV4zQe9vGuKHmN9CuHRzkugQGD1YdrjKF3BWn8rFl/o=" } diff --git a/pkgs/development/compilers/dotnet/11/release.json b/pkgs/development/compilers/dotnet/11/release.json index d8ba0904093a..fa01aede1f34 100644 --- a/pkgs/development/compilers/dotnet/11/release.json +++ b/pkgs/development/compilers/dotnet/11/release.json @@ -1,11 +1,11 @@ { - "release": "11.0.0-preview.1", + "release": "11.0.0-preview.2", "channel": "11.0", - "tag": "v11.0.100-preview.1.26104.118", - "sdkVersion": "11.0.100-preview.1.26104.118", - "runtimeVersion": "11.0.0-preview.1.26104.118", - "aspNetCoreVersion": "11.0.0-preview.1.26104.118", + "tag": "v11.0.100-preview.2.26159.112", + "sdkVersion": "11.0.100-preview.2.26159.112", + "runtimeVersion": "11.0.0-preview.2.26159.112", + "aspNetCoreVersion": "11.0.0-preview.2.26159.112", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "87bc0b04e21d786669142109a5128c95618b75ed", - "officialBuildId": "20260204.18" + "sourceVersion": "17d11de66cf75b962995c81dd1235fae9aa5ece0", + "officialBuildId": "20260309.12" } diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index f32ebe10ada1..44e6aff2f3c8 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -24,6 +24,7 @@ xmlstarlet, nodejs, cpio, + ninja, callPackage, unzip, yq, @@ -97,6 +98,9 @@ stdenv.mkDerivation { ++ lib.optionals (lib.versionAtLeast version "10") [ cpio ] + ++ lib.optionals (lib.versionAtLeast version "11") [ + ninja + ] ++ lib.optionals isDarwin [ getconf ]; @@ -427,7 +431,12 @@ stdenv.mkDerivation { "--" "-p:PortableBuild=true" ] - ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}"; + ++ lib.optional (targetRid != buildRid) "-p:TargetRid=${targetRid}" + # https://github.com/dotnet/source-build/issues/5521 + ++ lib.optionals (version == "11.0.0-preview.2") [ + "--branding" + "repodefault " + ]; buildPhase = '' runHook preBuild