Skip to content

[release/10.0.1xx-preview3] Update dependencies from dotnet/fsharp #47879

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 28, 2025
Merged

[release/10.0.1xx-preview3] Update dependencies from dotnet/fsharp #47879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
73744dd
Update dependencies from https://github.com/dotnet/fsharp build 20250…
dotnet-maestro[bot] Mar 25, 2025
35cdbf6
Update dependencies from https://github.com/dotnet/fsharp build 20250…
dotnet-maestro[bot] Mar 26, 2025
ed664c5
Update dependencies from https://github.com/dotnet/fsharp build 20250…
dotnet-maestro[bot] Mar 26, 2025
9b50a36
Update Microsoft.NET.Build.Tests that depend on System.ValueTuple to …
carlossanlop Mar 27, 2025
99d2bca
Continue updating other failing test targets to netstandard2.0
v-wuzhai Mar 27, 2025
ecfe656
Merge branch 'release/10.0.1xx-preview3' into darc-release/10.0.1xx-p…
mthalman Mar 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@
<Sha>5880e1c759c6ae76e32729ae4b884d9afe1fbf64</Sha>
<SourceBuild RepoName="msbuild" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25160.5">
<Dependency Name="Microsoft.FSharp.Compiler" Version="13.9.300-beta.25176.3">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>345742da75dc6c5fe485ef1236d3f034ebcdcb53</Sha>
<Sha>46011b970a6b3337596d66f168992051dd134565</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.300-beta.25160.5">
<Dependency Name="Microsoft.SourceBuild.Intermediate.fsharp" Version="9.0.300-beta.25176.3">
<Uri>https://github.com/dotnet/fsharp</Uri>
<Sha>345742da75dc6c5fe485ef1236d3f034ebcdcb53</Sha>
<Sha>46011b970a6b3337596d66f168992051dd134565</Sha>
<SourceBuild RepoName="fsharp" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Net.Compilers.Toolset" Version="4.14.0-3.25174.14">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/Microsoft/visualfsharp -->
<MicrosoftFSharpCompilerPackageVersion>13.9.300-beta.25160.5</MicrosoftFSharpCompilerPackageVersion>
<MicrosoftFSharpCompilerPackageVersion>13.9.300-beta.25176.3</MicrosoftFSharpCompilerPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn -->
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildADesktopExeWithFSharp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public GivenThatWeWantToBuildADesktopExeWithFSharp(ITestOutputHelper log) : base
[WindowsOnlyFact]
public void It_builds_a_simple_desktop_app()
{
var targetFramework = "net45";
var targetFramework = "net462";
var testAsset = _testAssetsManager
.CopyTestAsset("HelloWorldFS")
.WithSource()
Expand Down
21 changes: 9 additions & 12 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibrary.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public GivenThatWeWantToBuildALibrary(ITestOutputHelper log) : base(log)
}

[Theory]
[InlineData("netstandard1.5")]
[InlineData("netstandard2.0")]
[InlineData("netcoreapp2.1")]
[InlineData(ToolsetInfo.CurrentTargetFramework)]
public void It_builds_the_library_successfully(string targetFramework)
Expand Down Expand Up @@ -74,7 +74,7 @@ internal static List<string> GetValuesFromTestLibrary(
{
msbuildArgs = msbuildArgs ?? Array.Empty<string>();

string targetFramework = "netstandard1.5";
string targetFramework = "netstandard2.0";

var testAsset = testAssetsManager
.CopyTestAsset("AppWithLibrary", callingMethod, identifier: identifier)
Expand Down Expand Up @@ -155,7 +155,7 @@ public void It_creates_a_documentation_file(string language)
.Should()
.Pass();

var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");

outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
Expand Down Expand Up @@ -189,7 +189,7 @@ public void It_allows_us_to_override_the_documentation_file_name(string language
.Should()
.Pass();

var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");

outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
Expand Down Expand Up @@ -233,7 +233,7 @@ public void It_does_not_create_a_documentation_file_if_GenerateDocumentationFile
.Should()
.Pass();

var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");

outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
Expand Down Expand Up @@ -285,7 +285,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");

var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
"netstandard1.5", "DefineConstants")
"netstandard2.0", "DefineConstants")
{
ShouldCompile = true,
Configuration = configuration
Expand All @@ -298,15 +298,12 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st

var definedConstants = getValuesCommand.GetValues();

definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_5", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER" });
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" });
}

[Theory]
[InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD", "NETSTANDARD1_0", "NETSTANDARD1_0_OR_GREATER" })]
[InlineData("netstandard1.3", new[] { "NETSTANDARD", "NETSTANDARD1_3", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER" })]
[InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
[InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
[InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]
Expand Down
13 changes: 5 additions & 8 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithFSharp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void It_builds_the_library_successfully()
.Should()
.Pass();

var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.6");
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");

outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
Expand Down Expand Up @@ -67,7 +67,7 @@ internal static List<string> GetValuesFromTestLibrary(
{
msbuildArgs = msbuildArgs ?? Array.Empty<string>();

string targetFramework = "netstandard1.6";
string targetFramework = "netstandard2.0";

var testAsset = testAssetsManager
.CopyTestAsset("AppWithLibraryFS", callingMethod)
Expand Down Expand Up @@ -148,7 +148,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");

var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
"netstandard1.6", "DefineConstants")
"netstandard2.0", "DefineConstants")
{
ShouldCompile = true,
Configuration = configuration
Expand All @@ -161,14 +161,11 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st

var definedConstants = getValuesCommand.GetValues();

definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER",
"NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" });
definedConstants.Should().BeEquivalentTo(new[] { expectedDefine, "TRACE", "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" });
}

[Theory]
[InlineData("netstandard1.6", new[] { "NETSTANDARD", "NETSTANDARD1_6", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER",
"NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER" })]
[InlineData("net45", new[] { "NETFRAMEWORK", "NET45", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER" })]
[InlineData("netstandard2.0", new[] { "NETSTANDARD", "NETSTANDARD2_0", "NETSTANDARD1_0_OR_GREATER", "NETSTANDARD1_1_OR_GREATER", "NETSTANDARD1_2_OR_GREATER", "NETSTANDARD1_3_OR_GREATER", "NETSTANDARD1_4_OR_GREATER", "NETSTANDARD1_5_OR_GREATER", "NETSTANDARD1_6_OR_GREATER", "NETSTANDARD2_0_OR_GREATER" })]
[InlineData("net461", new[] { "NETFRAMEWORK", "NET461", "NET20_OR_GREATER", "NET30_OR_GREATER", "NET35_OR_GREATER", "NET40_OR_GREATER", "NET45_OR_GREATER",
"NET451_OR_GREATER", "NET452_OR_GREATER", "NET46_OR_GREATER", "NET461_OR_GREATER" })]
[InlineData("netcoreapp2.0", new[] { "NETCOREAPP", "NETCOREAPP2_0", "NETCOREAPP1_0_OR_GREATER", "NETCOREAPP1_1_OR_GREATER", "NETCOREAPP2_0_OR_GREATER" })]
Expand Down
18 changes: 8 additions & 10 deletions test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildALibraryWithVB.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void It_builds_the_library_successfully()
.Should()
.Pass();

var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");

outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
Expand Down Expand Up @@ -78,7 +78,7 @@ internal static List<string> GetValuesFromTestLibrary(
{
msbuildArgs = msbuildArgs ?? Array.Empty<string>();

string targetFramework = "netstandard1.6";
string targetFramework = "netstandard2.0";

var testAsset = testAssetsManager
.CopyTestAsset("AppWithLibraryVB", callingMethod)
Expand Down Expand Up @@ -159,7 +159,7 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st
var libraryProjectDirectory = Path.Combine(testAsset.TestRoot, "TestLibrary");

var getValuesCommand = new GetValuesCommand(Log, libraryProjectDirectory,
"netstandard1.5", "FinalDefineConstants")
"netstandard2.0", "FinalDefineConstants")
{
ShouldCompile = true,
Configuration = configuration
Expand All @@ -172,16 +172,14 @@ public void It_implicitly_defines_compilation_constants_for_the_configuration(st

var definedConstants = ExpandSequence(getValuesCommand.GetValues()).ToList();

definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD1_5=-1", "NETSTANDARD1_0_OR_GREATER=-1",
"NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1" }));
definedConstants.Should().BeEquivalentTo(expectedDefines.Concat(new[] { "PLATFORM=\"AnyCPU\"", "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1",
"NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1" }));
}

[Theory]
[InlineData(".NETStandard,Version=v1.0", new[] { "NETSTANDARD=-1", "NETSTANDARD1_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
[InlineData("netstandard1.3", new[] { "NETSTANDARD=-1", "NETSTANDARD1_3=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "_MyType=\"Empty\"" })]
[InlineData("netstandard1.6", new[] { "NETSTANDARD=-1", "NETSTANDARD1_6=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1",
"NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "_MyType=\"Empty\"" })]
[InlineData("net45", new[] { "NETFRAMEWORK=-1", "NET45=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1" })]
[InlineData(".NETStandard,Version=v2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1",
"NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
[InlineData("netstandard2.0", new[] { "NETSTANDARD=-1", "NETSTANDARD2_0=-1", "NETSTANDARD1_0_OR_GREATER=-1", "NETSTANDARD1_1_OR_GREATER=-1", "NETSTANDARD1_2_OR_GREATER=-1", "NETSTANDARD1_3_OR_GREATER=-1", "NETSTANDARD1_4_OR_GREATER=-1", "NETSTANDARD1_5_OR_GREATER=-1", "NETSTANDARD1_6_OR_GREATER=-1", "NETSTANDARD2_0_OR_GREATER=-1", "_MyType=\"Empty\"" })]
[InlineData("net461", new[] { "NETFRAMEWORK=-1", "NET461=-1", "NET20_OR_GREATER=-1", "NET30_OR_GREATER=-1", "NET35_OR_GREATER=-1", "NET40_OR_GREATER=-1", "NET45_OR_GREATER=-1", "NET451_OR_GREATER=-1",
"NET452_OR_GREATER=-1", "NET46_OR_GREATER=-1", "NET461_OR_GREATER=-1" })]
[InlineData("netcoreapp1.0", new[] { "NETCOREAPP=-1", "NETCOREAPP1_0=-1", "_MyType=\"Empty\"", "NETCOREAPP1_0_OR_GREATER=-1" })]
Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.NET.Build.Tests/GivenThereAreDefaultItems.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ public void Default_items_have_the_correct_relative_paths()
.Should()
.Pass();

var outputDirectory = buildCommand.GetOutputDirectory("netstandard1.5");
var outputDirectory = buildCommand.GetOutputDirectory("netstandard2.0");

outputDirectory.Should().OnlyHaveFiles(new[] {
"TestLibrary.dll",
Expand Down
2 changes: 1 addition & 1 deletion test/TestAssets/TestProjects/AppWithLibrary/TestLibrary/TestLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<PropertyGroup>
<Version>42.43.44.45-alpha</Version>
<OutputType>Library</OutputType>
<TargetFramework>netstandard1.5</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion test/TestAssets/TestProjects/AppWithLibraryFS/TestLibrary/TestLibrary.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.6</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<FSharpCoreImplicitPackageVersion>4.2.3</FSharpCoreImplicitPackageVersion>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/TestAssets/TestProjects/AppWithLibraryVB/TestLibrary/TestLibrary.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Version>42.43.44.45-alpha</Version>
<OutputType>Library</OutputType>
<TargetFramework>netstandard1.5</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace />
</PropertyGroup>
</Project>