Skip to content

Commit c9c5e11

Browse files
dotnet-sb-botdotnet-sb-bot
authored
Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24612.1 (#45435)
1 parent 111a397 commit c9c5e11

7 files changed

+92
-8
lines changed

‎src/SourceBuild/content/eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<ProductDependencies>
33
</ProductDependencies>
44
<ToolsetDependencies>
5-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
7+
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

‎src/SourceBuild/content/eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
2424
are not necessary, and this property is removed from the file.
2525
-->
26-
<PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltArtifactsVersion>
28-
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-6</PrivateSourceBuiltPrebuiltsVersion>
26+
<PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24612.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24612.1</PrivateSourceBuiltArtifactsVersion>
28+
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-7</PrivateSourceBuiltPrebuiltsVersion>
2929
<!-- command-line-api dependencies -->
3030
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3131
<!-- msbuild dependencies -->

‎src/SourceBuild/content/global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "10.0.100-alpha.1.24555.54"
3+
"dotnet": "10.0.100-alpha.1.24611.6"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1"
8+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4"
99
}
1010
}

‎src/SourceBuild/content/repo-projects/Directory.Build.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@
300300

301301
<!-- Get the previously-built-source-built package information from the manifest from that build. -->
302302
<ItemGroup>
303-
<_PrebuiltSourceBuiltAssetManifests Include="$(PrebuiltSourceBuiltPackagesPath)VerticalManifest.xml" />
303+
<_PrebuiltSourceBuiltAssetManifests Include="$(PrebuiltSourceBuiltPackagesPath)*.xml" />
304304
</ItemGroup>
305305

306306
<GetKnownArtifactsFromAssetManifests AssetManifests="@(_PrebuiltSourceBuiltAssetManifests)" Condition="Exists(@(_PrebuiltSourceBuiltAssetManifests))">

‎src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.0.patch

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
From da982568108371f51afb30cc8c32eab01653bd62 Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <mthalman@microsoft.com>
3+
Date: Fri, 20 Dec 2024 12:40:34 -0600
4+
Subject: [PATCH] Upgrade System.Memory to 4.6.0
5+
6+
Backport: https://github.com/dotnet/arcade/pull/15353
7+
---
8+
eng/Versions.props | 3 ++-
9+
1 file changed, 2 insertions(+), 1 deletion(-)
10+
11+
diff --git a/eng/Versions.props b/eng/Versions.props
12+
index a00db9a77..ad3e2a9f9 100644
13+
--- a/eng/Versions.props
14+
+++ b/eng/Versions.props
15+
@@ -18,7 +18,8 @@
16+
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
17+
<!-- corefx -->
18+
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion>
19+
- <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
20+
+ <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">4.6.0</SystemMemoryVersion>
21+
+ <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">4.5.5</SystemMemoryVersion>
22+
<SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation>
23+
<!-- deployment-tools -->
24+
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion>

‎src/SourceBuild/patches/fsharp/0001-Upgrade-some-runtime-packages.patch

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
From 192a16dca94744c82ca456d6cfb7a2a30be1d84f Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <mthalman@microsoft.com>
3+
Date: Thu, 19 Dec 2024 11:00:01 -0600
4+
Subject: [PATCH] Upgrade some runtime packages
5+
6+
Backport: https://github.com/dotnet/fsharp/pull/18166
7+
---
8+
eng/Versions.props | 6 +++---
9+
1 file changed, 3 insertions(+), 3 deletions(-)
10+
11+
diff --git a/eng/Versions.props b/eng/Versions.props
12+
index cd72f8599..1f711df8f 100644
13+
--- a/eng/Versions.props
14+
+++ b/eng/Versions.props
15+
@@ -76,15 +76,15 @@
16+
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been
17+
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. -->
18+
<SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion>
19+
- <SystemBuffersVersion>4.5.1</SystemBuffersVersion>
20+
+ <SystemBuffersVersion>4.6.0</SystemBuffersVersion>
21+
<SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion>
22+
<SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion>
23+
<SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion>
24+
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackageVersionVersion)</SystemDiagnosticsDiagnosticSourceVersion>
25+
- <SystemMemoryVersion>4.5.5</SystemMemoryVersion>
26+
+ <SystemMemoryVersion>4.6.0</SystemMemoryVersion>
27+
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion>
28+
<SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion>
29+
- <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
30+
+ <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion>
31+
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow>
32+
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion>
33+
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion>

‎src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-for-source-build.patch

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 3e23c76f9f26e0b559096d9349d0abadb092d704 Mon Sep 17 00:00:00 2001
2+
From: Matt Thalman <mthalman@microsoft.com>
3+
Date: Fri, 20 Dec 2024 08:28:35 -0600
4+
Subject: [PATCH] Only target NetCurrent for source build
5+
6+
Backport: https://github.com/dotnet/roslyn/pull/76505
7+
---
8+
eng/targets/TargetFrameworks.props | 6 +++---
9+
1 file changed, 3 insertions(+), 3 deletions(-)
10+
11+
diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props
12+
index 2dddaff1560..04eecc62df9 100644
13+
--- a/eng/targets/TargetFrameworks.props
14+
+++ b/eng/targets/TargetFrameworks.props
15+
@@ -53,9 +53,9 @@
16+
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'">
17+
<PropertyGroup>
18+
<NetRoslyn>$(NetCurrent)</NetRoslyn>
19+
- <NetRoslynSourceBuild>$(NetCurrent);$(NetPrevious)</NetRoslynSourceBuild>
20+
- <NetRoslynAll>$(NetCurrent);$(NetPrevious)</NetRoslynAll>
21+
- <NetRoslynBuildHostNetCoreVersion>$(NetPrevious)</NetRoslynBuildHostNetCoreVersion>
22+
+ <NetRoslynSourceBuild>$(NetCurrent)</NetRoslynSourceBuild>
23+
+ <NetRoslynAll>$(NetCurrent)</NetRoslynAll>
24+
+ <NetRoslynBuildHostNetCoreVersion>$(NetCurrent)</NetRoslynBuildHostNetCoreVersion>
25+
<NetRoslynNext>$(NetCurrent)</NetRoslynNext>
26+
</PropertyGroup>
27+
</When>

0 commit comments

Comments
 (0)