Skip to content

Commit 809ee9d

Browse files
Change default compression setting for compiler + bump versions (#17383)
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
1 parent f0b3484 commit 809ee9d

File tree

683 files changed

+1445
-1397
lines changed

Some content is hidden

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

683 files changed

+1445
-1397
lines changed

Test.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
@echo off
1+
@echo off
22
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -test %*"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### Fixed
2+
3+
### Added
4+
5+
### Changed
6+
* Change compiler default setting for compressedMetada ([Issue #17379](https://github.com/dotnet/fsharp/issues/17379), [PR #17383](https://github.com/dotnet/fsharp/pull/17383))
7+
8+
### Breaking Changes
9+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
### Fixed
2+
3+
### Added
4+
5+
### Changed
6+
* Change compiler default setting for compressedMetada ([Issue #17379](https://github.com/dotnet/fsharp/issues/17379), [PR #17383](https://github.com/dotnet/fsharp/pull/17383))
7+
8+
### Breaking Changes
9+

docs/release-notes/.Language/9.0.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
### Fixed
2+
3+
4+
### Added
5+

eng/Versions.props

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
1313
<!-- These have to be in sync with latest release branch -->
1414
<!-- F# Version components -->
15-
<FSMajorVersion>8</FSMajorVersion>
15+
<FSMajorVersion>9</FSMajorVersion>
1616
<FSMinorVersion>0</FSMinorVersion>
17-
<FSBuildVersion>400</FSBuildVersion>
17+
<FSBuildVersion>100</FSBuildVersion>
1818
<FSRevisionVersion>0</FSRevisionVersion>
1919
<!-- -->
2020
<!-- F# Language version -->
@@ -31,22 +31,22 @@
3131
<!-- -->
3232
<!-- FSharp.Compiler.Service version -->
3333
<FCSMajorVersion>43</FCSMajorVersion>
34-
<FCSMinorVersion>8</FCSMinorVersion>
34+
<FCSMinorVersion>9</FCSMinorVersion>
3535
<FCSBuildVersion>$(FSBuildVersion)</FCSBuildVersion>
3636
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
3737
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
3838
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
3939
<FSharpCompilerServiceReleaseNotesVersion>$(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion)</FSharpCompilerServiceReleaseNotesVersion>
4040
<!-- -->
4141
<!-- The current published nuget package -->
42-
<FSharpCoreShippedPackageVersionValue>8.0.200</FSharpCoreShippedPackageVersionValue>
42+
<FSharpCoreShippedPackageVersionValue>8.0.300</FSharpCoreShippedPackageVersionValue>
4343
<!-- -->
4444
<!-- The pattern for specifying the preview package -->
4545
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
4646
<!-- -->
4747
<!-- FSharp tools for Visual Studio version number -->
4848
<FSToolsMajorVersion>12</FSToolsMajorVersion>
49-
<FSToolsMinorVersion>8</FSToolsMinorVersion>
49+
<FSToolsMinorVersion>9</FSToolsMinorVersion>
5050
<FSToolsBuildVersion>$(FSBuildVersion)</FSToolsBuildVersion>
5151
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
5252
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
@@ -56,7 +56,7 @@
5656
<PropertyGroup>
5757
<!-- These have to be in sync with latest release branch -->
5858
<VSMajorVersion>17</VSMajorVersion>
59-
<VSMinorVersion>11</VSMinorVersion>
59+
<VSMinorVersion>12</VSMinorVersion>
6060
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
6161
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
6262
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>

src/Compiler/Driver/CompilerConfig.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -723,7 +723,7 @@ type TcConfigBuilder =
723723
metadataVersion = None
724724
standalone = false
725725
extraStaticLinkRoots = []
726-
compressMetadata = false
726+
compressMetadata = true
727727
noSignatureData = false
728728
onlyEssentialOptimizationData = false
729729
useOptimizationDataFile = false

src/Compiler/FSharp.Compiler.Service.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<PropertyGroup Condition="'$(Configuration)' != 'Proto'">
3333
<NoOptimizationData>false</NoOptimizationData>
3434
<NoInterfaceData>false</NoInterfaceData>
35-
<CompressMetadata>false</CompressMetadata>
35+
<CompressMetadata>true</CompressMetadata>
3636
</PropertyGroup>
3737

3838
<PropertyGroup>

src/FSharp.Build/Fsc.fs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type public Fsc() as this =
2727
let mutable codePage: string MaybeNull = null
2828
let mutable commandLineArgs: ITaskItem list = []
2929
let mutable compilerTools: ITaskItem[] = [||]
30-
let mutable compressMetadata = false
30+
let mutable compressMetadata = true
3131
let mutable debugSymbols = false
3232
let mutable debugType: string MaybeNull = null
3333
let mutable defineConstants: ITaskItem[] = [||]

src/FSharp.Core/FSharp.Core.fsproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<PropertyGroup Condition="'$(Configuration)' != 'Proto'">
4848
<NoOptimizationData>false</NoOptimizationData>
4949
<NoInterfaceData>false</NoInterfaceData>
50-
<CompressMetadata>false</CompressMetadata>
50+
<CompressMetadata>true</CompressMetadata>
5151
</PropertyGroup>
5252

5353
<!-- When we build FCS solution and we include FSCore as reference, set path explicitly -->

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.fs.RealInternalSignatureOff.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.fs.RealInternalSignatureOff.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.fs.RealInternalSignatureOn.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest1.fs.RealInternalSignatureOn.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.fs.RealInternalSignatureOff.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.fs.RealInternalSignatureOff.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.fs.RealInternalSignatureOn.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest2.fs.RealInternalSignatureOn.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.fs.RealInternalSignatureOff.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.fs.RealInternalSignatureOff.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.fs.RealInternalSignatureOn.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest3.fs.RealInternalSignatureOn.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.fs.RealInternalSignatureOff.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.fs.RealInternalSignatureOff.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.fs.RealInternalSignatureOn.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest4.fs.RealInternalSignatureOn.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.fs.RealInternalSignatureOff.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.fs.RealInternalSignatureOff.il.release.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionSteppingTest5.fs.RealInternalSignatureOn.il.debug.bsl

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
.hash algorithm 0x00008004
1818
.ver 0:0:0:0
1919
}
20-
.mresource public FSharpSignatureData.assembly
20+
.mresource public FSharpSignatureCompressedData.assembly
2121
{
2222

2323

2424
}
25-
.mresource public FSharpOptimizationData.assembly
25+
.mresource public FSharpOptimizationCompressedData.assembly
2626
{
2727

2828

0 commit comments

Comments
 (0)