Skip to content

Commit bc5d628

Browse files
author
Omar Tawfik
committed
Merge latest from master
2 parents d24486e + d61e67f commit bc5d628

File tree

174 files changed

+14126
-6405
lines changed

Some content is hidden

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

174 files changed

+14126
-6405
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,4 @@ Although the primary focus of this repo is F# for Windows and the Visual Studio
9494
Keep up with the Visual F# Team and the development of the Visual F# Tools by following us [@VisualFSharp](https://twitter.com/VisualFSharp) or subscribing to our [team blog](http://blogs.msdn.com/b/fsharpteam/).
9595

9696

97+

‎TESTGUIDE.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,17 @@ Default is `ci`
3333

3434
The F# tests are split as follows:
3535

36-
* [FSharp Suite](tests\fsharp) - Older suite with broad coverage of mainline compiler and runtime scenarios.
36+
* [FSharp Suite](tests/fsharp) - Older suite with broad coverage of mainline compiler and runtime scenarios.
3737

38-
* [FSharpQA Suite](tests\fsharpqa\source) - Broad and deep coverage of a variety of compiler, runtime, and syntax scenarios.
38+
* [FSharpQA Suite](tests/fsharpqa/Source) - Broad and deep coverage of a variety of compiler, runtime, and syntax scenarios.
3939

40-
* [FSharp.Core.Unittests](src\fsharp\FSharp.Core.Unittests) - Validation of the core F# types and the public surface area of `FSharp.Core.dll`.
40+
* [FSharp.Core.Unittests](src/fsharp/FSharp.Core.Unittests) - Validation of the core F# types and the public surface area of `FSharp.Core.dll`.
4141

42-
* [FSharp.Compiler.Unittests](src\fsharp\FSharp.Compiler.Unittests) - Validation of compiler internals.
42+
* [FSharp.Compiler.Unittests](src/fsharp/FSharp.Compiler.Unittests) - Validation of compiler internals.
4343

44-
* [VisualFSharp.UnitTests](vsintegration\src\unittests) - Visual F# Tools IDE Unit Test Suite
44+
* [VisualFSharp.UnitTests](vsintegration/tests/unittests) - Visual F# Tools IDE Unit Test Suite
4545
This suite exercises a wide range of behaviors in the F# Visual Studio project system and language service.
4646

47-
4847
## More Details
4948

5049
### FSharp Suite

‎build-everything.proj‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
11
<!-- 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. -->
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
33

4-
<ItemGroup Condition="'$(BUILD_NET40)'=='1'">
4+
<ItemGroup Condition="'$(BUILD_NET40)'=='1' or '$(BUILD_ALL)'=='1'">
55
<ProjectsWithDefaultFramework Include="src/fsharp-library-build.proj" />
66
<ProjectsWithDefaultFramework Include="src/fsharp-compiler-build.proj" />
77
</ItemGroup>
88

99
<ItemGroup>
10-
<ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_NET40_COREUNIT)'=='1'" />
11-
<ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1'" />
12-
<ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj" Condition="'$(TEST_FSHARP_SUITE)'=='1'" />
10+
<ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_NET40_COREUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
11+
<ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
12+
<ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj" Condition="'$(TEST_FSHARP_SUITE)'=='1' or '$(BUILD_ALL)'=='1'" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectsWithPortableFramework Include="src/fsharp-library-build.proj" Condition="'$(BUILD_PORTABLE)'=='1'"/>
17-
<ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1'" />
16+
<ProjectsWithPortableFramework Include="src/fsharp-library-build.proj" Condition="'$(BUILD_PORTABLE)'=='1' or '$(BUILD_ALL)'=='1'"/>
17+
<ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1' or '$(BUILD_ALL)'=='1'" />
1818
</ItemGroup>
1919

20-
<ItemGroup Condition="'$(BUILD_VS)'=='1'">
20+
<ItemGroup Condition="'$(BUILD_VS)'=='1' or '$(BUILD_ALL)'=='1'">
2121
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
2222
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
2323
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
2424
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1'" />
28+
<ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1' or '$(BUILD_ALL)'=='1'" />
2929
</ItemGroup>
3030

31-
<ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
31+
<ItemGroup Condition="'$(BUILD_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'">
3232
<ProjectsWithCoreClr Include="src/fsharp-library-build.proj" />
3333
<ProjectsWithCoreClr Include="src/fsharp-compiler-build.proj" />
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1'" />
37+
<ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1' or '$(BUILD_ALL)'=='1'" />
3838
</ItemGroup>
3939

40-
<ItemGroup>
41-
<SetupProjects Include="setup/fsharp-setup-build.proj" Condition="'$(BUILD_SETUP)'=='1'" />
40+
<ItemGroup Condition="'$(BUILD_SETUP)'=='1' or '$(BUILD_ALL)'=='1'">
41+
<SetupProjects Include="setup/fsharp-setup-build.proj" />
4242
</ItemGroup>
4343

4444
<Target Name="Build">
@@ -48,7 +48,7 @@
4848
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
4949
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
5050
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
51-
<MSBuild Projects="@(SetupProjects)" Targets="Build" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
51+
<MSBuild Projects="@(SetupProjects)" Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration)" />
5252
</Target>
5353

5454
<Target Name="Rebuild">
@@ -58,7 +58,7 @@
5858
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
5959
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
6060
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
61-
<MSBuild Projects="@(SetupProjects)" Targets="Rebuild" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
61+
<MSBuild Projects="@(SetupProjects)" Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration)" />
6262
</Target>
6363

6464
<Target Name="Clean">
@@ -68,6 +68,6 @@
6868
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable78" />
6969
<MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration);TargetFramework=portable259" />
7070
<MSBuild Projects="@(ProjectsWithCoreClr)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
71-
<MSBuild Projects="@(SetupProjects)" Targets="Clean" BuildInParallel="true" Properties="Configuration=$(Configuration)" />
71+
<MSBuild Projects="@(SetupProjects)" Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration)" />
7272
</Target>
7373
</Project>

‎build.cmd‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,32 @@ if /i '%ARG%' == 'ci_part1' (
150150
set BUILD_VS=1
151151

152152
set TEST_COMPILERUNIT=1
153-
set TEST_NET40_COREUNIT=1
154-
set TEST_PORTABLE_COREUNIT=1
153+
set TEST_NET40_COREUNIT=0
154+
set TEST_PORTABLE_COREUNIT=0
155155
set TEST_CORECLR=0
156-
set TEST_TAGS=
156+
set TEST_FSHARPQA_SUITE=1
157+
set TEST_FSHARP_SUITE=0
157158
set TEST_VS=1
159+
set TEST_TAGS=
158160
)
159161

160162
if /i '%ARG%' == 'ci_part2' (
161163
set BUILD_PROTO=1
162164
set SKIP_EXPENSIVE_TESTS=1
163165
set BUILD_CORECLR=1
164166
set BUILD_PORTABLE=1
167+
168+
set TEST_COMPILERUNIT=0
169+
set TEST_NET40_COREUNIT=1
170+
set TEST_PORTABLE_COREUNIT=1
165171
set TEST_CORECLR=1
166-
set TEST_FSHARPQA_SUITE=1
172+
set TEST_FSHARPQA_SUITE=0
167173
set TEST_FSHARP_SUITE=1
174+
set TEST_VS=0
175+
set TEST_TAGS=
168176
)
169177

178+
170179
if /i '%ARG%' == 'coreclr' (
171180
set BUILD_CORECLR=1
172181
set TEST_CORECLR=1

setup/Common.Wix.Properties.wxs renamed to setup/FSharp.SDK/Common.Wix.Properties.wxs

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,58 +2,15 @@
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. -->
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
44

5-
<!-- Common Properties -->
6-
<Fragment>
7-
<PropertyRef Id="NETFRAMEWORK40FULLINSTALLROOTDIR"/>
8-
<Condition Message="This application requires .NET Framework. Please install the .NET Framework then run this installer again.">
9-
<![CDATA[Installed OR NETFRAMEWORK40FULLINSTALLROOTDIR]]>
10-
</Condition>
11-
</Fragment>
12-
135
<!-- Common Variables -->
146
<Fragment>
157
<?define LangLCID = $(fsharp.localeToId($(var.Lang))) ?>
168
<?define LangCulture = $(fsharp.localeToCulture($(var.Lang))) ?>
179
</Fragment>
1810

19-
<!-- Common Registry Keys -->
20-
<Fragment>
21-
<Property Id="VS15_ROOT_FOLDER" Secure="yes">
22-
<RegistrySearch Id="SearchForVS15RootPath" Root="HKLM" Key="Software\Microsoft\VisualStudio\SxS\VS7" Name="15.0" Type="raw" />
23-
</Property>
24-
<Condition Message="Visual Studio 15.0 Installation not found">
25-
<![CDATA[VS15_ROOT_FOLDER]]>
26-
</Condition>
27-
28-
<Property Id="MSBUILD15_ROOT_FOLDER" Secure="yes">
29-
<RegistrySearch Id="SearchForMSBUILD15RootPath" Root="HKLM" Key="Software\Microsoft\MSBuild\ToolsVersions\15.0" Name="MSBuildToolsRoot" Type="raw" />
30-
</Property>
31-
<Condition Message="MSBuild 15.0 Installation not found">
32-
<![CDATA[MSBUILD15_ROOT_FOLDER]]>
33-
</Condition>
34-
</Fragment>
35-
3611
<!-- Common Folders -->
3712
<Fragment>
3813
<Directory Id="TARGETDIR" Name="SourceDir">
39-
<Directory Id="VS15_ROOT_FOLDER" Name="VS15_ROOT_FOLDER">
40-
<Directory Id="VS15_Common7" Name="Common7">
41-
<Directory Id="VS15_Common7_IDE" Name="IDE">
42-
<Directory Id="VS15_Common7_IDE_PublicAssemblies" Name="PublicAssemblies" />
43-
</Directory>
44-
</Directory>
45-
</Directory>
46-
47-
<Directory Id="MSBUILD15_ROOT_FOLDER" Name="MSBUILD15_ROOT_FOLDER">
48-
<Directory Id="MSBuild_Microsoft" Name="Microsoft">
49-
<Directory Id="MSBuild_Microsoft_VisualStudio" Name="VisualStudio">
50-
<Directory Id="MSBuild_Microsoft_VisualStudio_v15.0" Name="v15.0">
51-
<Directory Id="MSBuild_Microsoft_VisualStudio_v15.0_FSharp" Name="FSharp" />
52-
</Directory>
53-
</Directory>
54-
</Directory>
55-
</Directory>
56-
5714
<Directory Id="ProgramFilesFolder" Name="Program Files">
5815
<Directory Id="ReferenceAssemblies" Name="Reference Assemblies">
5916
<Directory Id="ReferenceAssemblies_Microsoft" Name="Microsoft">

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,13 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<Compile Include="$(SetupRootFolder)\Common.Wix.Properties.wxs" />
42+
<Compile Include="Common.Wix.Properties.wxs" />
4343

4444
<Compile Include="FSharp.SDK.wxs" />
4545

4646
<Compile Include="component-groups\Redist_ManagedFiles.wxs" />
4747
<Compile Include="component-groups\Compiler_SDK.wxs" />
4848
<Compile Include="component-groups\Compiler_OtherResources.wxs" />
49-
<Compile Include="component-groups\Compiler_PublicAssemblies.wxs" />
5049
<Compile Include="component-groups\Langpack_ManagedFiles.wxs" />
5150
</ItemGroup>
5251

@@ -68,6 +67,6 @@
6867
<MsiPath Include="$(OutDir)$(OutputName).msi" />
6968
</ItemGroup>
7069

71-
<Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\insertion\$(Lang)\%(Filename)%(Extension)')" />
70+
<Copy SourceFiles="@(MsiPath)" DestinationFiles="@(MsiPath->'$(SetupRootFolder)\..\$(Configuration)\msi\%(Filename).$(Lang)%(Extension)')" />
7271
</Target>
7372
</Project>

‎setup/FSharp.SDK/FSharp.SDK.wxs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
<ComponentGroupRef Id="Compiler_SDK" />
3131
<ComponentGroupRef Id="Compiler_OtherResources" />
32-
<ComponentGroupRef Id="Compiler_PublicAssemblies" />
3332
</Feature>
3433

3534
<Feature Id="Langpack_Feature"

‎setup/FSharp.SDK/component-groups/Compiler_OtherResources.wxs‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,14 @@
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
44

55
<Fragment>
6-
<PropertyRef Id="VS15_ROOT_FOLDER" />
7-
<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
8-
96
<ComponentGroup Id="Compiler_OtherResources">
107

11-
<ComponentRef Id="Compiler_OtherResources_Microsoft.FSharp.Shim.targets" />
12-
<ComponentRef Id="Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets" />
138
<ComponentRef Id="Compiler_OtherResources_Redist.txt" />
149
<ComponentRef Id="Compiler_OtherResources_ThirdPartyNotices.txt" />
1510
<ComponentRef Id="Compiler_OtherResources_FSharp_eula.$(var.Lang).rtf" />
1611

1712
</ComponentGroup>
18-
19-
<DirectoryRef Id="MSBuild_Microsoft_VisualStudio_v15.0_FSharp">
20-
<Component Id="Compiler_OtherResources_Microsoft.FSharp.Shim.targets" Guid="$(fsharp.guid(Compiler_OtherResources_Microsoft.FSharp.Shim.targets, $(var.Lang)))">
21-
<File Id="Compiler_OtherResources_Microsoft.FSharp.Shim.targets" Name="Microsoft.FSharp.targets" Source="$(var.BinariesDir)\setup\resources\Microsoft.FSharp.Shim.targets" />
22-
</Component>
23-
<Component Id="Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets" Guid="$(fsharp.guid(Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets, $(var.Lang)))">
24-
<File Id="Compiler_OtherResources_Microsoft.Portable.FSharp.Shim.targets" Name="Microsoft.Portable.FSharp.targets" Source="$(var.BinariesDir)\setup\resources\Microsoft.Portable.FSharp.Shim.targets" />
25-
</Component>
26-
</DirectoryRef>
27-
13+
2814
<DirectoryRef Id="ReferenceAssemblies_Microsoft_FSharp">
2915
<Component Id="Compiler_OtherResources_Redist.txt" Guid="$(fsharp.guid(Compiler_OtherResources_Redist.txt, $(var.Lang)))">
3016
<File Id="Compiler_OtherResources_Redist.txt" Source="$(var.FSharpCoreRedistDir)\content\Redist.txt" />

‎setup/FSharp.SDK/component-groups/Compiler_PublicAssemblies.wxs‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎setup/FSharp.SDK/component-groups/Compiler_SDK.wxs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:NetFx="http://schemas.microsoft.com/wix/NetFxExtension">
44

55
<Fragment>
6-
<PropertyRef Id="VS15_ROOT_FOLDER" />
7-
<PropertyRef Id="MSBUILD15_ROOT_FOLDER" />
8-
96
<ComponentGroup Id="Compiler_SDK">
107

118
<ComponentRef Id="Compiler_SDK_FSharp.Core.dll" />

0 commit comments

Comments
 (0)