Unverified Commit 445f1846 authored by David McFarland's avatar David McFarland Committed by GitHub
Browse files

dotnet-sdk_10: 10.0.0-preview.6 -> 10.0.0-preview.7 (#433244)

parents 0b77fe4d 954b774b

pkgs/development/compilers/dotnet/10/bootstrap-sdk.nix

+188 −188

File changed.

Preview size limit exceeded, changes collapsed.

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

+24 −24
Original line number Diff line number Diff line 
[

  {

    "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",

    "sha256": "ac90a9d11e9397e6e3dff022f99459d0666e2d29e899ac06471e860ae5173980",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "sha256": "aa14afd80807b2b9f4956b8600d20f7d3516aecf05f55d1ca7d905a329cfe83b",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",

    "sha256": "c5a904d430cbe6014fea6ace35a339838f598ac2560ab741ecc085a00f37ae49",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "sha256": "53c920333f4762f1f79b108726129c1d8c1416ccd76526fe3a9a7ab7a1f93597",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "hash": "sha256-Nupnw/U9dxLxWNqETTtxyvJhuuGDPyU+ksmZ+qwSkxk=",

    "hash": "sha256-KhdfkhtQFehIcwo3koGdmmqSTXZD3jbZUMxj61cX0LA=",

    "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "hash": "sha256-QHSni2ad7MQEQoCMRPWTtwmMOTZaDWn/CZbUanLAc2Y=",

    "hash": "sha256-/R26o0IJCYf6Fa/uxTNpRh4E9Sm5JrUlC6yr7V/sMiw=",

    "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",

    "sha256": "06130621565ec2be89c86e322af5abc095c4efe0334f8dfc3ea43695c1ed9893",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "sha256": "7a685b61f9aa514104e2d43698696a035b701879262bfd9795ef282a506a572e",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",

    "sha256": "43da2ec6d8351784865e8a18113f2c90211c13966d352765316b5d5c9f4b3cbd",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "sha256": "ff8889ae28490cfe2906cf1fb9ea1a299dbe7300e5645d36e1b144ec79ae7374",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",

    "sha256": "0234d829a2e019b4b3f87b93c068c14cc3d71be6d489a3c8e4c358f9a1609d36",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "sha256": "3a512f5afee951500f328f2c166eb11d877cc0ce8a176358ecc5bbabe8a14f7a",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  },

  {

    "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",

    "sha256": "ce1b95a1611a442ead51a5a6f33939311a94c20dee287d1aa903b0e1425a5e28",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.6.25302.104/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.6.25302.104.nupkg",

    "version": "10.0.0-preview.6.25302.104"

    "sha256": "7c0cf48f6a48ab0b7b4cd339aed9c1626873674e614fea33e15ee7c938514e8d",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-preview.7.25322.101/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-preview.7.25322.101.nupkg",

    "version": "10.0.0-preview.7.25322.101"

  }

]

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

+3 −3
Original line number Diff line number Diff line 
{

  "tarballHash": "sha256-ffQAL6kerSjdOcd4YsC1374zH2gBDsdWJeBTwEsTUbo=",

  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.6.25302.104.centos.9-x64.tar.gz",

  "artifactsHash": "sha256-CEmna8eEx6+8nxThVGnqWkz6DSJOnJWuFrCWzDRoAYo="

  "tarballHash": "sha256-sE7HIeZfg3Q4/izN7ZNg+KHCQAkp7NwJXoe2BA+E4Ww=",

  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.7.25322.101-1.centos.10-x64.tar.gz",

  "artifactsHash": "sha256-jwyPybGkBPrmwDBkesqEauTEFNTgBv/sUW3jaUnWbt4="

}

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

+7 −7
Original line number Diff line number Diff line 
{

  "release": "10.0.0-preview.6",

  "release": "10.0.0-preview.7",

  "channel": "10.0",

  "tag": "v10.0.0-preview.6.25358.103",

  "sdkVersion": "10.0.100-preview.6.25358.103",

  "runtimeVersion": "10.0.0-preview.6.25358.103",

  "aspNetCoreVersion": "10.0.0-preview.6.25358.103",

  "tag": "v10.0.100-preview.7.25380.108",

  "sdkVersion": "10.0.100-preview.7.25380.108",

  "runtimeVersion": "10.0.0-preview.7.25380.108",

  "aspNetCoreVersion": "10.0.0-preview.7.25380.108",

  "sourceRepository": "https://github.com/dotnet/dotnet",

  "sourceVersion": "75972a5ba730bdaf7cf3a34f528ab0f5c7f05183",

  "officialBuildId": "20250708.3"

  "sourceVersion": "30000d883e06c122311a66894579bc12329a09d4",

  "officialBuildId": "20250730.8"

}

pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch

0 → 100644
+47 −0
Original line number Diff line number Diff line 
From 8fa3570bf75c48bf68f42b74790bf8ba0f032a3f Mon Sep 17 00:00:00 2001

From: David McFarland <corngood@gmail.com>

Date: Thu, 14 Aug 2025 10:49:40 -0300

Subject: [PATCH] bundler: fix file size estimation when bundling symlinks



---

 .../managed/Microsoft.NET.HostModel/Bundle/Bundler.cs  | 10 ++++++++--

 1 file changed, 8 insertions(+), 2 deletions(-)



diff --git a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs

index a5e8b593484..39f39334251 100644

--- a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs

+++ b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs

@@ -284,6 +284,12 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)

                 throw new ArgumentException("Invalid input specification: Must specify the host binary");

             }

 

+            static long GetFileLength(string path)

+            {

+                var info = new FileInfo(path);

+                return ((FileInfo?)info.ResolveLinkTarget(true) ?? info).Length;

+            }

+

             (FileSpec Spec, FileType Type)[] relativePathToSpec = GetFilteredFileSpecs(fileSpecs);

             long bundledFilesSize = 0;

             // Conservatively estimate the size of bundled files.

@@ -293,7 +299,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)

             // We will memory map a larger file than needed, but we'll take that trade-off.

             foreach (var (spec, type) in relativePathToSpec)

             {

-                bundledFilesSize += new FileInfo(spec.SourcePath).Length;

+                bundledFilesSize += GetFileLength(spec.SourcePath);

                 if (type == FileType.Assembly)

                 {

                     // Alignment could be as much as AssemblyAlignment - 1 bytes.

@@ -314,7 +320,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)

             {

                 Directory.CreateDirectory(destinationDirectory);

             }

-            var hostLength = new FileInfo(hostSource).Length;

+            var hostLength = GetFileLength(hostSource);

             var bundleManifestLength = Manifest.GetManifestLength(BundleManifest.BundleMajorVersion, relativePathToSpec.Select(x => x.Spec.BundleRelativePath));

             long bundleTotalSize = hostLength + bundledFilesSize + bundleManifestLength;

             if (_target.IsOSX && _macosCodesign)

-- 

2.50.1