Skip to content

Commit 2d4079a

Browse files
dotnet-maestro[bot]T-Gro
dotnet-maestro[bot]
and
T-Gro
authored
[main] Source code updates from dotnet/fsharp (#2843)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Grosup <[email protected]>
1 parent d2b6076 commit 2d4079a

62 files changed

Lines changed: 630 additions & 486 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎src/fsharp/FSharp.sln‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.1.32113.165
3+
# Visual Studio Version 18
4+
VisualStudioVersion = 18.0.11104.47 d18.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Core", "src\FSharp.Core\FSharp.Core.fsproj", "{DED3BBD7-53F4-428A-8C9F-27968E768605}"
77
EndProject
@@ -166,6 +166,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".VisualStudio", ".VisualStu
166166
docs\release-notes\.VisualStudio\17.9.md = docs\release-notes\.VisualStudio\17.9.md
167167
EndProjectSection
168168
EndProject
169+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{79E058E4-79E9-4178-AFA4-A87C45373379}"
170+
ProjectSection(SolutionItems) = preProject
171+
eng\Version.Details.props = eng\Version.Details.props
172+
eng\Version.Details.xml = eng\Version.Details.xml
173+
eng\Versions.props = eng\Versions.props
174+
EndProjectSection
175+
EndProject
169176
Global
170177
GlobalSection(SolutionConfigurationPlatforms) = preSolution
171178
Debug|Any CPU = Debug|Any CPU

‎src/fsharp/docs/release-notes/.FSharp.Compiler.Service/11.0.0.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
### Fixed
2+
3+
* Scripts: Fix resolving the dotnet host path when an SDK directory is specified. ([PR #18960](https://github.com/dotnet/fsharp/pull/18960))
24
* Fix excessive StackGuard thread jumping ([PR #18971](https://github.com/dotnet/fsharp/pull/18971))
35

46
### Added

‎src/fsharp/eng/Version.Details.props‎

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,28 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet/msbuild dependencies -->
9-
<MicrosoftBuildPackageVersion>18.1.0-preview-25507-05</MicrosoftBuildPackageVersion>
10-
<MicrosoftBuildFrameworkPackageVersion>18.1.0-preview-25507-05</MicrosoftBuildFrameworkPackageVersion>
11-
<MicrosoftBuildTasksCorePackageVersion>18.1.0-preview-25507-05</MicrosoftBuildTasksCorePackageVersion>
12-
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25507-05</MicrosoftBuildUtilitiesCorePackageVersion>
9+
<MicrosoftBuildPackageVersion>18.1.0-preview-25509-03</MicrosoftBuildPackageVersion>
10+
<MicrosoftBuildFrameworkPackageVersion>18.1.0-preview-25509-03</MicrosoftBuildFrameworkPackageVersion>
11+
<MicrosoftBuildTasksCorePackageVersion>18.1.0-preview-25509-03</MicrosoftBuildTasksCorePackageVersion>
12+
<MicrosoftBuildUtilitiesCorePackageVersion>18.1.0-preview-25509-03</MicrosoftBuildUtilitiesCorePackageVersion>
1313
<!-- dotnet/runtime dependencies -->
1414
<SystemCollectionsImmutablePackageVersion>9.0.0</SystemCollectionsImmutablePackageVersion>
1515
<SystemComponentModelCompositionPackageVersion>9.0.0</SystemComponentModelCompositionPackageVersion>
1616
<SystemCompositionPackageVersion>9.0.0</SystemCompositionPackageVersion>
1717
<SystemDiagnosticsDiagnosticSourcePackageVersion>9.0.0</SystemDiagnosticsDiagnosticSourcePackageVersion>
1818
<SystemReflectionMetadataPackageVersion>9.0.0</SystemReflectionMetadataPackageVersion>
1919
<SystemThreadingTasksDataflowPackageVersion>9.0.0</SystemThreadingTasksDataflowPackageVersion>
20+
<!-- dotnet/roslyn dependencies -->
21+
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisPackageVersion>
22+
<MicrosoftCodeAnalysisCompilersPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCompilersPackageVersion>
23+
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisCSharpPackageVersion>
24+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
25+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
26+
<MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion>
27+
<MicrosoftCodeAnalysisFeaturesPackageVersion>5.0.0-2.25480.7</MicrosoftCodeAnalysisFeaturesPackageVersion>
28+
<MicrosoftVisualStudioLanguageServicesPackageVersion>5.0.0-2.25480.7</MicrosoftVisualStudioLanguageServicesPackageVersion>
2029
<!-- dotnet/arcade dependencies -->
21-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25508.3</MicrosoftDotNetArcadeSdkPackageVersion>
30+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25509.1</MicrosoftDotNetArcadeSdkPackageVersion>
2231
<!-- _git/dotnet-optimization dependencies -->
2332
<optimizationlinuxarm64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxarm64MIBCRuntimePackageVersion>
2433
<optimizationlinuxx64MIBCRuntimePackageVersion>1.0.0-prerelease.25502.1</optimizationlinuxx64MIBCRuntimePackageVersion>
@@ -40,6 +49,15 @@ This file should be imported by eng/Versions.props
4049
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemDiagnosticsDiagnosticSourcePackageVersion)</SystemDiagnosticsDiagnosticSourceVersion>
4150
<SystemReflectionMetadataVersion>$(SystemReflectionMetadataPackageVersion)</SystemReflectionMetadataVersion>
4251
<SystemThreadingTasksDataflowVersion>$(SystemThreadingTasksDataflowPackageVersion)</SystemThreadingTasksDataflowVersion>
52+
<!-- dotnet/roslyn dependencies -->
53+
<MicrosoftCodeAnalysisVersion>$(MicrosoftCodeAnalysisPackageVersion)</MicrosoftCodeAnalysisVersion>
54+
<MicrosoftCodeAnalysisCompilersVersion>$(MicrosoftCodeAnalysisCompilersPackageVersion)</MicrosoftCodeAnalysisCompilersVersion>
55+
<MicrosoftCodeAnalysisCSharpVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisCSharpVersion>
56+
<MicrosoftCodeAnalysisEditorFeaturesVersion>$(MicrosoftCodeAnalysisEditorFeaturesPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesVersion>
57+
<MicrosoftCodeAnalysisEditorFeaturesTextVersion>$(MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesTextVersion>
58+
<MicrosoftCodeAnalysisExternalAccessFSharpVersion>$(MicrosoftCodeAnalysisExternalAccessFSharpPackageVersion)</MicrosoftCodeAnalysisExternalAccessFSharpVersion>
59+
<MicrosoftCodeAnalysisFeaturesVersion>$(MicrosoftCodeAnalysisFeaturesPackageVersion)</MicrosoftCodeAnalysisFeaturesVersion>
60+
<MicrosoftVisualStudioLanguageServicesVersion>$(MicrosoftVisualStudioLanguageServicesPackageVersion)</MicrosoftVisualStudioLanguageServicesVersion>
4361
<!-- dotnet/arcade dependencies -->
4462
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
4563
<!-- _git/dotnet-optimization dependencies -->

‎src/fsharp/eng/Version.Details.xml‎

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
3-
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="d4a0a6c13e5c5b2faf06685125331de90a37943a" BarId="286004" />
3+
<Source Uri="https://github.com/dotnet/dotnet" Mapping="fsharp" Sha="64d877a07af8c020fe9da6e721bc2258894f31ee" BarId="286279" />
44
<ProductDependencies>
5-
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25507-05">
5+
<Dependency Name="Microsoft.Build" Version="18.1.0-preview-25509-03">
66
<Uri>https://github.com/dotnet/msbuild</Uri>
7-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
7+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
88
</Dependency>
9-
<Dependency Name="Microsoft.Build.Framework" Version="18.1.0-preview-25507-05">
9+
<Dependency Name="Microsoft.Build.Framework" Version="18.1.0-preview-25509-03">
1010
<Uri>https://github.com/dotnet/msbuild</Uri>
11-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
11+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
1212
</Dependency>
13-
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25507-05">
13+
<Dependency Name="Microsoft.Build.Tasks.Core" Version="18.1.0-preview-25509-03">
1414
<Uri>https://github.com/dotnet/msbuild</Uri>
15-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
15+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
1616
</Dependency>
17-
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25507-05">
17+
<Dependency Name="Microsoft.Build.Utilities.Core" Version="18.1.0-preview-25509-03">
1818
<Uri>https://github.com/dotnet/msbuild</Uri>
19-
<Sha>044c796561d5c06be5c8caeac8a7bf0334e4232d</Sha>
19+
<Sha>e0ef001649e4948f10148dbd1e2d30db401054f1</Sha>
2020
</Dependency>
2121
<Dependency Name="System.Reflection.Metadata" Version="9.0.0">
2222
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -42,11 +42,43 @@
4242
<Uri>https://github.com/dotnet/runtime</Uri>
4343
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
4444
</Dependency>
45+
<Dependency Name="Microsoft.CodeAnalysis" Version="5.0.0-2.25480.7">
46+
<Uri>https://github.com/dotnet/roslyn</Uri>
47+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
48+
</Dependency>
49+
<Dependency Name="Microsoft.CodeAnalysis.Features" Version="5.0.0-2.25480.7">
50+
<Uri>https://github.com/dotnet/roslyn</Uri>
51+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
52+
</Dependency>
53+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures" Version="5.0.0-2.25480.7">
54+
<Uri>https://github.com/dotnet/roslyn</Uri>
55+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
56+
</Dependency>
57+
<Dependency Name="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="5.0.0-2.25480.7">
58+
<Uri>https://github.com/dotnet/roslyn</Uri>
59+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
60+
</Dependency>
61+
<Dependency Name="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="5.0.0-2.25480.7">
62+
<Uri>https://github.com/dotnet/roslyn</Uri>
63+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
64+
</Dependency>
65+
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25480.7">
66+
<Uri>https://github.com/dotnet/roslyn</Uri>
67+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
68+
</Dependency>
69+
<Dependency Name="Microsoft.CodeAnalysis.Compilers" Version="5.0.0-2.25480.7">
70+
<Uri>https://github.com/dotnet/roslyn</Uri>
71+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
72+
</Dependency>
73+
<Dependency Name="Microsoft.VisualStudio.LanguageServices" Version="5.0.0-2.25480.7">
74+
<Uri>https://github.com/dotnet/roslyn</Uri>
75+
<Sha>ebf60fd9876294d15a47407b468709db1b31cc91</Sha>
76+
</Dependency>
4577
</ProductDependencies>
4678
<ToolsetDependencies>
47-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25508.3">
79+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
4880
<Uri>https://github.com/dotnet/arcade</Uri>
49-
<Sha>41dda26a1806c552974e29d5ba476107ec0311a1</Sha>
81+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
5082
</Dependency>
5183
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25502.1">
5284
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

0 commit comments

Comments
 (0)