Skip to content

Commit 3040aa2

Browse files
brettfobrettfo
authored
Merge pull request #6982 from dotnet/merges/master-to-release/dev16.2
Merge master to release/dev16.2
2 parents 3de631a + 027e8c9 commit 3040aa2

File tree

111 files changed

+4111
-3265
lines changed

Some content is hidden

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

111 files changed

+4111
-3265
lines changed

‎CONTRIBUTING.md‎

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

‎DEVGUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Get the latest source code from the master branch by running this git command:
66

7-
git clone https://github.com/Microsoft/visualfsharp.git
7+
git clone https://github.com/dotnet/fsharp.git
88

99
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
1010

‎FSharp.sln‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ EndProject
1616
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Interactive.Settings", "src\fsharp\FSharp.Compiler.Interactive.Settings\FSharp.Compiler.Interactive.Settings.fsproj", "{649FA588-F02E-457C-9FCF-87E46407481E}"
1717
EndProject
1818
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "fsi", "src\fsharp\fsi\fsi.fsproj", "{D0E98C0D-490B-4C61-9329-0862F6E87645}"
19-
ProjectSection(ProjectDependencies) = postProject
20-
{649FA588-F02E-457C-9FCF-87E46407481E} = {649FA588-F02E-457C-9FCF-87E46407481E}
21-
EndProjectSection
2219
EndProject
2320
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharpSuite.Tests", "tests\fsharp\FSharpSuite.Tests.fsproj", "{C163E892-5BF7-4B59-AA99-B0E8079C67C4}"
2421
EndProject

‎FSharpBuild.Directory.Build.props‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@
1111
<PropertyGroup>
1212
<FSharpSourcesRoot>$(RepoRoot)src</FSharpSourcesRoot>
1313
<SymStoreDirectory>$(ArtifactsDir)\SymStore</SymStoreDirectory>
14-
<ProtoOutputPath Condition="'$(OS)' != 'Unix'">$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
15-
<ProtoOutputPath Condition="'$(OS)' == 'Unix'">$(ArtifactsDir)/fsc/Proto/netcoreapp2.1</ProtoOutputPath>
14+
<ProtoOutputPath>$(ArtifactsDir)\Bootstrap</ProtoOutputPath>
1615
<ValueTupleImplicitPackageVersion>4.4.0</ValueTupleImplicitPackageVersion>
1716
<WarningsAsErrors>1182;0025;$(WarningsAsErrors)</WarningsAsErrors>
1817
</PropertyGroup>
@@ -96,10 +95,10 @@
9695

9796
<!-- SDK targets override -->
9897
<PropertyGroup Condition="'$(Configuration)' != 'Proto' AND '$(DisableCompilerRedirection)'!='true' AND Exists('$(ProtoOutputPath)')">
99-
<FSharpTargetsPath>$(ProtoOutputPath)\Microsoft.FSharp.Targets</FSharpTargetsPath>
100-
<FSharpPropsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
101-
<FSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
102-
<FSharpOverridesTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
98+
<FSharpTargetsPath>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Targets</FSharpTargetsPath>
99+
<FSharpPropsShim>$(ProtoOutputPath)\fsc\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
100+
<FSharpTargetsShim>$(ProtoOutputPath)\fsc\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
101+
<FSharpOverridesTargetsShim>$(ProtoOutputPath)\fsc\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
103102
</PropertyGroup>
104103

105104
</Project>

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,30 @@
55
<Import Project="eng\targets\NGenBinaries.targets" />
66
<Import Project="FSharp.Profiles.props" />
77

8-
<Target Name="CopyAndSubstituteTextFiles"
9-
Inputs="@(CopyAndSubstituteText)"
10-
Outputs="@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
11-
BeforeTargets="BeforeBuild">
8+
<Target Name="NoneSubstituteTextFiles"
9+
Inputs="@(NoneSubstituteText)"
10+
Outputs="@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')"
11+
BeforeTargets="AssignTargetPaths;BeforeBuild">
1212

1313
<PropertyGroup>
14-
<__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
15-
<__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
14+
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
15+
<__TargetFileName>@(NoneSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
1616

17-
<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
18-
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
19-
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
17+
<_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
18+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
19+
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>
20+
21+
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
22+
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
2023
</PropertyGroup>
2124

22-
<MakeDir
23-
Directories="$(IntermediateOutputPath)"
24-
Condition="!Exists('$(IntermediateOutputPath)')" />
25+
<MakeDir Directories="$(IntermediateOutputPath)"
26+
Condition="!Exists('$(IntermediateOutputPath)')" />
2527
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />
2628

2729
<!-- Make sure it will get cleaned -->
2830
<ItemGroup >
29-
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
30-
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
31+
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
3132
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
3233
</ItemGroup>
3334
</Target>

‎FSharpTests.Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232

3333
<!-- SDK targets override -->
3434
<PropertyGroup>
35-
<_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'net40'">net472</_FSharpBuildTargetFramework>
36-
<_FSharpBuildTargetFramework Condition="'$(FSharpTestCompilerVersion)' == 'coreclr'">netcoreapp2.1</_FSharpBuildTargetFramework>
37-
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\FSharp.Build\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
35+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'!='Core'">net472</_FSharpBuildTargetFramework>
36+
<_FSharpBuildTargetFramework Condition="'$(MSBuildRuntimeType)'=='Core'">netcoreapp2.1</_FSharpBuildTargetFramework>
37+
<_FSharpBuildBinPath>$(MSBuildThisFileDirectory)artifacts\bin\fsc\$(Configuration)\$(_FSharpBuildTargetFramework)</_FSharpBuildBinPath>
3838

3939
<FSharpBuildAssemblyFile>$(_FSharpBuildBinPath)\FSharp.Build.dll</FSharpBuildAssemblyFile>
4040

‎TESTGUIDE.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ To run tests, use variations such as the following, depending on which test suit
1010
build.cmd vs test
1111
build.cmd all test
1212

13-
You can also submit pull requests to http://github.com/Microsoft/visualfsharp and run the tests via continuous integration. Most people do wholesale testing that way.
13+
You can also submit pull requests to https://github.com/dotnet/fsharp and run the tests via continuous integration. Most people do wholesale testing that way.
1414

1515
## Prerequisites
1616

‎VisualFSharp.sln‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageSer
158158
EndProject
159159
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.LanguageServer.UnitTests", "tests\FSharp.Compiler.LanguageServer.UnitTests\FSharp.Compiler.LanguageServer.UnitTests.fsproj", "{AAF2D233-1C38-4090-8FFA-F7C545625E06}"
160160
EndProject
161+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSharp.Editor.Helpers", "vsintegration\src\FSharp.Editor.Helpers\FSharp.Editor.Helpers.csproj", "{79255A92-ED00-40BA-9D64-12FCC664A976}"
162+
EndProject
161163
Global
162164
GlobalSection(SolutionConfigurationPlatforms) = preSolution
163165
Debug|Any CPU = Debug|Any CPU
@@ -912,6 +914,18 @@ Global
912914
{AAF2D233-1C38-4090-8FFA-F7C545625E06}.Release|Any CPU.Build.0 = Release|Any CPU
913915
{AAF2D233-1C38-4090-8FFA-F7C545625E06}.Release|x86.ActiveCfg = Release|Any CPU
914916
{AAF2D233-1C38-4090-8FFA-F7C545625E06}.Release|x86.Build.0 = Release|Any CPU
917+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
918+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Debug|Any CPU.Build.0 = Debug|Any CPU
919+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Debug|x86.ActiveCfg = Debug|Any CPU
920+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Debug|x86.Build.0 = Debug|Any CPU
921+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Proto|Any CPU.ActiveCfg = Release|Any CPU
922+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Proto|Any CPU.Build.0 = Release|Any CPU
923+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Proto|x86.ActiveCfg = Release|Any CPU
924+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Proto|x86.Build.0 = Release|Any CPU
925+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|Any CPU.ActiveCfg = Release|Any CPU
926+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|Any CPU.Build.0 = Release|Any CPU
927+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|x86.ActiveCfg = Release|Any CPU
928+
{79255A92-ED00-40BA-9D64-12FCC664A976}.Release|x86.Build.0 = Release|Any CPU
915929
EndGlobalSection
916930
GlobalSection(SolutionProperties) = preSolution
917931
HideSolutionNode = FALSE
@@ -986,6 +1000,7 @@ Global
9861000
{8EC30B2E-F1F9-4A98-BBB5-DD0CF6C84DDC} = {647810D0-5307-448F-99A2-E83917010DAE}
9871001
{60BAFFA5-6631-4328-B044-2E012AB76DCA} = {B8DDA694-7939-42E3-95E5-265C2217C142}
9881002
{AAF2D233-1C38-4090-8FFA-F7C545625E06} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
1003+
{79255A92-ED00-40BA-9D64-12FCC664A976} = {4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
9891004
EndGlobalSection
9901005
GlobalSection(ExtensibilityGlobals) = postSolution
9911006
SolutionGuid = {48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

‎eng/Build.ps1‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ function Print-Usage() {
6868
Write-Host ""
6969
Write-Host "Actions:"
7070
Write-Host " -restore Restore packages (short: -r)"
71+
Write-Host " -norestore Don't restore packages"
7172
Write-Host " -build Build main solution (short: -b)"
7273
Write-Host " -rebuild Rebuild main solution"
7374
Write-Host " -pack Build NuGet packages, VS insertion manifests and installer"
@@ -106,6 +107,7 @@ function Process-Arguments() {
106107
Print-Usage
107108
exit 0
108109
}
110+
$script:nodeReuse = $False;
109111

110112
if ($testAll) {
111113
$script:testDesktop = $True
@@ -143,7 +145,7 @@ function Process-Arguments() {
143145
}
144146

145147
function Update-Arguments() {
146-
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc.exe")) {
148+
if (-Not (Test-Path "$ArtifactsDir\Bootstrap\fsc\fsc.exe")) {
147149
$script:bootstrap = $True
148150
}
149151
}
@@ -177,7 +179,6 @@ function BuildSolution() {
177179
/p:Publish=$publish `
178180
/p:ContinuousIntegrationBuild=$ci `
179181
/p:OfficialBuildId=$officialBuildId `
180-
/p:BootstrapBuildPath=$bootstrapDir `
181182
/p:QuietRestore=$quietRestore `
182183
/p:QuietRestoreBinaryLog=$binaryLog `
183184
/p:TestTargetFrameworks=$testTargetFrameworks `
@@ -211,7 +212,7 @@ function UpdatePath() {
211212
}
212213

213214
function VerifyAssemblyVersions() {
214-
$fsiPath = Join-Path $ArtifactsDir "bin\fsi\Proto\net472\fsi.exe"
215+
$fsiPath = Join-Path $ArtifactsDir "bin\fsi\Proto\net472\publish\fsi.exe"
215216

216217
# Only verify versions on CI or official build
217218
if ($ci -or $official) {

0 commit comments

Comments
 (0)