Skip to content

Commit 450cc7f

Browse files
committed
integrate file renamings and cleanup from Microsoft/visualfsharp OOB branch
2 parents 56e10a2 + 70e5f02 commit 450cc7f

File tree

114 files changed

+4697
-5211
lines changed

Some content is hidden

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

114 files changed

+4697
-5211
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,5 +123,7 @@ FSharp.Core.Nuget/*.nupkg
123123
*.jrs
124124
*.chk
125125
*.bak
126+
FSharp.Compiler.Tools.Nuget/*.nupkg
127+
FSharp.Core.Nuget/*.nupkg
126128
*.orig
127129
.paket/paket.exe

README.md

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,3 @@ All AppVeyor builds are available using the NuGet feed: https://ci.appveyor.com/
3131

3232
If using Paket, add the source at the top of `paket.dependencies`.
3333

34-
```
35-
source https://www.nuget.org/api/v2
36-
source https://ci.appveyor.com/nuget/fsgit-fsharp-compiler-service
37-
```
38-
39-
See the build history for a list of available versions: https://ci.appveyor.com/project/fsgit/fsharp-compiler-service/history
40-
41-
Here are some options for specifying the dependency:
42-
43-
```
44-
nuget FSharp.Compiler.Service
45-
nuget FSharp.Compiler.Service prerelease
46-
nuget FSharp.Compiler.Service 1.3.1.0
47-
nuget FSharp.Compiler.Service 1.3.1.1-b402
48-
```
49-
50-
Dev Guide
51-
----------
52-
53-
To integrate latest changes from http://github.com/fsharp/fsharp, use
54-
55-
git remote add fsc https://github.com/fsharp/fsharp
56-
git pull fsc master

RELEASE_NOTES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
#### 1.4.0.3 -
2+
* integrate Microsoft/visualfsharp OOB cleanup via fsharp/fsharp
3+
14
#### 1.4.0.2 -
25
* #387 - types and arrays in F# attribute contructor arguments
36

build.fsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,10 @@ Target "BuildVersion" (fun _ ->
5656
// Generate assembly info files with the right version & up-to-date information
5757
Target "AssemblyInfo" (fun _ ->
5858
let fileName = "src/assemblyinfo/assemblyinfo.shared.fs"
59-
// add json info to the informational version
60-
let iv = Text.StringBuilder() // json
61-
iv.Appendf "{\\\"buildVersion\\\":\\\"%s\\\"" buildVersion
62-
iv.Appendf ",\\\"buildDate\\\":\\\"%s\\\"" (buildDate.ToString "yyyy'-'MM'-'dd'T'HH':'mm':'sszzz")
63-
if isAppVeyorBuild then
64-
iv.Appendf ",\\\"gitCommit\\\":\\\"%s\\\"" AppVeyor.AppVeyorEnvironment.RepoCommit
65-
iv.Appendf ",\\\"gitBranch\\\":\\\"%s\\\"" AppVeyor.AppVeyorEnvironment.RepoBranch
66-
iv.Appendf "}"
6759
CreateFSharpAssemblyInfo fileName
6860
[ Attribute.Version assemblyVersion
6961
Attribute.FileVersion assemblyVersion
70-
Attribute.InformationalVersion iv.String ]
62+
Attribute.InformationalVersion assemblyVersion ]
7163
)
7264

7365
// --------------------------------------------------------------------------------------

lib/bootstrap/4.0/FSharp.Core.dll

-1.07 MB
Binary file not shown.
-8 KB
Binary file not shown.

lib/bootstrap/4.0/FSharp.SRGen.Build.Tasks.dll.config

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

lib/bootstrap/4.0/FSharp.SRGen.targets

Lines changed: 0 additions & 73 deletions
This file was deleted.
-20.5 KB
Binary file not shown.

lib/bootstrap/4.0/FsLexYacc.Build.Tasks.dll.config

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

0 commit comments

Comments
 (0)