Skip to content

Commit efeeb8c

Browse files
corngoodcorngood
committed
dotnetCorePackages.dotnet_10.vmr: 10.0.0-preview.4 -> 10.0.0-preview.5
1 parent 992097b commit efeeb8c

File tree

7 files changed

+304
-266
lines changed

7 files changed

+304
-266
lines changed

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

Lines changed: 188 additions & 188 deletions
Large diffs are not rendered by default.

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

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"tarballHash": "sha256-L5uuZAzVnltb0DUX2hZUaQ/z56vF4bnDbX95uV8XN+o=",
3-
"artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.4.25228.1.centos.9-x64.tar.gz",
4-
"artifactsHash": "sha256-fLqwaZScsClR+QR+Zewfh6XEL3FJhNPFGhSZjk06CAg="
2+
"tarballHash": "sha256-CPQoYRY4inICvVxad/P0bC0HS96wWFW4tSCvL3agWiw=",
3+
"artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-preview.5.25265.107.centos.9-x64.tar.gz",
4+
"artifactsHash": "sha256-TTovg4C0TZs3f6vjj7FHLvvspHPEVrDuIXAHdwAJQRI="
55
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
{
2-
"release": "10.0.0-preview.4",
2+
"release": "10.0.0-preview.5",
33
"channel": "10.0",
4-
"tag": "v10.0.0-preview.4.25258.110",
5-
"sdkVersion": "10.0.100-preview.4.25258.110",
6-
"runtimeVersion": "10.0.0-preview.4.25258.110",
7-
"aspNetCoreVersion": "10.0.0-preview.4.25258.110",
4+
"tag": "v10.0.0-preview.5.25277.114",
5+
"sdkVersion": "10.0.100-preview.5.25277.114",
6+
"runtimeVersion": "10.0.0-preview.5.25277.114",
7+
"aspNetCoreVersion": "10.0.0-preview.5.25277.114",
88
"sourceRepository": "https://github.com/dotnet/dotnet",
9-
"sourceVersion": "c22dcd0c7a78d095a94d20e59ec0271b9924c82c",
10-
"officialBuildId": "20250508.10"
9+
"sourceVersion": "ddf39a1b4690fbe23aea79c78da67004a5c31094",
10+
"officialBuildId": "20250527.14"
1111
}

‎pkgs/development/compilers/dotnet/record-downloaded-packages.proj‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,12 @@
22
<Target Name="NuGetToNix"
33
BeforeTargets="CopyInnerBuildRestoredPackages">
44
<ItemGroup>
5-
<_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/sb/package-cache/"/>
5+
<!-- dotnet 8 -->
66
<_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/source-build/self/package-cache/"/>
7+
<!-- dotnet 9 -->
8+
<_NuGetToNixPackageCache Include="$(ProjectDirectory)artifacts/sb/package-cache/"/>
9+
<!-- dotnet 10 -->
10+
<_NuGetToNixPackageCache Include="$(RepoArtifactsPackageCache)"/>
711
</ItemGroup>
812
<Exec
913
Command="nuget-to-json '@(_NuGetToNixPackageCache)' >'$(ProjectDirectory)deps.json'"

‎pkgs/development/compilers/dotnet/source-build-externals-overwrite-rather-than-append-.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From 393d224e7b05c73baf9f5d5130d7c9d15c5fc526 Mon Sep 17 00:00:00 2001
2+
From: David McFarland <corngood@gmail.com>
3+
Date: Fri, 13 Jun 2025 15:32:52 -0300
4+
Subject: [PATCH] source-build-externals: overwrite rather than append
5+
NuGet.config
6+
7+
---
8+
.../src/repos/projects/Directory.Build.targets | 2 +-
9+
1 file changed, 1 insertion(+), 1 deletion(-)
10+
11+
diff --git a/src/source-build-externals/src/repos/projects/Directory.Build.targets b/src/source-build-externals/src/repos/projects/Directory.Build.targets
12+
index 5b374f4fc42..9ed8cff895c 100644
13+
--- a/src/source-build-externals/src/repos/projects/Directory.Build.targets
14+
+++ b/src/source-build-externals/src/repos/projects/Directory.Build.targets
15+
@@ -101,7 +101,7 @@
16+
]]>
17+
</NewNuGetConfigContent>
18+
</PropertyGroup>
19+
- <WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" />
20+
+ <WriteLinesToFile Lines="$(NewNuGetConfigContent)" File="$(NewNuGetConfigFile)" Overwrite="True" />
21+
22+
<AddSourceToNuGetConfig NuGetConfigFile="$(NewNuGetConfigFile)"
23+
SourceName="%(_DependencyProjectsPackagesOutput.RepositoryName)"
24+
--
25+
2.49.0
26+

‎pkgs/development/compilers/dotnet/vmr.nix‎

Lines changed: 51 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,11 @@ stdenv.mkDerivation rec {
139139
]
140140
++ lib.optionals (lib.versionOlder version "9") [
141141
./fix-aspnetcore-portable-build.patch
142+
]
143+
++ lib.optionals (lib.versionAtLeast version "10") [
144+
# src/repos/projects/Directory.Build.targets(106,5): error MSB4018: The "AddSourceToNuGetConfig" task failed unexpectedly.
145+
# src/repos/projects/Directory.Build.targets(106,5): error MSB4018: System.Xml.XmlException->Microsoft.Build.Framework.BuildException.GenericBuildTransferredException: There are multiple root elements. Line 9, position 2.
146+
./source-build-externals-overwrite-rather-than-append-.patch
142147
];
143148

144149
postPatch =
@@ -178,7 +183,7 @@ stdenv.mkDerivation rec {
178183
xmlstarlet ed \
179184
--inplace \
180185
-u //_:Project/_:PropertyGroup/_:BuildNumber -v 0 \
181-
src/source-build-externals/src/application-insights/.props/_GlobalStaticVersion.props
186+
src/source-build-externals/src/${lib.optionalString (lib.versionAtLeast version "10") "repos/src/"}application-insights/.props/_GlobalStaticVersion.props
182187
183188
# this fixes compile errors with clang 15 (e.g. darwin)
184189
substituteInPlace \
@@ -193,53 +198,56 @@ stdenv.mkDerivation rec {
193198
-s \$prev -t elem -n KeepNativeSymbols -v false \
194199
src/runtime/Directory.Build.props
195200
''
196-
+ lib.optionalString (lib.versionAtLeast version "9") ''
197-
# repro.csproj fails to restore due to missing freebsd packages
198-
xmlstarlet ed \
199-
--inplace \
200-
-s //Project -t elem -n PropertyGroup \
201-
-s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \
202-
src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
203-
204-
# https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627
205-
xmlstarlet ed \
206-
--inplace \
207-
-s //Project -t elem -n PropertyGroup \
208-
-s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \
209-
src/runtime/Directory.Build.props
201+
+ lib.optionalString (lib.versionAtLeast version "9") (
202+
''
203+
# repro.csproj fails to restore due to missing freebsd packages
204+
xmlstarlet ed \
205+
--inplace \
206+
-s //Project -t elem -n PropertyGroup \
207+
-s \$prev -t elem -n RuntimeIdentifiers -v ${targetRid} \
208+
src/runtime/src/coreclr/tools/aot/ILCompiler/repro/repro.csproj
210209
211-
# patch packages installed from npm cache
212-
xmlstarlet ed \
213-
--inplace \
214-
-s //Project -t elem -n Import \
215-
-i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \
216-
src/aspnetcore/eng/DotNetBuild.props
210+
# https://github.com/dotnet/runtime/pull/98559#issuecomment-1965338627
211+
xmlstarlet ed \
212+
--inplace \
213+
-s //Project -t elem -n PropertyGroup \
214+
-s \$prev -t elem -n NoWarn -v '$(NoWarn);CS9216' \
215+
src/runtime/Directory.Build.props
217216
218-
# https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805
219-
substituteInPlace \
220-
src/aspnetcore/eng/Dependencies.props \
221-
--replace-fail \
222-
"'\$(DotNetBuildSourceOnly)' == 'true'" \
223-
"'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'"
217+
# https://github.com/dotnet/source-build/issues/3131#issuecomment-2030215805
218+
substituteInPlace \
219+
src/aspnetcore/eng/Dependencies.props \
220+
--replace-fail \
221+
"'\$(DotNetBuildSourceOnly)' == 'true'" \
222+
"'\$(DotNetBuildSourceOnly)' == 'true' and \$(PortableBuild) == 'false'"
224223
225-
# https://github.com/dotnet/source-build/issues/4325
226-
xmlstarlet ed \
227-
--inplace \
228-
-r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
229-
eng/init-source-only.proj
224+
# https://github.com/dotnet/source-build/issues/4325
225+
xmlstarlet ed \
226+
--inplace \
227+
-r '//Target[@Name="UnpackTarballs"]/Move' -v Copy \
228+
eng/init-source-only.proj
230229
231-
# error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
232-
substituteInPlace \
233-
src/runtime/src/coreclr/ilasm/CMakeLists.txt \
234-
--replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
230+
# error: _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror,-W#warnings]
231+
substituteInPlace \
232+
src/runtime/src/coreclr/ilasm/CMakeLists.txt \
233+
--replace-fail 'set_source_files_properties( prebuilt/asmparse.cpp PROPERTIES COMPILE_FLAGS "-O0" )' ""
235234
236-
# https://github.com/dotnet/source-build/issues/4444
237-
xmlstarlet ed \
238-
--inplace \
239-
-s '//Project/Target/MSBuild[@Targets="Restore"]' \
240-
-t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
241-
src/aspnetcore/eng/Tools.props
242-
''
235+
# https://github.com/dotnet/source-build/issues/4444
236+
xmlstarlet ed \
237+
--inplace \
238+
-s '//Project/Target/MSBuild[@Targets="Restore"]' \
239+
-t attr -n Properties -v "NUGET_PACKAGES='\$(CurrentRepoSourceBuildPackageCache)'" \
240+
src/aspnetcore/eng/Tools.props
241+
''
242+
+ lib.optionalString (lib.versionOlder version "10") ''
243+
# patch packages installed from npm cache
244+
xmlstarlet ed \
245+
--inplace \
246+
-s //Project -t elem -n Import \
247+
-i \$prev -t attr -n Project -v "${./patch-npm-packages.proj}" \
248+
src/aspnetcore/eng/DotNetBuild.props
249+
''
250+
)
243251
+ lib.optionalString isLinux (
244252
''
245253
substituteInPlace \

0 commit comments

Comments
 (0)