Skip to content

Commit 2d0b3f7

Browse files
.NET Source-Build 9.0.100-rc.2.24474.1 October 2024 Updates (#43993)
Co-authored-by: Ella Hathaway <[email protected]> Co-authored-by: Ella Hathaway <[email protected]>
1 parent 860e48b commit 2d0b3f7

File tree

5 files changed

+57
-7
lines changed

5 files changed

+57
-7
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="9.0.0-beta.24408.2">
5+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24466.2">
66
<Uri>https://github.com/dotnet/arcade</Uri>
7-
<Sha>60ae233c3d77f11c5fdb53e570b64d503b13ba59</Sha>
7+
<Sha>04b9022eba9c184a8036328af513c22e6949e8b6</Sha>
88
</Dependency>
99
</ToolsetDependencies>
1010
</Dependencies>

src/SourceBuild/content/eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
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>9.0.100-rc.1.24452.1</PrivateSourceBuiltSdkVersion>
27-
<PrivateSourceBuiltArtifactsVersion>9.0.100-rc.1.24452.1</PrivateSourceBuiltArtifactsVersion>
26+
<PrivateSourceBuiltSdkVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltSdkVersion>
27+
<PrivateSourceBuiltArtifactsVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltArtifactsVersion>
2828
<!-- command-line-api dependencies -->
2929
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
3030
<!-- msbuild dependencies -->
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-rc.1.24452.12"
3+
"dotnet": "9.0.100-rc.2.24474.11"
44
},
55
"msbuild-sdks": {
66
"Microsoft.Build.NoTargets": "3.7.0",
77
"Microsoft.Build.Traversal": "3.4.0",
8-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24408.2"
8+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24466.2"
99
}
1010
}

src/SourceBuild/patches/fsharp/0001-Fix17713-Reverting-PR-17649-Make-the-interaction-bet.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Date: Mon, 16 Sep 2024 13:21:58 -0700
44
Subject: [PATCH] Fix17713 - Reverting PR - 17649 - Make the interaction
55
between #line and #nowarn directives consistent (#17724)
66

7-
Backport: https://github.com/dotnet/fsharp/pull/17724
7+
Backport: https://github.com/dotnet/fsharp/pull/17859
88

99
---
1010
buildtools/fsyacc/fsyaccdriver.fs | 2 -
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Ella Hathaway <[email protected]>
3+
Date: Wed, 9 Oct 2024 17:14:25 +0000
4+
Subject: [PATCH] NoWarns for FSharp Failures
5+
6+
Backport: https://github.com/dotnet/fsharp/pull/17859
7+
8+
---
9+
buildtools/fslex/fslex.fsproj | 1 +
10+
buildtools/fsyacc/fsyacc.fsproj | 1 +
11+
src/Compiler/FSharp.Compiler.Service.fsproj | 2 ++
12+
3 files changed, 4 insertions(+)
13+
14+
diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
15+
index 5dfef2f0e3..b450de1668 100644
16+
--- a/buildtools/fslex/fslex.fsproj
17+
+++ b/buildtools/fslex/fslex.fsproj
18+
@@ -5,6 +5,7 @@
19+
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
20+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
21+
<RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
22+
+ <NoWarn>$(NoWarn);64;1182;1204</NoWarn> <!--Temporary fix for sourcebuild -->
23+
</PropertyGroup>
24+
25+
<PropertyGroup>
26+
diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
27+
index 1ff8a11075..5f97b762e0 100644
28+
--- a/buildtools/fsyacc/fsyacc.fsproj
29+
+++ b/buildtools/fsyacc/fsyacc.fsproj
30+
@@ -5,6 +5,7 @@
31+
<TargetFramework>$(FSharpNetCoreProductTargetFramework)</TargetFramework>
32+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
33+
<RollForward Condition="'$(BUILDING_USING_DOTNET)' == 'true'">LatestMajor</RollForward>
34+
+ <NoWarn>$(NoWarn);64;1182;1204</NoWarn> <!--Temporary fix for sourcebuild -->
35+
</PropertyGroup>
36+
37+
<PropertyGroup>
38+
diff --git a/src/Compiler/FSharp.Compiler.Service.fsproj b/src/Compiler/FSharp.Compiler.Service.fsproj
39+
index 45b5bda0d1..8029bb6d45 100644
40+
--- a/src/Compiler/FSharp.Compiler.Service.fsproj
41+
+++ b/src/Compiler/FSharp.Compiler.Service.fsproj
42+
@@ -10,6 +10,8 @@
43+
<NoWarn>$(NoWarn);75</NoWarn> <!-- InternalCommandLineOption -->
44+
<NoWarn>$(NoWarn);1204</NoWarn> <!-- This construct is for use in the FSharp.Core library and should not be used directly -->
45+
<NoWarn>$(NoWarn);NU5125</NoWarn>
46+
+ <NoWarn>$(NoWarn);64;1182;1204</NoWarn> <!--Temporary fix for sourcebuild -->
47+
+ <OtherFlags>$(OtherFlags) --warnaserror-:1182</OtherFlags> <!--Temporary fix for sourcebuild -->
48+
<AssemblyName>FSharp.Compiler.Service</AssemblyName>
49+
<AllowCrossTargeting>true</AllowCrossTargeting>
50+
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>

0 commit comments

Comments
 (0)