Skip to content

Commit ef4c4d2

Browse files
author
Omar Tawfik
committed
Merge branch 'master' of https://github.com/Microsoft/visualfsharp into roslyn
2 parents 2a01126 + 81063d7 commit ef4c4d2

File tree

26 files changed

+326
-184
lines changed

26 files changed

+326
-184
lines changed

‎build.cmd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,13 @@ if /i '%ARG%' == 'microbuild' (
122122
set BUILD_VS=1
123123
set BUILD_SETUP=1
124124

125-
set TEST_COMPILERUNIT=0
126-
set TEST_NET40_COREUNIT=0
125+
set TEST_COMPILERUNIT=1
126+
set TEST_NET40_COREUNIT=1
127127
set TEST_CORECLR=0
128-
set TEST_PORTABLE_COREUNIT=0
129-
set TEST_VS=0
130-
set TEST_FSHARP_SUITE=0
131-
set TEST_FSHARPQA_SUITE=0
128+
set TEST_PORTABLE_COREUNIT=1
129+
set TEST_VS=1
130+
set TEST_FSHARP_SUITE=1
131+
set TEST_FSHARPQA_SUITE=1
132132
set SKIP_EXPENSIVE_TESTS=1
133133
)
134134

‎packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="FsSrGen" version="2.0.0" targetFramework="net46" />
1515
<package id="MicroBuild.Core" version="0.2.0" />
1616
<package id="MicroBuild.Core.Sentinel" version="1.0.0" />
17-
<package id="MicroBuild.Plugins.SwixBuild" version="1.0.43" />
17+
<package id="MicroBuild.Plugins.SwixBuild" version="1.0.60" />
1818
<package id="WiX.Toolset.2015" version="3.10.0.1503" />
1919
<package id="Microsoft.VisualFSharp.Core.Redist" version="1.0.0" />
2020
<package id="Microsoft.VisualFSharp.Type.Providers.Redist" version="1.0.0" />

‎setup/FSharp.SDK/FSharp.SDK.wixproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Project InitialTargets="CheckPropertiesArePassed" ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
44
<PropertyGroup>
55
<FSharpTreeRoot>$(MSBuildProjectDirectory)\..\..</FSharpTreeRoot>
66
<SetupRootFolder>$(FSharpTreeRoot)\setup</SetupRootFolder>
@@ -64,7 +64,7 @@
6464
<Import Project="$(WixInstallPath)\wix.targets" />
6565
<Import Project="$(FSharpTreeRoot)\src\Microbuild.Settings.targets" />
6666

67-
<Target Name="CheckLocaleIsPassed" BeforeTargets="Build">
67+
<Target Name="CheckPropertiesArePassed">
6868
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
6969
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
7070
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />

‎setup/Swix/Microsoft.FSharp.Dependencies/Microsoft.FSharp.Dependencies.swixproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -26,6 +27,10 @@
2627
<Package Include="Files.swr" />
2728
<Package Include="Dependencies.swr" />
2829
</ItemGroup>
30+
31+
<Target Name="CheckPropertiesArePassed">
32+
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
33+
</Target>
2934

3035
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
3136
<!-- SWIX plugin adds the built vsix to signing automatically -->

‎setup/Swix/Microsoft.FSharp.SDK.Core/Files.swr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ use vs
33
package name=Microsoft.FSharp.SDK.Core
44
version=$(FSharpPackageVersion)
55
vs.package.type=msi
6+
vs.package.installSize=37223424
67

78
vs.payloads
89
vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Core.msi"

‎setup/Swix/Microsoft.FSharp.SDK.Core/Microsoft.FSharp.SDK.Core.swixproj‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -23,6 +24,10 @@
2324
<ItemGroup>
2425
<Package Include="Files.swr" />
2526
</ItemGroup>
27+
28+
<Target Name="CheckPropertiesArePassed">
29+
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
30+
</Target>
2631

2732
<Target Name="GatherBinariesToBeSigned" AfterTargets="Localize">
2833
<!-- MSI is already signed before wrapping it here -->

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Empty.swr‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ use vs
22

33
package name=Microsoft.FSharp.SDK.Resources
44
version=$(FSharpPackageVersion)
5-
vs.package.language=$(LocaleSpecificCulture)
5+
vs.package.language=$(LocaleSpecificCulture)
6+
vs.package.installSize=1

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Files.swr‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package name=Microsoft.FSharp.SDK.Resources
44
version=$(FSharpPackageVersion)
55
vs.package.type=msi
66
vs.package.language=$(LocaleSpecificCulture)
7+
vs.package.installSize=13854720
78

89
vs.payloads
910
vs.payload source="$(BinariesFolder)\msi\Microsoft.FSharp.SDK.Resources.$(LocaleCode).msi"

‎setup/Swix/Microsoft.FSharp.SDK.Resources/Microsoft.FSharp.SDK.Resources.swixproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
3+
<Project InitialTargets="CheckPropertiesArePassed" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<PropertyGroup>
45
<FSharpSourcesRoot>..\..\..\src</FSharpSourcesRoot>
56
<OutputArchitecture>neutral</OutputArchitecture>
@@ -38,11 +39,12 @@
3839
<!-- MSI is already signed before wrapping it here -->
3940
</Target>
4041

41-
<Target Name="CheckLocaleIsPassed" BeforeTargets="Compile">
42+
<Target Name="CheckPropertiesArePassed">
4243
<Error Condition="'$(LocaleCode)' == ''" Text="A 'LocaleCode' property must be passed to the project." />
4344
<Error Condition="'$(LocaleId)' == ''" Text="A 'LocaleId' property must be passed to the project." />
4445
<Error Condition="'$(LocaleParentCulture)' == ''" Text="A 'LocaleParentCulture' property must be passed to the project." />
4546
<Error Condition="'$(LocaleSpecificCulture)' == ''" Text="A 'LocaleSpecificCulture' property must be passed to the project." />
4647
<Error Condition="'$(IsLangPack)' == ''" Text="A 'IsLangPack' property must be passed to the project." />
48+
<Error Condition="'$(FSharpPackageVersion)' == ''" Text="A 'FSharpPackageVersion' property must be passed to the project." />
4749
</Target>
4850
</Project>

‎setup/Swix/Microsoft.FSharp.Vsix.Core/Files.swr‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ package name=Microsoft.FSharp.VSIX.$(VSSku).Core
44
version=$(FSharpPackageVersion)
55
vs.package.type=vsix
66
vs.package.vsixId=VisualFSharp
7+
vs.package.installSize=32108544
8+
9+
vs.dependencies
10+
vs.dependency id=Microsoft.VisualStudio.MinShell
711

812
vs.payloads
9-
vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"
13+
vs.payload source="$(BinariesFolder)\net40\bin\VisualFSharp$(VSSku).vsix"

0 commit comments

Comments
 (0)