Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3ef0544

Browse files
authored
Merge pull requestfsharp#851 from dsyme/i15
integrate visualfsharp master
2 parents76d5288 +b32c5a1 commit3ef0544

File tree

1,784 files changed

+84398
-13819
lines changed

Some content is hidden

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

1,784 files changed

+84398
-13819
lines changed

‎.gitattributes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
*.rtfdiff=astextplain
2222
*.RTFdiff=astextplain
2323

24-
mono/install-shtexteol=lf
2524
mono/launchertexteol=lf
2625
mono/config.maketexteol=lf
26+
targets.maketexteol=lf
2727

2828
*.bsllinguist-vendored=true

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ scripts/*.patch
6363
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
6464
/tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
6565
/tests/Xnet40-fsharpqa-suite-failures.log.*
66+
/tests/fsharp/typeProviders/splitAssemblyTools/provider.dll
67+
/tests/fsharp/typeProviders/splitAssemblyTypeproviders/provider.dll
6668
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
6769
/vsintegration/src/service/FsPkgs/FSharp.Project/FS/ctofiles/
6870
/tests/fsharpqa/Source/CodeGen/EmittedIL/QueryExpressionStepping/Utils.dll
@@ -203,7 +205,6 @@ tests/fsharpqa/Source/*FSharpQA_Failures.lst
203205
*.csproj.user
204206
*.fsproj.user
205207
*.sln.DotSettings.user
206-
*.ide
207208
*.log
208209
*.jrs
209210
*.chk

‎.vsts-ci.yaml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
queue:
2+
name:VSEng-MicroBuildVS2017
3+
timeoutInMinutes:300
4+
demands:
5+
-visualstudio
6+
-DotNetFramework
7+
-msbuild
8+
9+
variables:
10+
MSBuildConfiguration:'Release'
11+
12+
steps:
13+
# Install Signing Plugin
14+
-task:ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
15+
displayName:Install Signing Plugin
16+
inputs:
17+
signType:real
18+
condition:and(succeeded(), in(variables['PB_SignType'], 'test', 'real'))
19+
20+
# Install Swix Plugin
21+
-task:ms-vseng.MicroBuildTasks.32f78468-e895-4f47-962c-58a699361df8.MicroBuildSwixPlugin@1
22+
displayName:Install Swix Plugin
23+
24+
# Run build.cmd
25+
-task:CmdLine@1
26+
displayName:Run build.cmd
27+
inputs:
28+
filename:build.cmd
29+
arguments:microbuild
30+
31+
# Publish nightly package to MyGet
32+
-task:PowerShell@1
33+
displayName:Publish nightly package to MyGet
34+
inputs:
35+
scriptName:'setup\publish-assets.ps1'
36+
arguments:'-binariesPath $(MSBuildConfiguration) -branchName $(Build.SourceBranch) -apiKey $(FSharp.MyGetApiKey)'
37+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'), in(variables['Build.SourceBranchName'], 'master', 'dev15.7', 'dev15.8'))
38+
39+
# Publish packages to Azure Blob Storage
40+
-task:MSBuild@1
41+
displayName:Publish packages to Azure Blob Storage
42+
inputs:
43+
solution:PublishToBlob.proj
44+
msbuildArguments:'/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
45+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
46+
47+
# Run BinSkim
48+
-task:securedevelopmentteam.vss-secure-development-tools.build-task-binskim.BinSkim@3
49+
displayName:Run BinSkim
50+
inputs:
51+
arguments:'analyze "$(MSBuildConfiguration)\*.dll" "$(MSBuildConfiguration)\*.exe" --recurse --output "$(MSBuildConfiguration)\artifacts"'
52+
continueOnError:true
53+
54+
# Create static drop
55+
-task:PublishBuildArtifacts@1
56+
displayName:Create static drop
57+
inputs:
58+
PathtoPublish:'$(MSBuildConfiguration)'
59+
ArtifactName:'$(Build.BuildNumber)'
60+
publishLocation:FilePath
61+
TargetPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)'
62+
Parallel:true
63+
ParallelCount:64
64+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'drop'))
65+
66+
# Publish symbols
67+
-task:PublishSymbols@1
68+
displayName:Publish symbols
69+
inputs:
70+
SymbolsPath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
71+
SearchPattern:'**\*.dll;**\*.exe;**\*.pdb'
72+
SymbolsFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)'
73+
TreatNotIndexedAsWarning:true
74+
SymbolsProduct:'$(Build.DefinitionName)'
75+
SymbolsVersion:'$(Build.BuildNumber)'
76+
continueOnError:true
77+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symbols'))
78+
79+
# Upload VSTS Drop
80+
-task:ms-vseng.MicroBuildTasks.4305a8de-ba66-4d8b-b2d1-0dc4ecbbf5e8.MicroBuildUploadVstsDropFolder@1
81+
displayName:Upload VSTS Drop
82+
inputs:
83+
DropFolder:'$(Build.SourcesDirectory)\$(MSBuildConfiguration)\insertion'
84+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'vsts'))
85+
86+
# Execute cleanup tasks
87+
-task:ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
88+
displayName:Execute cleanup tasks
89+
condition:succeededOrFailed()
90+
91+
# Publish Artifact: MicroBuildOutputs
92+
-task:PublishBuildArtifacts@1
93+
displayName:'Publish Artifact: MicroBuildOutputs'
94+
inputs:
95+
PathtoPublish:'$(Build.StagingDirectory)\MicroBuild\Output'
96+
ArtifactName:MicroBuildOutputs
97+
publishLocation:Container
98+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'microbuild'))
99+
100+
# Publish Symbols to Symweb
101+
-task:ms-vscs-artifact.build-tasks.artifactSymbolTask-1.artifactSymbolTask@0
102+
displayName:Publish symbols to SymWeb
103+
inputs:
104+
symbolServiceURI:'https://microsoft.artifacts.visualstudio.com/DefaultCollection'
105+
sourcePath:'$(DropRoot)\$(Build.DefinitionName)\$(Build.SourceBranchName)\$(Build.BuildNumber)\Symbols'
106+
usePat:false
107+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'symweb'))

‎CHANGELOG-fsharp.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
10.1.1
2+
* Bump versions
3+
4+
10.1.0
5+
* Integrte visualfsharp master
6+
17
10.0.2
28
* Cherry-pickhttps://github.com/Microsoft/visualfsharp/pull/4804
39

‎CHANGELOG-visualfsharp.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,3 +228,4 @@ Includes commits up to `3385e58aabc91368c8e1f551650ba48705aaa285`
228228
[4.0.0]:http://fsharp.org
229229
[3.1.2]:http://blogs.msdn.com/b/fsharpteam/archive/2014/08/20/announcing-the-release-of-visual-f-tools-3-1-2.aspx
230230
[3.1.1]:http://blogs.msdn.com/b/fsharpteam/archive/2014/01/22/announcing-visual-f-3-1-1-and-support-for-desktop-express.aspx
231+

‎FSharp.Compiler.Tools.Nuget/FSharp.Compiler.Tools.nuspec‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
</metadata>
2626
<files>
2727
<!-- use signed FSharp.Core in package-->
28-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.dll"target="tools\FSharp.Core.dll" />
29-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.optdata"target="tools\FSharp.Core.optdata" />
30-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.sigdata"target="tools\FSharp.Core.sigdata" />
31-
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.1.0\FSharp.Core.xml"target="tools\FSharp.Core.xml" />
28+
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.3.0\FSharp.Core.dll"target="tools\FSharp.Core.dll" />
29+
<filesrc="..\lib\bootstrap\signed\.NETFramework\v4.0\4.4.3.0\FSharp.Core.xml"target="tools\FSharp.Core.xml" />
3230
<filesrc="..\Release\net40\bin\fsc.exe"target="tools\fsc.exe" />
3331
<filesrc="..\Release\net40\bin\fsc.exe.config"target="tools\fsc.exe.config" />
3432
<filesrc="..\Release\net40\bin\fsc.xml"target="tools\fsc.xml" />

‎Makefile‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ include $(topsrcdir)mono/config.make
33
.PHONY: restore build build-proto
44

55
restore:
6-
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config
6+
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile ./NuGet.Config
77
chmod u+x packages/FSharp.Compiler.Tools.4.1.27/tools/fsi.exe
88
chmod u+x packages/FsLexYacc.7.0.6/build/fslex.exe
99
chmod u+x packages/FsLexYacc.7.0.6/build/fsyacc.exe
@@ -42,21 +42,23 @@ build:
4242
mkdir -p$(Configuration)/fsharp30/net40/bin
4343
mkdir -p$(Configuration)/fsharp31/net40/bin
4444
mkdir -p$(Configuration)/fsharp40/net40/bin
45+
mkdir -p$(Configuration)/fsharp41/net40/bin
4546
cp -p packages/FSharp.Core.3.0.2/lib/net40/*$(Configuration)/fsharp30/net40/bin
4647
cp -p packages/FSharp.Core.3.1.2.5/lib/net40/*$(Configuration)/fsharp31/net40/bin
4748
cp -p packages/FSharp.Core.4.0.0.1/lib/net40/*$(Configuration)/fsharp40/net40/bin
49+
cp -p packages/FSharp.Core.4.1.18/lib/net40/*$(Configuration)/fsharp41/net40/bin
4850
mkdir -p$(Configuration)/portable7/bin
49-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45/*$(Configuration)/portable7/bin
51+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+netcore45/*$(Configuration)/portable7/bin
5052
mkdir -p$(Configuration)/portable47/bin
51-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+sl5+netcore45/*$(Configuration)/portable47/bin
53+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+sl5+netcore45/*$(Configuration)/portable47/bin
5254
mkdir -p$(Configuration)/portable78/bin
53-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wp8/*$(Configuration)/portable78/bin
55+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+netcore45+wp8/*$(Configuration)/portable78/bin
5456
mkdir -p$(Configuration)/portable259/bin
55-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+netcore45+wpa81+wp8/*$(Configuration)/portable259/bin
57+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+netcore45+wpa81+wp8/*$(Configuration)/portable259/bin
5658
mkdir -p$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
57-
cp -p packages/FSharp.Core.4.1.17/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/*$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
59+
cp -p packages/FSharp.Core.4.1.18/lib/portable-net45+monoandroid10+monotouch10+xamarinios10/*$(Configuration)/monoandroid10+monotouch10+xamarinios10/bin
5860
mkdir -p$(Configuration)/xamarinmacmobile/bin
59-
cp -p packages/FSharp.Core.4.1.17/lib/xamarinmac20/*$(Configuration)/xamarinmacmobile/bin
61+
cp -p packages/FSharp.Core.4.1.18/lib/xamarinmac20/*$(Configuration)/xamarinmacmobile/bin
6062

6163

6264

@@ -80,6 +82,7 @@ install:
8082
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.0 install
8183
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=3.1 install
8284
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.0 install
85+
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=net40 FSharpCoreBackVersion=4.1 install
8386
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable47 install
8487
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable7 install
8588
$(MAKE) -C mono/FSharp.Core TargetDotnetProfile=portable78 install

‎.nuget/NuGet.Config‎renamed to ‎NuGet.Config‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
1111

1212
<!--
13-
<add key="artifacts" value="../artifacts" />
14-
<add key="artifacts" value="../artifacts/4.2" />
13+
<add key="artifacts" value="./artifacts" />
14+
<add key="artifacts" value="./artifacts/4.2" />
1515
<add key="myget.org fsharp-daily" value="https://www.myget.org/F/fsharp-daily/api/v3/index.json" />
1616
<add key="myget.org roslyn-master-nightly" value="https://dotnet.myget.org/F/roslyn-master-nightly/api/v3/index.json" />
1717
<add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
@@ -20,6 +20,7 @@
2020
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
2121
<add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
2222
<add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
23+
<add key="myget.org symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2324
-->
2425
</packageSources>
2526

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,7 @@ This builds the proto compiler, then the library, then the final compiler.
173173
The FSharp.Core.dll produced is only delay-signed (Mono does not require strong names).
174174
If a strong-name signed FSharp.Core.dll is needed then use the one in
175175

176-
lib\bootstrap\signed\.NETFramework\v4.0\4.3.0.0\FSharp.Core.dll
177-
lib\bootstrap\signed\.NETFramework\v4.0\4.3.1.0\FSharp.Core.dll
178-
176+
lib\bootstrap\signed\.NETFramework\v4.0\...
179177

180178
###Building on Linux (Wheezy build)
181179

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.8.0

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp