-
Notifications
You must be signed in to change notification settings - Fork 158
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.
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
[WIP] Run FSharp.Formatting on FCS only #432
Merged
Merged
Changes from 43 commits
Commits
Show all changes
50 commits
Select commit
Hold shift + click to select a range
2a128a6
update paket, packages, and FSharp.Core
cloudRoutine 2af8bfe
update packages
cloudRoutine d835950
additional token categories
cloudRoutine 18b155c
use FCS semantic classification for tokens
cloudRoutine b346b4d
update packages
cloudRoutine d5227c3
update css and load paths
cloudRoutine 1dfe1cb
setup editorconfig
cloudRoutine 4ee32b2
formatting and organization
cloudRoutine 63a52a0
update packages
cloudRoutine c0e9934
more formatting
cloudRoutine bdc4cf4
update test api usage
cloudRoutine fab5861
update project files
cloudRoutine ae51d4a
update paket and bootstrapper
cloudRoutine f113638
working vs and commandline build
cloudRoutine bff1198
update FSharp.Core in /lib/
cloudRoutine 3a66f41
change debug version from portable to full
cloudRoutine fbe9294
Set NUnit to 3.6.0 for FsUnit Compatibility
cloudRoutine ea013da
update fsunit api calls
cloudRoutine 28bba86
parameterize CSS class names
cloudRoutine f99d80d
tweak CSS classes
cloudRoutine 2dc2dc5
update fsunit api calls and paramaterize CSS class usage
cloudRoutine 529c4fb
formatting
cloudRoutine 7301c45
ignore test until FCS supports escaped char colorization
cloudRoutine e0f0df8
remove commented code, formatting
cloudRoutine 33d8c46
fix cli build
cloudRoutine dfd2e28
simplify build.fsx
cloudRoutine e5761c4
fix test xml doc generation
cloudRoutine e7ca53f
temporarily use custom script host
cloudRoutine 53ccadc
ignore lib dir unless forcibly checked in
cloudRoutine a144f6d
update test project layout
cloudRoutine c32937a
update FsUnit api usage
cloudRoutine e84a823
error handling for assembly loading
cloudRoutine a6ed59e
unify tests output dir
cloudRoutine fb09ad0
report loaded assemblies on metadata test failure
cloudRoutine 18d2f3e
update target frameworks
cloudRoutine 4993b17
unify test output into 'tests\bin'
cloudRoutine f4de496
fix pathing in metadata tests
cloudRoutine 3fe0c85
paket magic mode
cloudRoutine 54e4663
update packages
cloudRoutine 4c31049
update redirects, fix some references files
cloudRoutine 89b9091
add magic mode paket.exe (bootstrapper)
cloudRoutine 34737f4
fix build script error and add app.config to MetadataFormat.Tests
matthid 0698e48
ensure dir
matthid 042f949
fix pattern
matthid b443c8e
set newline to lf in editorconfig
cloudRoutine 4fbf4f7
fix metadata tests
cloudRoutine 58bb4d6
yield keyword tokens while parsing ident islands
cloudRoutine d4ce827
match xml doc files case insensitive
cloudRoutine ac6ab34
fix build
matthid f610e5f
trigger build
matthid File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| # top-most EditorConfig file | ||
| root = true | ||
|
|
||
| [*] | ||
| end_of_line = lf | ||
|
|
||
| [*.{fs,fsi,fsx}] | ||
| charset = utf-8 | ||
| indent_style = space | ||
| indent_size = 4 | ||
| trim_trailing_whitespace = true | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,62 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- Enable the restore command to run before builds --> | ||
| <RestorePackages Condition=" '$(RestorePackages)' == '' ">true</RestorePackages> | ||
| <!-- Download Paket.exe if it does not already exist --> | ||
| <DownloadPaket Condition=" '$(DownloadPaket)' == '' ">true</DownloadPaket> | ||
| <PaketToolsPath>$(MSBuildThisFileDirectory)</PaketToolsPath> | ||
| <PaketRootPath>$(MSBuildThisFileDirectory)..\</PaketRootPath> | ||
| <MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath> | ||
| <MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath> | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- Paket command --> | ||
| <PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath> | ||
| <PaketExePath Condition=" '$(PaketExePath)' == '' ">$(PaketToolsPath)paket.exe</PaketExePath> | ||
| <PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath> | ||
| <PaketCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand> | ||
| <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketExePath)</PaketCommand> | ||
| <PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand> | ||
| <PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">mono --runtime=v4.0.30319 $(PaketBootStrapperExePath)</PaketBootStrapperCommand> | ||
| <!-- Commands --> | ||
| <PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences> | ||
| <PaketCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand> | ||
| </PropertyGroup> | ||
|
|
||
| <Choose> <!-- MyProject.fsproj.paket.references has the highest precedence --> | ||
| <When Condition="Exists('$(MSBuildProjectFullPath).paket.references')"> | ||
| <PropertyGroup> | ||
| <PaketReferences>$(MSBuildProjectFullPath).paket.references</PaketReferences> | ||
| </PropertyGroup> | ||
| </When> <!-- MyProject.paket.references --> | ||
| <When Condition="Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')"> | ||
| <PropertyGroup> | ||
| <PaketReferences>$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences> | ||
| </PropertyGroup> | ||
| </When> <!-- paket.references --> | ||
| <When Condition="Exists('$(MSBuildProjectDirectory)\paket.references')"> | ||
| <PropertyGroup> | ||
| <PaketReferences>$(MSBuildProjectDirectory)\paket.references</PaketReferences> | ||
| </PropertyGroup> | ||
| </When> <!-- Set to empty if a reference file isn't found matching one of the 3 format options --> | ||
| <Otherwise> | ||
| <PropertyGroup> | ||
| <PaketReferences></PaketReferences> | ||
| </PropertyGroup> | ||
| </Otherwise> | ||
| </Choose> | ||
|
|
||
| <PropertyGroup> | ||
| <!-- Commands --> | ||
| <PaketReferences Condition="!Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references</PaketReferences> | ||
| <PaketReferences Condition="!Exists('$(MSBuildProjectDirectory)\$(MSBuildProjectName).paket.references')">$(MSBuildProjectDirectory)\paket.references</PaketReferences> | ||
| <PaketReferences Condition="!Exists('$(PaketReferences)')">$(MSBuildStartupDirectory)\paket.references</PaketReferences> | ||
| <PaketReferences Condition="Exists('$(MSBuildProjectFullPath).paket.references')">$(MSBuildProjectFullPath).paket.references</PaketReferences> | ||
| <RestoreCommand>$(PaketCommand) restore --references-files "$(PaketReferences)"</RestoreCommand> | ||
| <DownloadPaketCommand>$(PaketBootStrapperCommand)</DownloadPaketCommand> | ||
| <!-- We need to ensure packages are restored prior to assembly resolve --> | ||
| <BuildDependsOn Condition="$(RestorePackages) == 'true'">RestorePackages; $(BuildDependsOn);</BuildDependsOn> | ||
| </PropertyGroup> | ||
| <Target Name="CheckPrerequisites"> | ||
| <!-- Raise an error if we're unable to locate paket.exe --> | ||
| <Error Condition="'$(DownloadPaket)' != 'true' AND !Exists('$(PaketExePath)')" Text="Unable to locate '$(PaketExePath)'" /> | ||
| <MsBuild Targets="DownloadPaket" Projects="$(MSBuildThisFileFullPath)" Properties="Configuration=NOT_IMPORTANT;DownloadPaket=$(DownloadPaket)" /> | ||
| </Target> | ||
| <Target Name="DownloadPaket"> | ||
| <Exec Command="$(DownloadPaketCommand)" Condition=" '$(DownloadPaket)' == 'true' AND !Exists('$(PaketExePath)')" /> | ||
| </Target> | ||
| <Target Name="RestorePackages" DependsOnTargets="CheckPrerequisites"> | ||
| <Exec Command="$(RestoreCommand)" WorkingDirectory="$(PaketRootPath)" Condition="Exists('$(PaketReferences)')" /> | ||
| <Target Name="RestorePackages"> | ||
| <Exec Command="$(RestoreCommand)" | ||
| IgnoreStandardErrorWarningFormat="true" | ||
| WorkingDirectory="$(PaketRootPath)" | ||
| ContinueOnError="true" | ||
| Condition=" Exists('$(PaketReferences)') AND '$(PaketReferences)' != '' " | ||
| /> | ||
| </Target> | ||
| </Project> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be gitignored? Which editor is this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's supposed to be commited, it's for many many editors,
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks didn't know that :)