Skip to content

Commit

Permalink
Change default compression setting for compiler + bump versions (#17383)
Browse files Browse the repository at this point in the history
Co-authored-by: Vlad Zarytovskii <vzaritovsky@hotmail.com>
  • Loading branch information
KevinRansom and vzarytovskii authored Jul 8, 2024
1 parent f0b3484 commit 809ee9d
Show file tree
Hide file tree
Showing 683 changed files with 1,445 additions and 1,397 deletions.
2 changes: 1 addition & 1 deletion Test.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\build.ps1""" -test %*"
9 changes: 9 additions & 0 deletions docs/release-notes/.FSharp.Compiler.Service/9.0.100.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### Fixed

### Added

### Changed
* Change compiler default setting for compressedMetada ([Issue #17379](https://github.com/dotnet/fsharp/issues/17379), [PR #17383](https://github.com/dotnet/fsharp/pull/17383))

### Breaking Changes

9 changes: 9 additions & 0 deletions docs/release-notes/.FSharp.Core/9.0.100.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
### Fixed

### Added

### Changed
* Change compiler default setting for compressedMetada ([Issue #17379](https://github.com/dotnet/fsharp/issues/17379), [PR #17383](https://github.com/dotnet/fsharp/pull/17383))

### Breaking Changes

5 changes: 5 additions & 0 deletions docs/release-notes/.Language/9.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
### Fixed


### Added

12 changes: 6 additions & 6 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<PreReleaseVersionLabel>beta</PreReleaseVersionLabel>
<!-- These have to be in sync with latest release branch -->
<!-- F# Version components -->
<FSMajorVersion>8</FSMajorVersion>
<FSMajorVersion>9</FSMajorVersion>
<FSMinorVersion>0</FSMinorVersion>
<FSBuildVersion>400</FSBuildVersion>
<FSBuildVersion>100</FSBuildVersion>
<FSRevisionVersion>0</FSRevisionVersion>
<!-- -->
<!-- F# Language version -->
Expand All @@ -31,22 +31,22 @@
<!-- -->
<!-- FSharp.Compiler.Service version -->
<FCSMajorVersion>43</FCSMajorVersion>
<FCSMinorVersion>8</FCSMinorVersion>
<FCSMinorVersion>9</FCSMinorVersion>
<FCSBuildVersion>$(FSBuildVersion)</FCSBuildVersion>
<FCSRevisionVersion>$(FSRevisionVersion)</FCSRevisionVersion>
<FSharpCompilerServicePackageVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion)</FSharpCompilerServicePackageVersion>
<FSharpCompilerServiceVersion>$(FCSMajorVersion).$(FCSMinorVersion).$(FCSBuildVersion).$(FCSRevisionVersion)</FSharpCompilerServiceVersion>
<FSharpCompilerServiceReleaseNotesVersion>$(FCSMajorVersion)$(FCSMinorVersion)$(FCSBuildVersion)</FSharpCompilerServiceReleaseNotesVersion>
<!-- -->
<!-- The current published nuget package -->
<FSharpCoreShippedPackageVersionValue>8.0.200</FSharpCoreShippedPackageVersionValue>
<FSharpCoreShippedPackageVersionValue>8.0.300</FSharpCoreShippedPackageVersionValue>
<!-- -->
<!-- The pattern for specifying the preview package -->
<FSharpCorePreviewPackageVersionValue>$(FSCorePackageVersionValue)-$(PreReleaseVersionLabel).*</FSharpCorePreviewPackageVersionValue>
<!-- -->
<!-- FSharp tools for Visual Studio version number -->
<FSToolsMajorVersion>12</FSToolsMajorVersion>
<FSToolsMinorVersion>8</FSToolsMinorVersion>
<FSToolsMinorVersion>9</FSToolsMinorVersion>
<FSToolsBuildVersion>$(FSBuildVersion)</FSToolsBuildVersion>
<FSToolsRevisionVersion>$(FSRevisionVersion)</FSToolsRevisionVersion>
<FSProductVersionPrefix>$(FSToolsMajorVersion).$(FSToolsMinorVersion).$(FSToolsBuildVersion)</FSProductVersionPrefix>
Expand All @@ -56,7 +56,7 @@
<PropertyGroup>
<!-- These have to be in sync with latest release branch -->
<VSMajorVersion>17</VSMajorVersion>
<VSMinorVersion>11</VSMinorVersion>
<VSMinorVersion>12</VSMinorVersion>
<VSGeneralVersion>$(VSMajorVersion).0</VSGeneralVersion>
<VSAssemblyVersionPrefix>$(VSMajorVersion).$(VSMinorVersion).0</VSAssemblyVersionPrefix>
<VSAssemblyVersion>$(VSAssemblyVersionPrefix).0</VSAssemblyVersion>
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/Driver/CompilerConfig.fs
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ type TcConfigBuilder =
metadataVersion = None
standalone = false
extraStaticLinkRoots = []
compressMetadata = false
compressMetadata = true
noSignatureData = false
onlyEssentialOptimizationData = false
useOptimizationDataFile = false
Expand Down
2 changes: 1 addition & 1 deletion src/Compiler/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PropertyGroup Condition="'$(Configuration)' != 'Proto'">
<NoOptimizationData>false</NoOptimizationData>
<NoInterfaceData>false</NoInterfaceData>
<CompressMetadata>false</CompressMetadata>
<CompressMetadata>true</CompressMetadata>
</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Build/Fsc.fs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ type public Fsc() as this =
let mutable codePage: string MaybeNull = null
let mutable commandLineArgs: ITaskItem list = []
let mutable compilerTools: ITaskItem[] = [||]
let mutable compressMetadata = false
let mutable compressMetadata = true
let mutable debugSymbols = false
let mutable debugType: string MaybeNull = null
let mutable defineConstants: ITaskItem[] = [||]
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Core/FSharp.Core.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<PropertyGroup Condition="'$(Configuration)' != 'Proto'">
<NoOptimizationData>false</NoOptimizationData>
<NoInterfaceData>false</NoInterfaceData>
<CompressMetadata>false</CompressMetadata>
<CompressMetadata>true</CompressMetadata>
</PropertyGroup>

<!-- When we build FCS solution and we include FSCore as reference, set path explicitly -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
.hash algorithm 0x00008004
.ver 0:0:0:0
}
.mresource public FSharpSignatureData.assembly
.mresource public FSharpSignatureCompressedData.assembly
{


}
.mresource public FSharpOptimizationData.assembly
.mresource public FSharpOptimizationCompressedData.assembly
{


Expand Down
Loading

0 comments on commit 809ee9d

Please sign in to comment.