Skip to content
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

Deploy only compressed metadata for dotnet sdk implementation #15230

Merged
merged 9 commits into from
May 24, 2023
Merged

Deploy only compressed metadata for dotnet sdk implementation #15230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af7a952
compress fsharp for sdk
KevinRansom May 17, 2023
0a487d9
Merge branch 'main' into nosigoptdata
KevinRansom May 18, 2023
4e52213
Merge branch 'main' into nosigoptdata
KevinRansom May 19, 2023
1602d0e
Merge branch 'main' into nosigoptdata
KevinRansom May 19, 2023
2a2dfe5
Merge branch 'main' into nosigoptdata
KevinRansom May 20, 2023
1b09620
Merge branch 'main' into nosigoptdata
KevinRansom May 23, 2023
e530deb
Update FSharp.DependencyManager.Nuget.fsproj
KevinRansom May 23, 2023
429007a
Merge branch 'main' into nosigoptdata
KevinRansom May 23, 2023
eadd6b5
Merge branch 'main' into nosigoptdata
KevinRansom May 24, 2023
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
1 change: 1 addition & 0 deletions src/Compiler/FSharp.Compiler.Service.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<FsYaccOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsYaccOutputFolder>
<FsLexOutputFolder>$(IntermediateOutputPath)$(TargetFramework)\</FsLexOutputFolder>
<EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<!-- The FSharp.Compiler.Service dll provides a referencable public interface for tool builders -->
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<NoWarn>NU1701;FS0075</NoWarn>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<LangVersion>7.0</LangVersion> <!-- FSharp.Build may run in Visual Studio with older FSharp.Cores so don't use unshipped features -->
<Configurations>Debug;Release;Proto</Configurations> <!-- FSharp.Build may run in Visual Studio with older FSharp.Cores so don't use unshipped features -->
<Configurations>Debug;Release;Proto;ReleaseCompressed</Configurations> <!-- FSharp.Build may run in Visual Studio with older FSharp.Cores so don't use unshipped features -->
</PropertyGroup>

<!-- The FSharp.Build dll does not provide a referencable public interface although it's used for testing -->
Expand Down
1 change: 1 addition & 0 deletions src/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<TargetFrameworks>netstandard2.0</TargetFrameworks>
<AssemblyName>FSharp.Compiler.Interactive.Settings</AssemblyName>
<AllowCrossTargeting>true</AllowCrossTargeting>
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<!-- The FSharp.Compiler.Interactive.Settings dll provides a referencable public interface to tool builders -->
Expand Down
2 changes: 1 addition & 1 deletion src/FSharp.Core/FSharp.Core.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<IsPackable>true</IsPackable>
<PackageDescription>FSharp.Core redistributables from F# Tools version $(FSProductVersionPrefix) For F# $(FSLanguageVersion). Contains code from the F# Software Foundation.</PackageDescription>
<PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Core-$(FSCoreReleaseNotesVersion)</PackageReleaseNotes>
<Configurations>Debug;Release;Proto</Configurations>
<Configurations>Debug;Release;Proto;ReleaseCompressed</Configurations>
</PropertyGroup>

<!-- The FSharp.Core dll provides a referencable public interface -->
Expand Down
1 change: 1 addition & 0 deletions src/FSharp.DependencyManager.Nuget/FSharp.DependencyManager.Nuget.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<DefineConstants>$(DefineConstants);COMPILER</DefineConstants>
<OtherFlags>$(OtherFlags) --warnon:1182</OtherFlags>
<Tailcalls>true</Tailcalls> <!-- .tail annotations always emitted for this binary, even in debug mode -->
KevinRansom marked this conversation as resolved.
Show resolved Hide resolved
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<!-- The FSharp.DependencyManager.Nuget dll does not provide a referencable public interface although it's used for testing -->
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\fsi\fsiProject\fsi.fsproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\fsc\fscProject\fsc.fsproj" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\fsi\fsiProject\fsi.fsproj">
<AdditionalProperties>Configuration=ReleaseCompressed;CompressAllMetadata=true</AdditionalProperties>
KevinRansom marked this conversation as resolved.
Show resolved Hide resolved
</ProjectReference>
<ProjectReference Include="$(MSBuildThisFileDirectory)..\fsc\fscProject\fsc.fsproj">
<AdditionalProperties>Configuration=ReleaseCompressed;CompressAllMetadata=true</AdditionalProperties>
</ProjectReference>
</ItemGroup>

<ItemGroup>
Expand Down
42 changes: 21 additions & 21 deletions src/Microsoft.FSharp.Compiler/Microsoft.FSharp.Compiler.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,43 +26,43 @@
this approach gives a very small deployment. Which is kind of necessary.
-->
<!-- assemblies -->
<file src="fsc\$Configuration$\net7.0\fsc.dll" target="lib\net7.0" />
<file src="fsi\$Configuration$\net7.0\fsi.dll" target="lib\net7.0" />
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.dll" target="lib\net7.0" />
<file src="FSharp.Core\$Configuration$\netstandard2.0\FSharp.Core.xml" target="lib\net7.0" />
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\net7.0" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\FSharp.Build.dll" target="lib\net7.0" />
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
<file src="fsc\ReleaseCompressed\net7.0\fsc.dll" target="lib\net7.0" />
<file src="fsi\ReleaseCompressed\net7.0\fsi.dll" target="lib\net7.0" />
<file src="FSharp.Core\ReleaseCompressed\netstandard2.0\FSharp.Core.dll" target="lib\net7.0" />
<file src="FSharp.Core\ReleaseCompressed\netstandard2.0\FSharp.Core.xml" target="lib\net7.0" />
<file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\FSharp.Compiler.Service.dll" target="lib\net7.0" />
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\FSharp.Build.dll" target="lib\net7.0" />
<file src="FSharp.DependencyManager.Nuget\ReleaseCompressed\netstandard2.0\FSharp.DependencyManager.Nuget.dll"
target="lib\net7.0" />
<file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
<file src="FSharp.Compiler.Interactive.Settings\ReleaseCompressed\netstandard2.0\FSharp.Compiler.Interactive.Settings.dll"
target="lib\net7.0" />

<!-- additional files -->
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\default.win32manifest" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />
<file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\default.win32manifest" target="contentFiles\any\any" />
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.FSharp.Targets" target="contentFiles\any\any" />
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.Portable.FSharp.Targets" target="contentFiles\any\any" />
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.FSharp.NetSdk.props" target="contentFiles\any\any" />
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.FSharp.NetSdk.targets" target="contentFiles\any\any" />
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Microsoft.FSharp.Overrides.NetSdk.targets" target="contentFiles\any\any" />

<!-- resources -->
<file src="FSharp.Core\$Configuration$\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\net7.0" />
<file src="FSharp.Compiler.Service\$Configuration$\netstandard2.0\**\FSharp.Compiler.Service.resources.dll"
<file src="FSharp.Core\ReleaseCompressed\netstandard2.0\**\FSharp.Core.resources.dll" target="lib\net7.0" />
<file src="FSharp.Compiler.Service\ReleaseCompressed\netstandard2.0\**\FSharp.Compiler.Service.resources.dll"
target="lib\net7.0" />
<file src="FSharp.Compiler.Interactive.Settings\$Configuration$\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
<file src="FSharp.Compiler.Interactive.Settings\ReleaseCompressed\netstandard2.0\**\FSharp.Compiler.Interactive.Settings.resources.dll"
target="lib\net7.0" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net7.0" />
<file src="FSharp.DependencyManager.Nuget\$configuration$\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\**\FSharp.Build.resources.dll" target="lib\net7.0" />
<file src="FSharp.DependencyManager.Nuget\ReleaseCompressed\netstandard2.0\**\FSharp.DependencyManager.Nuget.resources.dll"
target="lib\net7.0" />
<file src="$artifactsPackagesDir$Shipping\FSharp.Core.$fSharpCorePreviewPackageVersion$*nupkg" target="contentFiles\Shipping" />
<file src="$artifactsPackagesDir$Release\FSharp.Core.$fSharpCorePackageVersion$*nupkg" target="contentFiles\Release" />
<file src="$artifactsPackagesDir$Shipping\FSharp.Compiler.Service.$fSharpCompilerServicePreviewPackageVersion$*nupkg"
target="contentFiles\Shipping" />
<file src="$artifactsPackagesDir$Release\FSharp.Compiler.Service.$fSharpCompilerServicePackageVersion$*nupkg"
target="contentFiles\Release" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props"
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Shipping\Microsoft.FSharp.Core.NetSdk.props"
target="contentFiles\Shipping" />
<file src="FSharp.Build\$Configuration$\netstandard2.0\Release\Microsoft.FSharp.Core.NetSdk.props"
<file src="FSharp.Build\ReleaseCompressed\netstandard2.0\Release\Microsoft.FSharp.Core.NetSdk.props"
target="contentFiles\Release" />
</files>
</package>
1 change: 1 addition & 0 deletions src/fsc/fscAnyCpuProject/fscAnyCpu.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<PlatformTarget>anycpu</PlatformTarget>
<TargetExt>.exe</TargetExt>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('fsc.targets', '$(MSBuildThisFileDirectory)../'))" />
Expand Down
1 change: 1 addition & 0 deletions src/fsc/fscArm64Project/fscArm64.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<PlatformTarget>arm64</PlatformTarget>
<TargetExt>.exe</TargetExt>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('fsc.targets', '$(MSBuildThisFileDirectory)../'))" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsc/fscProject/fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net7.0</TargetFrameworks>
<PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
<Configurations>Debug;Release;Proto</Configurations>
<Configurations>Debug;Release;Proto;ReleaseCompressed</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(BUILD_PROTO)' == 'true'">
Expand Down
1 change: 1 addition & 0 deletions src/fsi/fsiAnyCpuProject/fsiAnyCpu.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<TargetExt>.exe</TargetExt>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<DefineConstants>$(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER</DefineConstants>
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('fsi.targets', '$(MSBuildThisFileDirectory)../'))" />
Expand Down
1 change: 1 addition & 0 deletions src/fsi/fsiArm64Project/fsiArm64.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<TargetExt>.exe</TargetExt>
<ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
<DefineConstants>$(DefineConstants);FSI_SHADOW_COPY_REFERENCES;FSI_SERVER</DefineConstants>
<Configurations>Debug;Release;ReleaseCompressed</Configurations>
</PropertyGroup>

<Import Project="$([MSBuild]::GetPathOfFileAbove('fsi.targets', '$(MSBuildThisFileDirectory)../'))" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsi/fsiProject/fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<TargetFrameworks Condition="'$(OS)' != 'Unix'">net472;net7.0</TargetFrameworks>
<TargetFrameworks Condition="'$(OS)' == 'Unix'">net7.0</TargetFrameworks>
<PlatformTarget Condition="'$(TargetFramework)' == 'net472'">x86</PlatformTarget>
<Configurations>Debug;Release;Proto</Configurations>
<Configurations>Debug;Release;Proto;ReleaseCompressed</Configurations>
</PropertyGroup>

<PropertyGroup Condition="'$(BUILD_PROTO)' == 'true'">
Expand Down