Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
e6d46b9
Generate source for .resx files on build. (#3607)
brettfo Sep 22, 2017
65819cc
fix order of file items in FSharp.Core
brettfo Sep 22, 2017
01eab69
Fix build.cmd for certain always-shown errors (like "unable to find r…
abelbraaksma Sep 25, 2017
d08a5ff
Fixing JaroWinkler tests with InvariantCulture and fixing async tests…
abelbraaksma Sep 25, 2017
383e2f6
update to System.Collections.Immutable 1.3.1 (#3641)
dsyme Sep 25, 2017
51a19b9
fix assembly reference
dsyme Sep 25, 2017
46df51f
[WIP] Adds optimized emit for int64 constants (#3620)
ChrSteinert Sep 25, 2017
c2406fd
fix assembly reference (#3646)
dsyme Sep 25, 2017
af82cbe
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 25, 2017
bd9b37c
Remove a few more build warnings (#3647)
dsyme Sep 26, 2017
1b72733
move BuildFromSource projects to their own directory
brettfo Sep 26, 2017
9da66d1
Adds tests for emitted IL for new Int64 constants. (#3650)
ChrSteinert Sep 26, 2017
b96f64b
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Sep 27, 2017
780b6c4
Enable FS as prefix and ignore invalid values for warnings (#3631)
KevinRansom Sep 27, 2017
34e669c
Fix stack overflow on assembly resolution (#3658)
KevinRansom Sep 29, 2017
20573b7
Add impl files to file check results (#3659)
vasily-kirichenko Oct 2, 2017
4a1e31b
This adds backup, restore, coloration and many more checks to the upd…
abelbraaksma Oct 2, 2017
faf693a
add LanguageServiceProfiling project to internals visible to list of …
vasily-kirichenko Oct 2, 2017
88fc657
bump FCS version (#3676)
dsyme Oct 2, 2017
4c244da
Parsing improvements: no reactor, add parsing options, error severity…
auduchinok Oct 3, 2017
841dc2c
whitespace cleanup (#3682)
dsyme Oct 3, 2017
d29d6e2
whitespace and docs (#3684)
dsyme Oct 3, 2017
1d59de8
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
5d177a4
Preserve XML docs for in-memory project references (#3683)
dsyme Oct 3, 2017
9893e72
whitespace and comments (#3686)
dsyme Oct 3, 2017
47ce8af
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
c76b29e
cherry pick two PRs from FCS (#3687)
dsyme Oct 3, 2017
245a40b
Merge branch 'master' of http://github.com/Microsoft/visualfsharp
dsyme Oct 3, 2017
e29e235
try to fix travis
dsyme Oct 3, 2017
940fcb0
try to fix travis
dsyme Oct 3, 2017
585b9b4
list dependencies
dsyme Oct 3, 2017
20b9173
no obsolete pdb in nuget
dsyme Oct 3, 2017
4723695
list dependencies
dsyme Oct 3, 2017
9a64db8
cherry pick of fsharp/fsharp change
dsyme Oct 4, 2017
4635c8d
Merge branch 'master' of http://github.com/Microsoft/visualfsharp int…
dsyme Oct 4, 2017
7926274
bump FCS version number (#3688)
dsyme Oct 4, 2017
948f7e7
Update FSharp.Compiler.Service.MSBuild.v12.nuspec
dsyme Oct 4, 2017
d94167f
fix FCS nuget on windows
dsyme Oct 4, 2017
83208f8
fix-resource (#3690)
dsyme Oct 4, 2017
d39cba7
Bump FSharp.Compiler.Tools to 4.1.27 and align mono build files (#3693)
dsyme Oct 4, 2017
81d162c
update FCS doc generation (#3694)
dsyme Oct 4, 2017
db2e4e2
update DEVGUIDE to add addiitional steps before running build (#3725)
eriawan Oct 10, 2017
6ecacd7
Split templates out into a seperate vsix (#3720)
KevinRansom Oct 10, 2017
57b2cfe
Merge branch 'vs2017-rtm' into master
KevinRansom Oct 10, 2017
b714ecb
fix merge that picked up the wrong refactoring (#3732)
brettfo Oct 11, 2017
481427f
Don't suggest variables explicitly marked unused (#3706)
drvink Oct 12, 2017
68f4187
Parameterise rc location (#3744)
KevinRansom Oct 13, 2017
503d167
undo #3536 (#3746)
dsyme Oct 13, 2017
8adfa2f
Do not commit autocompletion on bracket or pipe chars (#3718)
cartermp Oct 14, 2017
860c812
Fix completion inside last part of long ident (#3711)
vasily-kirichenko Oct 14, 2017
baf0c53
make SimplifyNameEachItemDelay zero (#3708)
vasily-kirichenko Oct 14, 2017
44e3e0d
Fix IL types constructors nice print (#3754)
vasily-kirichenko Oct 15, 2017
3634f0c
Fix typo in README (#3760)
piperchester Oct 16, 2017
80b8c9e
Add WriteCodeFragment build task (#3702)
brettfo Oct 17, 2017
4029f19
fix IndexOutOfRange exception in advanced completion (#3753)
vasily-kirichenko Oct 17, 2017
72e28fe
Add `IsRelativeNameResolvableFromSymbol` (#3722)
Krzysztof-Cieslak Oct 17, 2017
0095fde
Fix de-duplication of module names in ParseAndCheckFileInProject (FCS…
dsyme Oct 17, 2017
e5762fd
typeof in quotations.fs now respects ByRef types (#3450)
krauthaufen Oct 17, 2017
452f21a
don't display contents of <InternalsVisibleTo> nodes in the solution …
brettfo Oct 18, 2017
b05e17a
Fix editor service sample (#3770)
Krzysztof-Cieslak Oct 18, 2017
064d804
Make "GitHub linguist" happy (#3771)
forki Oct 18, 2017
a0918f2
Activate FCS build on CI (#3769)
forki Oct 20, 2017
bf4d5f7
Merge remote-tracking branch 'upstream/vs2017-rtm' into merge-vs2017-…
brettfo Oct 19, 2017
00ca671
Make the FCS build work (#3781)
forki Oct 20, 2017
129a9b0
Update netci.groovy (#3787)
forki Oct 20, 2017
cb33a22
Merge pull request #3780 from Microsoft/merge-vs2017-rtm-to-master
brettfo Oct 20, 2017
9153474
bump
KevinRansom Oct 20, 2017
cc4b678
Correct groovy file
KevinRansom Oct 21, 2017
f375d8d
don't update project info if the source file collection is empty (#37…
brettfo Oct 21, 2017
2e0af3d
remove duplicate reference to FSharp.Core (#3796)
brettfo Oct 21, 2017
8d5176a
Update netci.groovy (#3800)
forki Oct 23, 2017
28ea9a5
set execute for fcs build.sh (#3801)
forki Oct 23, 2017
28f0262
Update netci.groovy (#3805)
forki Oct 24, 2017
716b8e9
P2p references (#3777)
KevinRansom Oct 24, 2017
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
4 changes: 3 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,6 @@ launcher.in text eol=lf
config.make.in text eol=lf
targets.make text eol=lf
configure.ac text eol=lf
Makefile.in text eol=lf
Makefile.in text eol=lf

*.bsl linguist-vendored=true
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -118,3 +118,6 @@ source_link.json
/VSRelease/net40/bin
System.ValueTuple.dll
tests/fsharpqa/testenv/bin/System.ValueTuple.dll
*/.fake
/fcs/packages/
*/paket-files/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# The F# Language, Library, and Visual F# Tools Repository

You are invited to help producing future releases of the F# language compiler, library, and tools. This repository enables development on Linux, macOS and Windows, along with some automated CI testing for these.
You are invited to help produce future releases of the F# language compiler, library, and tools. This repository enables development on Linux, macOS and Windows, along with some automated CI testing for these.

* [About F#](http://fsharp.org)
* [Testimonials](http://fsharp.org/testimonials)
Expand Down
235 changes: 234 additions & 1 deletion VisualFSharp.sln

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions build-everything.proj
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@

<ItemGroup Condition="'$(TEST_NET40_COREUNIT_SUITE)'=='1'" >
<ProjectsWithNet40 Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
<ProjectsWithNet40 Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
</ItemGroup>

<ItemGroup Condition="'$(TEST_CORECLR_COREUNIT_SUITE)'=='1'">
<ProjectsWithCoreClr Include="src/fsharp/FSharp.Core.Unittests/FSharp.Core.Unittests.fsproj"/>
<ProjectsWithCoreClr Include="src/fsharp/FSharp.Build.UnitTests/FSharp.Build.UnitTests.fsproj"/>
</ItemGroup>

<ItemGroup Condition="'$(TEST_NET40_COMPILERUNIT_SUITE)'=='1'" >
Expand Down
6 changes: 6 additions & 0 deletions build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -828,6 +828,9 @@ if "%TEST_NET40_COREUNIT_SUITE%" == "1" (
set OUTPUTARG=--output:"!OUTPUTFILE!"
)

echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!

echo "!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
"!NUNIT3_CONSOLE!" --verbose --framework:V4.0 --result:"!XMLFILE!;format=nunit3" !OUTPUTARG! !ERRORARG! --work:"!FSCBINPATH!" "!FSCBINPATH!\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!

Expand All @@ -851,6 +854,9 @@ if "%TEST_CORECLR_COREUNIT_SUITE%" == "1" (
set OUTPUTFILE=!RESULTSDIR!\test-coreclr-coreunit-output.log
set ERRORFILE=!RESULTSDIR!\test-coreclr-coreunit-errors.log

echo "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.Unittests\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!
"%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Build.Unittests\FSharp.Build.Unittests.dll" !WHERE_ARG_NUNIT!

echo "%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!
"%_dotnetcliexe%" "%~dp0tests\testbin\!BUILD_CONFIG!\coreclr\FSharp.Core.Unittests\FSharp.Core.Unittests.dll" !WHERE_ARG_NUNIT!

Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -388,7 +388,7 @@ printf "\n"

build_status "Done with arguments, starting preparation"

_msbuildexe="xbuild"
_msbuildexe="msbuild"
msbuildflags=""

# Perform any necessary setup and system configuration prior to running builds.
Expand Down Expand Up @@ -466,7 +466,7 @@ if [ "$BUILD_PROTO" = '1' ]; then
{ pushd ./lkg/fsc && eval "$_dotnetexe publish project.json --no-build -o ${_scriptdir}Tools/lkg -r $_architecture" && popd; } || failwith "dotnet publish failed"
{ pushd ./lkg/fsi && eval "$_dotnetexe publish project.json --no-build -o ${_scriptdir}Tools/lkg -r $_architecture" && popd; } || failwith "dotnet publish failed"

{ printeval "$_msbuildexe $msbuildflags src/fsharp-proto-build.proj"; } || failwith "compiler proto build failed"
{ printeval "$_msbuildexe $msbuildflags src/fsharp-proto-build.proj /p:Configuration=Proto"; } || failwith "compiler proto build failed"

# { printeval "$_ngenexe install Proto/net40/bin/fsc-proto.exe /nologo"; } || failwith "NGen of proto failed"
else
Expand Down
225 changes: 225 additions & 0 deletions fcs/.paket/Paket.Restore.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Prevent dotnet template engine to parse this file -->
<!--/-:cnd:noEmit-->
<PropertyGroup>
<!-- make MSBuild track this file for incremental builds. -->
<!-- ref https://blogs.msdn.microsoft.com/msbuild/2005/09/26/how-to-ensure-changes-to-a-custom-target-file-prompt-a-rebuild/ -->
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<!-- Mark that this target file has been loaded. -->
<IsPaketRestoreTargetsFileLoaded>true</IsPaketRestoreTargetsFileLoaded>
<PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath>
<PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath>
<PaketRestoreCacheFile>$(PaketRootPath)paket-files\paket.restore.cached</PaketRestoreCacheFile>
<PaketLockFilePath>$(PaketRootPath)paket.lock</PaketLockFilePath>
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
<!-- Paket command -->
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
<PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath>
<PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
<PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>

<!-- Disable automagic references for F# dotnet sdk -->
<!-- This will not do anything for other project types -->
<!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md -->
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
</PropertyGroup>

<Target Name="PaketRestore" BeforeTargets="_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreGraphWalkPerFramework;CollectPackageReferences" >

<!-- Step 1 Check if lockfile is properly restored -->
<PropertyGroup>
<PaketRestoreRequired>true</PaketRestoreRequired>
<NoWarn>$(NoWarn);NU1603</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="Exists('$(PaketRestoreCacheFile)') ">
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketRestoreCacheFile)'))</PaketRestoreCachedHash>
<PaketRestoreLockFileHash>$([System.IO.File]::ReadAllText('$(PaketLockFilePath)'))</PaketRestoreLockFileHash>
<PaketRestoreRequired>true</PaketRestoreRequired>
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
</PropertyGroup>

<!-- Do a global restore if required -->
<Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
<Exec Command='$(PaketCommand) restore' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />

<!-- Step 2 Detect project specific changes -->
<PropertyGroup>
<PaketReferencesCachedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).paket.references.cached</PaketReferencesCachedFilePath>
<!-- MyProject.fsproj.paket.references has the highest precedence -->
<PaketOriginalReferencesFilePath>$(MSBuildProjectFullPath).paket.references</PaketOriginalReferencesFilePath>
<!-- MyProject.paket.references -->
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketOriginalReferencesFilePath>
<!-- paket.references -->
<PaketOriginalReferencesFilePath Condition=" !Exists('$(PaketOriginalReferencesFilePath)')">$(MSBuildProjectDirectory)\paket.references</PaketOriginalReferencesFilePath>
<PaketResolvedFilePath>$(MSBuildProjectDirectory)\obj\$(MSBuildProjectFile).$(TargetFramework).paket.resolved</PaketResolvedFilePath>
<PaketRestoreRequired>true</PaketRestoreRequired>
<PaketRestoreRequiredReason>references-file-or-cache-not-found</PaketRestoreRequiredReason>
</PropertyGroup>

<!-- Step 2 a Detect changes in references file -->
<PropertyGroup Condition="Exists('$(PaketOriginalReferencesFilePath)') AND Exists('$(PaketReferencesCachedFilePath)') ">
<PaketRestoreCachedHash>$([System.IO.File]::ReadAllText('$(PaketReferencesCachedFilePath)'))</PaketRestoreCachedHash>
<PaketRestoreReferencesFileHash>$([System.IO.File]::ReadAllText('$(PaketOriginalReferencesFilePath)'))</PaketRestoreReferencesFileHash>
<PaketRestoreRequiredReason>references-file</PaketRestoreRequiredReason>
<PaketRestoreRequired Condition=" '$(PaketRestoreReferencesFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
</PropertyGroup>

<PropertyGroup Condition="!Exists('$(PaketOriginalReferencesFilePath)') AND !Exists('$(PaketReferencesCachedFilePath)') ">
<!-- If both don't exist there is nothing to do. -->
<PaketRestoreRequired>false</PaketRestoreRequired>
</PropertyGroup>

<!-- Step 2 b detect relevant changes in project file (new targetframework) -->
<PropertyGroup Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' ">
<PaketRestoreRequired>true</PaketRestoreRequired>
<PaketRestoreRequiredReason>target-framework '$(TargetFramework)'</PaketRestoreRequiredReason>
</PropertyGroup>

<!-- Step 3 Restore project specific stuff if required -->
<Message Condition=" '$(PaketRestoreRequired)' == 'true' " Importance="low" Text="Detected a change ('$(PaketRestoreRequiredReason)') in the project file '$(MSBuildProjectFullPath)', calling paket restore" />
<Exec Command='$(PaketCommand) restore --project "$(MSBuildProjectFullPath)"' Condition=" '$(PaketRestoreRequired)' == 'true' " ContinueOnError="false" />

<!-- This shouldn't actually happen, but just to be sure. -->
<Error Condition=" !Exists('$(PaketResolvedFilePath)') AND '$(TargetFramework)' != '' " Text="A paket file for the framework '$(TargetFramework)' is missing. Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />

<!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
<ReadLinesFromFile Condition="Exists('$(PaketResolvedFilePath)')" File="$(PaketResolvedFilePath)" >
<Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
</ReadLinesFromFile>

<ItemGroup Condition=" Exists('$(PaketResolvedFilePath)') AND '@(PaketReferencesFileLines)' != '' " >
<PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
</PaketReferencesFileLinesInfo>
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
</PackageReference>
</ItemGroup>

<PropertyGroup>
<RestoreConfigFile>$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).NuGet.Config</RestoreConfigFile>
</PropertyGroup>

</Target>

<Target Name="PaketDisableDirectPack" AfterTargets="_IntermediatePack" BeforeTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
<PropertyGroup>
<ContinuePackingAfterGeneratingNuspec>false</ContinuePackingAfterGeneratingNuspec>
</PropertyGroup>
</Target>

<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
<PropertyGroup>
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
<UseNewPack>false</UseNewPack>
<UseNewPack Condition=" '$(NuGetToolVersion)' != '4.0.0' ">true</UseNewPack>
</PropertyGroup>

<ItemGroup>
<_NuspecFiles Include="$(BaseIntermediateOutputPath)*.nuspec"/>
</ItemGroup>

<Exec Command='$(PaketCommand) fix-nuspecs files "@(_NuspecFiles)" project-file "$(PaketProjectFile)" ' Condition="@(_NuspecFiles) != ''" />

<ConvertToAbsolutePath Condition="@(_NuspecFiles) != ''" Paths="@(_NuspecFiles)">
<Output TaskParameter="AbsolutePaths" PropertyName="NuspecFileAbsolutePath" />
</ConvertToAbsolutePath>

<!-- Call Pack -->
<PackTask Condition="$(UseNewPack)"
PackItem="$(PackProjectInputFile)"
PackageFiles="@(_PackageFiles)"
PackageFilesToExclude="@(_PackageFilesToExclude)"
PackageVersion="$(PackageVersion)"
PackageId="$(PackageId)"
Title="$(Title)"
Authors="$(Authors)"
Description="$(Description)"
Copyright="$(Copyright)"
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
LicenseUrl="$(PackageLicenseUrl)"
ProjectUrl="$(PackageProjectUrl)"
IconUrl="$(PackageIconUrl)"
ReleaseNotes="$(PackageReleaseNotes)"
Tags="$(PackageTags)"
DevelopmentDependency="$(DevelopmentDependency)"
BuildOutputInPackage="@(_BuildOutputInPackage)"
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
TargetFrameworks="@(_TargetFrameworks)"
AssemblyName="$(AssemblyName)"
PackageOutputPath="$(PackageOutputAbsolutePath)"
IncludeSymbols="$(IncludeSymbols)"
IncludeSource="$(IncludeSource)"
PackageTypes="$(PackageType)"
IsTool="$(IsTool)"
RepositoryUrl="$(RepositoryUrl)"
RepositoryType="$(RepositoryType)"
SourceFiles="@(_SourceFiles->Distinct())"
NoPackageAnalysis="$(NoPackageAnalysis)"
MinClientVersion="$(MinClientVersion)"
Serviceable="$(Serviceable)"
FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
NuspecOutputPath="$(BaseIntermediateOutputPath)"
IncludeBuildOutput="$(IncludeBuildOutput)"
BuildOutputFolder="$(BuildOutputTargetFolder)"
ContentTargetFolders="$(ContentTargetFolders)"
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
NuspecFile="$(NuspecFileAbsolutePath)"
NuspecBasePath="$(NuspecBasePath)"
NuspecProperties="$(NuspecProperties)"/>

<PackTask Condition="! $(UseNewPack)"
PackItem="$(PackProjectInputFile)"
PackageFiles="@(_PackageFiles)"
PackageFilesToExclude="@(_PackageFilesToExclude)"
PackageVersion="$(PackageVersion)"
PackageId="$(PackageId)"
Title="$(Title)"
Authors="$(Authors)"
Description="$(Description)"
Copyright="$(Copyright)"
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
LicenseUrl="$(PackageLicenseUrl)"
ProjectUrl="$(PackageProjectUrl)"
IconUrl="$(PackageIconUrl)"
ReleaseNotes="$(PackageReleaseNotes)"
Tags="$(PackageTags)"
TargetPathsToAssemblies="@(_TargetPathsToAssemblies->'%(FinalOutputPath)')"
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
TargetFrameworks="@(_TargetFrameworks)"
AssemblyName="$(AssemblyName)"
PackageOutputPath="$(PackageOutputAbsolutePath)"
IncludeSymbols="$(IncludeSymbols)"
IncludeSource="$(IncludeSource)"
PackageTypes="$(PackageType)"
IsTool="$(IsTool)"
RepositoryUrl="$(RepositoryUrl)"
RepositoryType="$(RepositoryType)"
SourceFiles="@(_SourceFiles->Distinct())"
NoPackageAnalysis="$(NoPackageAnalysis)"
MinClientVersion="$(MinClientVersion)"
Serviceable="$(Serviceable)"
AssemblyReferences="@(_References)"
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
NuspecOutputPath="$(BaseIntermediateOutputPath)"
IncludeBuildOutput="$(IncludeBuildOutput)"
BuildOutputFolder="$(BuildOutputTargetFolder)"
ContentTargetFolders="$(ContentTargetFolders)"
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
NuspecFile="$(NuspecFileAbsolutePath)"
NuspecBasePath="$(NuspecBasePath)"
NuspecProperties="$(NuspecProperties)"/>
</Target>
<!--/+:cnd:noEmit-->
</Project>
Binary file removed fcs/.paket/paket.bootstrapper.exe
Binary file not shown.
Binary file added fcs/.paket/paket.exe
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -607,6 +607,12 @@
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fs">
<Link>Service/ExternalSymbol.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fsi">
<Link>Service/QuickParse.fsi</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fs">
<Link>Service/QuickParse.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fsi">
<Link>Service/service.fsi</Link>
Expand Down
6 changes: 6 additions & 0 deletions fcs/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,12 @@
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\ExternalSymbol.fs">
<Link>Service/ExternalSymbol.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fsi">
<Link>Service/QuickParse.fsi</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\QuickParse.fs">
<Link>Service/QuickParse.fs</Link>
</Compile>
<Compile Include="$(FSharpSourcesRoot)\fsharp\vs\service.fsi">
<Link>Service/service.fsi</Link>
Expand Down
Loading