Skip to content

Versioning Redux #4112

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 10 commits into from
Jan 1, 2018
Merged

Versioning Redux #4112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aed2578
Versioning Redux
KevinRansom Dec 13, 2017
e0da424
Supported runtimes
KevinRansom Dec 13, 2017
04c6b6b
No this is better
KevinRansom Dec 13, 2017
8baaa1d
Refactor targets slightly and parameterize VS version throughout
KevinRansom Dec 14, 2017
04d1034
Update fcs tests for new portable version
KevinRansom Dec 14, 2017
e2ff731
Property pages versioning, additional text
Dec 15, 2017
a33deb1
merge
KevinRansom Dec 24, 2017
9e5d459
Merge branch 'dev15.6' of https://github.com/Microsoft/visualfsharp i…
KevinRansom Dec 24, 2017
046a246
Merge branch 'dev15.6' of https://github.com/Microsoft/visualfsharp i…
KevinRansom Dec 25, 2017
a8a05b7
Fix VS tests
KevinRansom Jan 1, 2018
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
10 changes: 10 additions & 0 deletions fcs/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
FSharp.Compiler.Service.netstandard/illex.fs
FSharp.Compiler.Service.netstandard/ilpars.fs
FSharp.Compiler.Service.netstandard/ilpars.fsi
FSharp.Compiler.Service.netstandard/lex.fs
FSharp.Compiler.Service.netstandard/pars.fs
FSharp.Compiler.Service.netstandard/pars.fsi
FSharp.Compiler.Service.netstandard/pplex.fs
FSharp.Compiler.Service.netstandard/pppars.fs
FSharp.Compiler.Service.netstandard/pppars.fsi

Copy link
Contributor

@cartermp cartermp Dec 19, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1

2 changes: 1 addition & 1 deletion packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<package id="FSharp.Compiler.Tools" version="4.1.27"/>

<!-- Frozen portable library versions of FSharp.Core.dll (simply a renamed fsharp.core.4.1.18-->
<package id="Microsoft.Portable.FSharp.Core" version="4.3.0"/>
<package id="Microsoft.Portable.FSharp.Core" version="10.1.0"/>

<!-- FSharp.Core is used to get back versions of FSharp.Core -->
<package id="FSharp.Core" version="4.1.17"/>
Expand Down
8 changes: 4 additions & 4 deletions setup/FSharp.SDK/Common.Wix.Properties.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@

<Directory Id="MicrosoftSDKs" Name="Microsoft SDKs">
<Directory Id="MicrosoftSDKs_FS" Name="F#">
<Directory Id="MicrosoftSDKs_FS_4.3" Name="4.3">
<Directory Id="MicrosoftSDKs_FS_4.3_Framework" Name="Framework">
<Directory Id="MicrosoftSDKs_FS_4.3_Framework_v4.0" Name="v4.0">
<Directory Id="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
<Directory Id="MicrosoftSDKs_FS_10.1" Name="10.1">
<Directory Id="MicrosoftSDKs_FS_10.1_Framework" Name="Framework">
<Directory Id="MicrosoftSDKs_FS_10.1_Framework_v4.0" Name="v4.0">
<Directory Id="MicrosoftSDKs_FS_10.1_Framework_v4.0_$(var.LocaleId)" Name="$(var.LocaleParentCulture)" />
</Directory>
</Directory>
</Directory>
Expand Down
2 changes: 1 addition & 1 deletion setup/FSharp.SDK/FSharp.SDK.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information. -->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define ProductVersion = "4.3"?>
<?define ProductVersion = "10.1"?>
<?define ProductPlatform = "x86"?>
<?define ProductManufacturer = "Microsoft Corporation"?>
<?define ProductDescription = "Visual F# $(var.ProductVersion) SDK"?>
Expand Down
2 changes: 1 addition & 1 deletion setup/FSharp.SDK/component-groups/Compiler_LangPack.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<ComponentRef Id="Compiler_LangPack_FSharp.Compiler.Private.dll_$(var.LocaleCode)" />
</ComponentGroup>

<DirectoryRef Id="MicrosoftSDKs_FS_4.3_Framework_v4.0_$(var.LocaleId)">
<DirectoryRef Id="MicrosoftSDKs_FS_10.1_Framework_v4.0_$(var.LocaleId)">
<Component Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Guid="$(fsharp.guid(Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode), $(var.LocaleCode)))">
<File Id="Compiler_LangPack_FSharp.Core.dll_$(var.LocaleCode)" Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
</Component>
Expand Down
18 changes: 9 additions & 9 deletions setup/FSharp.SDK/component-groups/Compiler_Redist.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

</ComponentGroup>

<DirectoryRef Id="MicrosoftSDKs_FS_4.3_Framework_v4.0">
<DirectoryRef Id="MicrosoftSDKs_FS_10.1_Framework_v4.0">

<Component Id="Compiler_Redist_FSharp.Core.dll" Guid="$(fsharp.guid(Compiler_Redist_FSharp.Core.dll, $(var.LocaleCode)))">
<File Id="Compiler_Redist_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes">
Expand Down Expand Up @@ -131,18 +131,18 @@
</Component>

<Component Id="Compiler_Redist_RegistryKeys_CompilerLocation" Guid="$(fsharp.guid(Compiler_Redist_RegistryKeys_CompilerLocation, $(var.LocaleCode)))">
<Environment Id="Compiler_Redist_FSHARPINSTALLDIR_Environment_Variable" Name="FSHARPINSTALLDIR" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]" Action="create" System="yes" />
<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.3\Runtime\v4.0" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]" Type="string" />
<Environment Id="Compiler_Redist_FSHARPINSTALLDIR_Environment_Variable" Name="FSHARPINSTALLDIR" Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]" Action="create" System="yes" />
<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\10.1\Runtime\v4.0" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]" Type="string" />
</RegistryKey>
<RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\15.0\MSBuild\SafeImports" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Name="Microsoft.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharp.Targets" Type="string" />
<RegistryValue Name="Microsoft.Portable.FSharp.Targets" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.Portable.FSharp.Targets" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.props" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharp.NetSdk.props" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.targets" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]Microsoft.FSharpNetSdk.targets" Type="string" />
<RegistryValue Name="Microsoft.FSharp.Targets" Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharp.Targets" Type="string" />
<RegistryValue Name="Microsoft.Portable.FSharp.Targets" Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.Portable.FSharp.Targets" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.props" Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharp.NetSdk.props" Type="string" />
<RegistryValue Name="Microsoft.FSharp.NetSdk.targets" Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]Microsoft.FSharpNetSdk.targets" Type="string" />
</RegistryKey>
<RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\15.0\Setup\F#" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Name="ProductDir" Value="[MicrosoftSDKs_FS_4.3_Framework_v4.0]" Type="string" />
<RegistryValue Name="ProductDir" Value="[MicrosoftSDKs_FS_10.1_Framework_v4.0]" Type="string" />
</RegistryKey>
</Component>

Expand Down
6 changes: 3 additions & 3 deletions setup/FSharp.SDK/component-groups/Runtime_LangPack.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,15 @@

<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0_$(var.LocaleId)">
<Component Id="Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.3.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
<File Id="Runtime_LangPack_4.4.3.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
<File Id="Runtime_LangPack_4.4.3.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
</Component>
</DirectoryRef>

<!-- F# 4.1 -->

<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.1.0_$(var.LocaleId)">
<Component Id="Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_4.4.1.0_FSharp.Core_LangPack, $(var.LocaleCode)))">
<File Id="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
<File Id="Runtime_LangPack_4.4.1.0_FSharp.Core.resources.dll" Source="$(var.BinariesDir)\net40\bin\$(var.LocaleParentCulture)\FSharp.Core.resources.dll" KeyPath="yes" />
</Component>
</DirectoryRef>
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETPortable_3.47.41.0_$(var.LocaleId)">
Expand Down Expand Up @@ -167,7 +167,7 @@

<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
<Component Id="Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode)" Transitive="yes" Guid="$(fsharp.guid(Runtime_LangPack_RegistryKeys_InstallSuccess_$(var.LocaleCode), $(var.LocaleCode)))">
<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\4.3\Runtime\v4.0_$(var.LocaleId)\Install" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryKey Root="HKLM" Key="Software\Microsoft\FSharp\10.1\Runtime\v4.0_$(var.LocaleId)\Install" ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes">
<RegistryValue Name="InstallSuccess" Value="4.4.3.0" Type="string" />
</RegistryKey>
</Component>
Expand Down
1 change: 1 addition & 0 deletions setup/FSharp.SDK/component-groups/Runtime_Redist.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp_NETFramework_4.0_4.4.3.0">
<Component Id="Runtime_Redist_4.4.3.0_FSharp.Core" Transitive="yes" Guid="$(fsharp.guid(Runtime_Redist_4.4.3.0_FSharp.Core, $(var.LocaleCode)))">
<File Id="Runtime_Redist_4.4.3.0_FSharp.Core.dll" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.dll" KeyPath="yes" />
<File Id="Runtime_Redist_4.4.3.0_FSharp.Core.xml" Source="$(var.BinariesDir)\net40\bin\FSharp.Core.xml" />
<!-- NOTE: The optdata and sigdata files are now integrated as resources for more recent FSharp.Core.dll's. -->
<!-- However old versions of FSharp.Core still need these files. For consistency we also continue to produce the files -->
<!-- for FSharp.Core 4.4.1.0, and include them in the redist. -->
Expand Down
2 changes: 1 addition & 1 deletion setup/FSharp.Setup.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<PropertyGroup>
<FSharpProductVersion>4.3</FSharpProductVersion>
<FSharpProductVersion>10.1</FSharpProductVersion>
<!-- BUILD_BUILDNUMBER is passed from Microbuild. Replace by today's date and (0) if it was a local build -->
<BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
<!-- Remove .DRAFT suffix if it exists in the build number -->
Expand Down
2 changes: 1 addition & 1 deletion setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use vs
package name=Microsoft.FSharp.SDK.Core
version=$(FSharpPackageVersion)
vs.package.type=msi
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v4.3
vs.package.providerKey=Microsoft.FSharp.SDK.Core,v10.1

vs.installSize
SystemDrive=194670592
Expand Down
2 changes: 1 addition & 1 deletion setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ package name=Microsoft.FSharp.SDK.Resources
version=$(FSharpPackageVersion)
vs.package.language=$(LocaleSpecificCulture)
vs.package.installSize=1
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.3
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1
2 changes: 1 addition & 1 deletion setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources
version=$(FSharpPackageVersion)
vs.package.type=msi
vs.package.language=$(LocaleSpecificCulture)
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v4.3
vs.package.providerKey=Microsoft.FSharp.SDK.Resources,$(LocaleSpecificCulture),v10.1

vs.installSize
SystemDrive=12681438
Expand Down
2 changes: 1 addition & 1 deletion setup/resources/Microsoft.FSharp.NetSdk.Shim.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.FSharp.NetSdk.props" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\10.1\Framework\v4.0\Microsoft.FSharp.NetSdk.props" />

</Project>
2 changes: 1 addition & 1 deletion setup/resources/Microsoft.FSharp.NetSdk.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.FSharp.NetSdk.targets" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\10.1\Framework\v4.0\Microsoft.FSharp.NetSdk.targets" />

</Project>
2 changes: 1 addition & 1 deletion setup/resources/Microsoft.FSharp.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.FSharp.Targets" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\10.1\Framework\v4.0\Microsoft.FSharp.Targets" />

</Project>
2 changes: 1 addition & 1 deletion setup/resources/Microsoft.Portable.FSharp.Shim.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\4.3\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />
<Import Project="$(MSBuildProgramFiles32)\Microsoft SDKs\F#\10.1\Framework\v4.0\Microsoft.Portable.FSharp.Targets" />

</Project>
66 changes: 46 additions & 20 deletions src/FSharpSource.Settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,10 @@
</PropertyGroup>

<PropertyGroup>
<!-- Settings used all the time -->
<Tailcalls>true</Tailcalls>
<TargetDotnetProfile Condition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>

<!-- Currently always use .NET Framwork proto compiler -->
<ProtoFlavour Condition="'$(ProtoFlavour)' == ''">net40</ProtoFlavour>
<ProjectLanguage Condition="'$(ProjectLanguage)' == ''">FSharp</ProjectLanguage>
<DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<BuildToolsTargets45>true</BuildToolsTargets45>
<WarningsAsErrors />
<FX_NO_LOADER Condition=" '$(FX_NO_LOADER)'==''">false</FX_NO_LOADER>
<FSCoreVersion>4.4.3.0</FSCoreVersion>
<FSProductVersion>10.1.0.0</FSProductVersion>
<FSPackageVersion>10.1.0</FSPackageVersion>
<VSAssemblyVersion>15.6.0.0</VSAssemblyVersion>

<RoslynVersion>2.6.0-vs-for-mac-62329-05</RoslynVersion>
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
Expand All @@ -84,26 +76,60 @@
<MicrosoftVisualStudioThreadingVersion>15.3.23</MicrosoftVisualStudioThreadingVersion>
<MicrosoftVisualStudioValidationVersion>15.3.15</MicrosoftVisualStudioValidationVersion>

<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists -->
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
<IntermediateOutputPath Condition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>

<!-- Frozen FSharp.Core package being built with this build -->
<FSharpCore41TargetPackageVersion>4.1.19</FSharpCore41TargetPackageVersion>
<FSharpCore41TargetMajorVersion>4.1</FSharpCore41TargetMajorVersion>

<FSharpCoreFrozenPortablePackageVersion>4.3.0</FSharpCoreFrozenPortablePackageVersion>

<FSharpCoreFrozenPortableTargetPackageVersion>4.3.1</FSharpCoreFrozenPortableTargetPackageVersion>
<FSharpCoreFrozenPortableTargetMajorVersion>4.3</FSharpCoreFrozenPortableTargetMajorVersion>
<!-- Frozen FSharp.Core package -->
<FSharpCoreFrozenPortablePackageVersion>10.1.0</FSharpCoreFrozenPortablePackageVersion>
<FSharpCoreFrozenPortableTargetPackageVersion>10.1.1</FSharpCoreFrozenPortableTargetPackageVersion>
<FSharpCoreFrozenPortableTargetMajorVersion>10.1</FSharpCoreFrozenPortableTargetMajorVersion>

<!-- Nunit -->
<NUnitVersion>3.5.0</NUnitVersion>
<NUnitFullVersion>3.5.0.0</NUnitFullVersion>
<NUnitLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.$(NUnitVersion)\lib\net45</NUnitLibDir>
<NUnitToolsLibDir>$(FSharpSourcesRoot)\..\packages\NUnit.ConsoleRunner\$(NUnitVersion)\tools\</NUnitToolsLibDir>


<!-- Localization -->
<UpdateXlfOnBuild Condition="'$(CI)' != '1'">true</UpdateXlfOnBuild>
<XliffTasksVersion>0.2.0-beta-000076</XliffTasksVersion>

</PropertyGroup>

<PropertyGroup Condition="'$(MicroBuildAssemblyFileLanguage)' == ''">
<MicroBuildAssemblyFileLanguage>fs</MicroBuildAssemblyFileLanguage>
</PropertyGroup>

<PropertyGroup Condition="'$(MicroBuildAssemblyVersion)' == ''">
<MicroBuildAssemblyVersion>$(FSCoreVersion)</MicroBuildAssemblyVersion>

<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion -->
<MicroBuildAssemblyVersion Condition="'$(UseFSharpProductVersion)' == 'true'">$(FSProductVersion)</MicroBuildAssemblyVersion>

<!-- certain delivered F# VS assemblies use a specific MicroBuildAssemblyVersion, otherwise use FSCoreVersion -->
<MicroBuildAssemblyVersion Condition="'$(UseVsMicroBuildAssemblyVersion)' == 'true'">$(VSAssemblyVersion)</MicroBuildAssemblyVersion>
</PropertyGroup>

<PropertyGroup>
<!-- Settings used all the time -->
<Tailcalls>true</Tailcalls>
<TargetDotnetProfile Condition="'$(TargetDotnetProfile)'==''">net40</TargetDotnetProfile>

<!-- Currently always use .NET Framwork proto compiler -->
<ProtoFlavour Condition="'$(ProtoFlavour)' == ''">net40</ProtoFlavour>
<ProjectLanguage Condition="'$(ProjectLanguage)' == ''">FSharp</ProjectLanguage>
<DebugSymbols>true</DebugSymbols>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<BuildToolsTargets45>true</BuildToolsTargets45>
<WarningsAsErrors />
<FX_NO_LOADER Condition=" '$(FX_NO_LOADER)'==''">false</FX_NO_LOADER>

<!-- Always qualify the IntermediateOutputPath by the TargetDotnetProfile if any exists -->
<IntermediateOutputPath>obj\$(Configuration)\$(TargetDotnetProfile)\</IntermediateOutputPath>
<IntermediateOutputPath Condition="'$(PortableProfileBeingReferenced)' != ''">obj\$(Configuration)\$(TargetDotnetProfile)\$(PortableProfileBeingReferenced)\</IntermediateOutputPath>

</PropertyGroup>

<PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/fsharp/FSharp.Build/FSharp.Build.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
<ProjectLanguage>FSharp</ProjectLanguage>
<UseFSharpProductVersion>true</UseFSharpProductVersion>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
<PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/fsharp/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 @@ -3,6 +3,8 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
<ProjectLanguage>FSharp</ProjectLanguage>
<UseFSharpProductVersion>true</UseFSharpProductVersion>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
<PropertyGroup>
Expand Down
2 changes: 2 additions & 0 deletions src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
<ProjectLanguage>FSharp</ProjectLanguage>
<UseFSharpProductVersion>true</UseFSharpProductVersion>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..</FSharpSourcesRoot>
<ProjectLanguage>FSharp</ProjectLanguage>
<UseVsMicroBuildAssemblyVersion>true</UseVsMicroBuildAssemblyVersion>
</PropertyGroup>
<Import Project="$(FSharpSourcesRoot)\FSharpSource.Settings.targets" />
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler.nuget/FSharp.Compiler.nuget.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageTags Condition="'$(PackageTags)' == ''" >Visual F# Compiler FSharp functional programming</PackageTags>
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\coreclr\bin</OutputPath>
<PreReleaseSuffix Condition="'$(PreRelease)' != 'false'">-rtm-$(BuildRevision.Trim())-0</PreReleaseSuffix>
<PackageVersion>4.2.0$(PreReleaseSuffix)</PackageVersion>
<PackageVersion>$(FSPackageVersion)$(PreReleaseSuffix)</PackageVersion>
<PackageProperties>-prop "licenseUrl=$(PackageLicenceUrl)" -prop "version=$(PackageVersion)" -prop "authors=$(PackageAuthors)" -prop "projectUrl=$(PackageProjectUrl)" -prop "tags=$(PackageTags)"</PackageProperties>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Core.nuget/FSharp.Core.4.1.xxx.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<!-- rename to FSharp.Core when done -->
<id>FSharp.Core</id>
<description>
FSharp.Core redistributables from Visual F# 4.1.0
FSharp.Core redistributables from Visual F# 10.1.0
Supported Platforms:
.NET 2.0 (net20)
.NET 4.0 (net40)
Expand Down
Loading