Skip to content

Merge master to release/dev16.2 #6982

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
brettfo merged 51 commits into from
Jun 12, 2019
Merged

Merge master to release/dev16.2 #6982

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
f4bd221
use proto on mac and linux
dsyme Mar 29, 2019
8a4baf3
reduce diff
dsyme Mar 30, 2019
0474a23
reduce diff
dsyme Mar 30, 2019
b96120e
reduce diff
dsyme Mar 30, 2019
cf9147b
reduce diff
dsyme Mar 30, 2019
286c336
reduce diff
dsyme Mar 30, 2019
7a6448e
reduce diff
dsyme Mar 30, 2019
965d3b1
Merge branch 'master' of https://github.com/Microsoft/visualfsharp in…
dsyme Apr 2, 2019
978414c
Merge branch 'master' into proto
KevinRansom Apr 8, 2019
95d94de
integrate master
dsyme Apr 14, 2019
a15ef59
integrate master
dsyme Apr 14, 2019
aed6752
fix build
dsyme Apr 14, 2019
bb78e5f
fix build
dsyme Apr 14, 2019
b88d23c
Merge branch 'fix77' into proto
dsyme Apr 14, 2019
1aa6a41
load right FSHarp.Build
dsyme Apr 15, 2019
058bdc9
publish proto apps
dsyme Apr 15, 2019
688850f
revert test env changes
dsyme Apr 15, 2019
c2c7213
revert testing changes
dsyme Apr 16, 2019
fdcf82a
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 16, 2019
e46dcd5
don't repeat bootstrap
dsyme Apr 16, 2019
75e9cc3
be systematic about verbosity
dsyme Apr 17, 2019
d0f51d7
Merge branch 'proto' of https://github.com/dsyme/visualfsharp into proto
dsyme Apr 17, 2019
63c64ef
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Apr 18, 2019
8f09004
remove verbosity flags
dsyme Apr 24, 2019
5833f0c
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme May 31, 2019
d96345d
fix compiler location (#6917)
KevinRansom Jun 2, 2019
7c39a4f
Remove dead code in Extensions and Pervasive files (#6916)
cartermp Jun 2, 2019
2d7237c
No IVTs for CodeLenses (#6906)
cartermp Jun 2, 2019
e4707c5
Open Implement Interface APIs (#6905)
cartermp Jun 2, 2019
3a3d6ed
Replace AgedLookup with Dictionary in XML doc generation and remove d…
cartermp Jun 2, 2019
b91fa8b
Attributes lists (#6830)
auduchinok Jun 2, 2019
c036b35
Make FSharpAccessibility.IsProtected public, optimize IsPublic proper…
auduchinok Jun 2, 2019
ad5f69e
Replace SynSimplePat list with SynSimplePats in ImplicitCtor (#6845)
auduchinok Jun 2, 2019
45fed83
Reconfigure Legacy MSBuildReferenceResolver to be API-driven (#6898)
cartermp Jun 2, 2019
57969f6
Remove IVT to FSharp.Editor (#6930)
cartermp Jun 2, 2019
d12a626
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Jun 3, 2019
1632239
try align with fsc.fsproj
dsyme Jun 3, 2019
14be767
Don't go looking for MSBuild v12 in SimulatedMSBuildReferenceResolver…
cartermp Jun 3, 2019
a8eb9b1
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Jun 4, 2019
52e0844
try to fix build
dsyme Jun 4, 2019
c96481f
Merge pull request #6380 from dsyme/proto
dsyme Jun 4, 2019
6d989fa
ensure Microsoft.FSharp.NetSdk.props makes it into VisualFSharpFull.v…
brettfo Jun 5, 2019
f72b7b2
split service.fs (#6247)
dsyme Jun 6, 2019
b101514
Update DEVGUIDE.md (#6950)
ShalokShalom Jun 6, 2019
e835edf
Update repo name (#6951)
ShalokShalom Jun 7, 2019
49082d3
Removing CONTRIBUTING.md (#6958)
cartermp Jun 10, 2019
832f2c0
Remove IVT to FSharp.Build (#6970)
cartermp Jun 11, 2019
8e0565f
Don't stop type checking recursive module on unresolved open (#6965)
auduchinok Jun 11, 2019
e556508
Remove IVT to fsi from FSharp.Compiler.Private (#6957)
cartermp Jun 11, 2019
a4cbfe1
enable preview LSP support in VS (#6945)
brettfo Jun 11, 2019
027e8c9
fixed List.map3 misleading error message on different length lists (#…
reacheight Jun 11, 2019
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
Prev Previous commit
Next Next commit
ensure Microsoft.FSharp.NetSdk.props makes it into VisualFSharpFull.v… 
…six (#6942)

* ensure Microsoft.FSharp.NetSdk.props makes it into VisualFSharpFull.vsix

During a build/deploy in VS the target `BeforeBuild` wasn't getting called
on FSharp.Build.fsproj if up-to-date checks passed which meant the .props
file wasn't getting added to the @(None) item group.  The fix is to make
that target depend on `AssignTargetPaths` which is run in both the VS
build as well as the command line build.

* annotate ambiguous function
  • Loading branch information
@brettfo
brettfo authored Jun 5, 2019
commit 6d989fa754c276c3481e304aaabf340e74fe540f
29 changes: 15 additions & 14 deletions FSharpBuild.Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,30 @@
<Import Project="eng\targets\NGenBinaries.targets" />
<Import Project="FSharp.Profiles.props" />

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

<PropertyGroup>
<__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
<__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
<__TargetFileName>@(NoneSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>

<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
<_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>

<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
</PropertyGroup>

<MakeDir
Directories="$(IntermediateOutputPath)"
Condition="!Exists('$(IntermediateOutputPath)')" />
<MakeDir Directories="$(IntermediateOutputPath)"
Condition="!Exists('$(IntermediateOutputPath)')" />
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />

<!-- Make sure it will get cleaned -->
<ItemGroup >
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
</ItemGroup>
</Target>
Expand Down
29 changes: 15 additions & 14 deletions fcs/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<Project>

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

<PropertyGroup>
<__TargetFilePath>@(CopyAndSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
<__TargetFileName>@(CopyAndSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>
<__TargetFilePath>@(NoneSubstituteText->'$(IntermediateOutputPath)%(Filename)%(Extension)')</__TargetFilePath>
<__TargetFileName>@(NoneSubstituteText->'%(Filename)%(Extension)')</__TargetFileName>

<_ReplacementText>$([System.IO.File]::ReadAllText('%(CopyAndSubstituteText.FullPath)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern1)', '%(CopyAndSubstituteText.Replacement1)'))</_ReplacementText>
<_ReplacementText Condition="'%(CopyAndSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(CopyAndSubstituteText.Pattern2)', '%(CopyAndSubstituteText.Replacement2)'))</_ReplacementText>
<_ReplacementText>$([System.IO.File]::ReadAllText('%(NoneSubstituteText.FullPath)'))</_ReplacementText>
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern1)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern1)', '%(NoneSubstituteText.Replacement1)'))</_ReplacementText>
<_ReplacementText Condition="'%(NoneSubstituteText.Pattern2)' != ''">$(_ReplacementText.Replace('%(NoneSubstituteText.Pattern2)', '%(NoneSubstituteText.Replacement2)'))</_ReplacementText>

<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' != ''">%(NoneSubstituteText.CopyToOutputDirectory)</_CopyToOutputDirectory>
<_CopyToOutputDirectory Condition="'%(NoneSubstituteText.CopyToOutputDirectory)' == ''">Never</_CopyToOutputDirectory>
</PropertyGroup>

<MakeDir
Directories="$(IntermediateOutputPath)"
Condition="!Exists('$(IntermediateOutputPath)')" />
<MakeDir Directories="$(IntermediateOutputPath)"
Condition="!Exists('$(IntermediateOutputPath)')" />
<WriteLinesToFile File="$(__TargetFilePath)" Lines="$(_ReplacementText)" Overwrite="true" WriteOnlyWhenDifferent="true" />

<!-- Make sure it will get cleaned -->
<ItemGroup >
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' == 'App.config'" CopyToOutputDirectory="Never" />
<None Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" CopyToOutputDirectory="PreserveNewest" />
<None Include="$(__TargetFilePath)" CopyToOutputDirectory="$(_CopyToOutputDirectory)" />
<FileWrites Include="$(__TargetFilePath)" Condition="'$(__TargetFileName)' != 'App.config'" />
</ItemGroup>
</Target>
Expand Down
4 changes: 2 additions & 2 deletions fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@
<Compile Include="$(FSharpSourcesRoot)\..\tests\service\Program.fs" Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
<Link>Program.fs</Link>
</Compile>
<CopyAndSubstituteText Include="App.config">
<NoneSubstituteText Include="App.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</NoneSubstituteText>
</ItemGroup>
<ItemGroup>
<PackageReference Include="FSharp.Core" Version="$(FcsFSharpCorePkgVersion)" />
Expand Down
2 changes: 1 addition & 1 deletion fcs/build.fsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ let releaseDir = Path.Combine(__SOURCE_DIRECTORY__, "../artifacts/bin/fcs/Releas
let release = LoadReleaseNotes (__SOURCE_DIRECTORY__ + "/RELEASE_NOTES.md")
let isAppVeyorBuild = buildServer = BuildServer.AppVeyor
let isJenkinsBuild = buildServer = BuildServer.Jenkins
let isVersionTag tag = Version.TryParse tag |> fst
let isVersionTag (tag: string) = Version.TryParse tag |> fst
let hasRepoVersionTag = isAppVeyorBuild && AppVeyorEnvironment.RepoTag && isVersionTag AppVeyorEnvironment.RepoTagName
let assemblyVersion = if hasRepoVersionTag then AppVeyorEnvironment.RepoTagName else release.NugetVersion

Expand Down
4 changes: 2 additions & 2 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 @@ -29,13 +29,13 @@
<None Include="Microsoft.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.Portable.FSharp.Targets" CopyToOutputDirectory="PreserveNewest" />
<None Include="Microsoft.FSharp.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
<CopyAndSubstituteText Include="Microsoft.FSharp.NetSdk.props">
<NoneSubstituteText Include="Microsoft.FSharp.NetSdk.props" CopyToOutputDirectory="PreserveNewest">
<TargetFileName>Microsoft.FSharp.NetSdk.props</TargetFileName>
<Pattern1>{{FSharpCoreShippedPackageVersion}}</Pattern1>
<Replacement1>$(FSharpCoreShippedPackageVersion)</Replacement1>
<Pattern2>{{FSharpCorePreviewPackageVersion}}</Pattern2>
<Replacement2>$(FSharpCorePreviewPackageVersion)</Replacement2>
</CopyAndSubstituteText>
</NoneSubstituteText>
<None Include="Microsoft.FSharp.Overrides.NetSdk.targets" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/fsc/fsc.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@
<Link>default.win32manifest</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<CopyAndSubstituteText Include="App.config">
<NoneSubstituteText Include="App.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</NoneSubstituteText>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/fsi/fsi.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<ItemGroup>
<Compile Include="console.fs" />
<Compile Include="fsimain.fs" />
<CopyAndSubstituteText Include="App.config">
<NoneSubstituteText Include="App.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</NoneSubstituteText>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/fsharp/fsiAnyCpu/fsiAnyCpu.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
<ItemGroup>
<Compile Include="..\fsi\console.fs" />
<Compile Include="..\fsi\fsimain.fs" />
<CopyAndSubstituteText Include="App.config">
<NoneSubstituteText Include="App.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</NoneSubstituteText>
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@
<Compile Include="DocumentHighlightsServiceTests.fs">
<Link>Roslyn\DocumentHighlightsServiceTests.fs</Link>
</Compile>
<CopyAndSubstituteText Include="App.config">
<NoneSubstituteText Include="App.config">
<Pattern1>{{FSCoreVersion}}</Pattern1>
<Replacement1>$(FSCoreVersion)</Replacement1>
</CopyAndSubstituteText>
</NoneSubstituteText>
<None Include="app.runsettings" />
</ItemGroup>
<ItemGroup>
Expand Down