dotnetCorePackages.dotnet_10.vmr: 10.0.0-rc.1 -> 10.0.0-rc.2
This commit is contained in:
David McFarland
+24
-24
@@ -1,50 +1,50 @@
|
||||
[
|
||||
{
|
||||
"pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
|
||||
"sha256": "f4222e017b34fd1aab9c18f83a800c6ad506aa9de9c2dbc01ff0d08ee77c64d1",
|
||||
"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-rc.1.25420.111/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"sha256": "8ed127320ebfd4933ebc498add9695994dc37d5b09b951fdeb5d0fbc730b72db",
|
||||
"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/10.0.0-rc.1.25451.107/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
|
||||
"sha256": "3020dae646564df57f13443c749afdbe02fe696ea6f795657d431e5f134dec5d",
|
||||
"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-rc.1.25420.111/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"sha256": "7c54a1cd8fc4c790f17a6775c7d7c23c9ed0b5246c68f1b80bd8b090c5a87612",
|
||||
"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/10.0.0-rc.1.25451.107/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"hash": "sha256-6CKoHQ6npL+zAKjx3hgAKAQnMvHC2jircy5A5i41SNA=",
|
||||
"hash": "sha256-rLL0sHtjWK8mnwS3jGirWovPc0ZEysw0Ue/BoZ1pwzM=",
|
||||
"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-rc.1.25420.111/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"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/10.0.0-rc.1.25451.107/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"hash": "sha256-VNhtqxkzIYd6KHZK86ZagD4P6HCYzgIGERPjhZgDq1U=",
|
||||
"hash": "sha256-rREnUxSbCyNsKicVK1OaeLwLYzE3TtKLk9qVvQj8/5o=",
|
||||
"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-rc.1.25420.111/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"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/10.0.0-rc.1.25451.107/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
|
||||
"sha256": "609cd171ad2358ec195d19b9d466a954e8b7ec20b1af6143741aa03840d535b6",
|
||||
"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-rc.1.25420.111/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"sha256": "17b13efa4cc6f2b85e770e4601e442713d73fb1c852b22496691f8ac56e33c88",
|
||||
"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/10.0.0-rc.1.25451.107/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
|
||||
"sha256": "7fd9df0ebb210b51a3586afcaf1eea269c7d4d9fb9cffd5931cfacf28c298095",
|
||||
"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-rc.1.25420.111/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"sha256": "fd30817d3c9fb89bc6309bc0d3841f9f8678ec560f0a9b39976f7865b2b8fab1",
|
||||
"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/10.0.0-rc.1.25451.107/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
|
||||
"sha256": "6107d07f2e0754efe41ef87de31219e7468e7fd305c2c9f2925cb607e7b3c6d0",
|
||||
"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-rc.1.25420.111/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"sha256": "f03f3eb320016cb6721049aee14141959037219b3b8d995838b5bbf90250d8f3",
|
||||
"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/10.0.0-rc.1.25451.107/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
},
|
||||
{
|
||||
"pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
|
||||
"sha256": "acb299873fdfea3672631696b78fc40f23347783b43b8464eff262a8598f9bb3",
|
||||
"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-rc.1.25420.111/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
|
||||
"version": "10.0.0-rc.1.25420.111"
|
||||
"sha256": "9ae291866d11f3fc2664094de79f7c3506fce33efca1c40414ff1b10c2d28214",
|
||||
"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/10.0.0-rc.1.25451.107/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
|
||||
"version": "10.0.0-rc.1.25451.107"
|
||||
}
|
||||
]
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"tarballHash": "sha256-irvbvBrENVa+7C0Vm7bQMcUoirwxwha4BoOiLhD7F4Y=",
|
||||
"artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-rc.1.25420.111.centos.10-x64.tar.gz",
|
||||
"artifactsHash": "sha256-vXoVORa2ZB7HQ3gUy1L9xZaqBDO/fbTcMt0HlqmcWGA="
|
||||
"tarballHash": "sha256-OMandJDISBC8MEX0uWp7ibZfebKRzd+KiMzU1YOCV+k=",
|
||||
"artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-rc.1.25451.107.centos.10-x64.tar.gz",
|
||||
"artifactsHash": "sha256-Nf6wSkQ2klRxZpH7ioWeIhx44Y+51Bh/YTSx1bqCUS8="
|
||||
}
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"release": "10.0.0-rc.1",
|
||||
"release": "10.0.0-rc.2",
|
||||
"channel": "10.0",
|
||||
"tag": "v10.0.100-rc.1.25451.107",
|
||||
"sdkVersion": "10.0.100-rc.1.25451.107",
|
||||
"runtimeVersion": "10.0.0-rc.1.25451.107",
|
||||
"aspNetCoreVersion": "10.0.0-rc.1.25451.107",
|
||||
"tag": "v10.0.100-rc.2.25502.107",
|
||||
"sdkVersion": "10.0.100-rc.2.25502.107",
|
||||
"runtimeVersion": "10.0.0-rc.2.25502.107",
|
||||
"aspNetCoreVersion": "10.0.0-rc.2.25502.107",
|
||||
"sourceRepository": "https://github.com/dotnet/dotnet",
|
||||
"sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0",
|
||||
"officialBuildId": "20250901.7"
|
||||
"sourceVersion": "89c8f6a112d37d2ea8b77821e56d170a1bccdc5a",
|
||||
"officialBuildId": "20251002.7"
|
||||
}
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
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
|
||||
|
||||
@@ -145,15 +145,6 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optionals (lib.versionOlder version "9") [
|
||||
./fix-aspnetcore-portable-build.patch
|
||||
./vmr-compiler-opt-v8.patch
|
||||
]
|
||||
++ lib.optionals (lib.versionAtLeast version "10") [
|
||||
./bundler-fix-file-size-estimation-when-bundling-symli.patch
|
||||
(fetchpatch {
|
||||
url = "https://github.com/dotnet/runtime/commit/118eacc4f40f1ef48b47c0b7ff40ac0b3ae8c28a.patch";
|
||||
hash = "sha256-5sRGEpULAgjDjU1LKm7Pcx3Qfbr891CB9apOpYdzPyA=";
|
||||
stripLen = 1;
|
||||
extraPrefix = "src/runtime/";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
|
||||
Reference in New Issue
Block a user