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

Commit6819e1c

Browse files
authored
Merge pull requestfsharp#875 from dsyme/i16
Integrate visualfsharp master
2 parents15bd454 +2c4431f commit6819e1c

File tree

148 files changed

+3177
-1289
lines changed

Some content is hidden

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

148 files changed

+3177
-1289
lines changed

‎.travis.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ mono:
1111
-latest
1212
-5.10.0
1313
-5.8.0
14-
-5.0.1
1514

1615
install:
1716

‎.vsts-pr.yaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
phases:
2+
-phase:Linux
3+
queue:
4+
name:Hosted Linux Preview
5+
timeoutInMinutes:90
6+
parallel:2
7+
matrix:
8+
release_default:
9+
_command:./mono/cibuild.sh
10+
_args:release
11+
release_fcs:
12+
_command:./fcs/build.sh
13+
_args:Build
14+
steps:
15+
-script:$(_command) $(_args)
16+
-task:PublishBuildArtifacts@1
17+
inputs:
18+
PathtoPublish:'$(Build.SourcesDirectory)/tests/TestResults'
19+
ArtifactName:'Linux $(_command) $(_args)'
20+
publishLocation:Container
21+
continueOnError:true
22+
condition:failed()
23+
24+
-phase:Windows
25+
queue:
26+
name:Hosted VS2017
27+
timeoutInMinutes:90
28+
parallel:7
29+
matrix:
30+
ci_part1:
31+
_command:build.cmd
32+
_args:release ci_part1
33+
ci_part2:
34+
_command:build.cmd
35+
_args:release ci_part2
36+
ci_part3:
37+
_command:build.cmd
38+
_args:release ci_part3
39+
ci_part4:
40+
_command:build.cmd
41+
_args:release ci_part4
42+
debug_default:
43+
_command:build.cmd
44+
_args:debug
45+
net40_no_vs:
46+
_command:build.cmd
47+
_args:release net40
48+
release_fcs:
49+
_command:fcs\build.cmd
50+
_args:TestAndNuget
51+
steps:
52+
-script:$(_command) $(_args)
53+
-task:PublishBuildArtifacts@1
54+
inputs:
55+
PathtoPublish:'$(Build.SourcesDirectory)\tests\TestResults'
56+
ArtifactName:'Windows $(_command) $(_args)'
57+
publishLocation:Container
58+
continueOnError:true
59+
condition:failed()

‎.vsts-ci.yaml‎renamed to ‎.vsts-signed.yaml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
queue:
22
name:VSEng-MicroBuildVS2017
33
timeoutInMinutes:300
4-
demands:
4+
demands:
55
-visualstudio
66
-DotNetFramework
77
-msbuild
@@ -44,13 +44,6 @@ steps:
4444
msbuildArguments:'/t:Build /p:ExpectedFeedUrl=$(PB_PublishBlobFeedUrl) /p:AccountKey=$(PB_PublishBlobFeedKey) /p:ManifestBranch=$(SourceBranch) /p:ManifestCommit=$(SourceVersion) /p:ManifestBuildId=$(OfficialBuildId)'
4545
condition:and(succeeded(), contains(variables['PB_PublishType'], 'blob'))
4646

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-
5447
# Create static drop
5548
-task:PublishBuildArtifacts@1
5649
displayName:Create static drop

‎CHANGELOG-fsharp.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
10.1.2
2+
* Bump versions and integrate visualfsharp master
3+
14
10.1.1
25
* Bump versions
36

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
<metadata>
44
<id>FSharp.Compiler.Tools</id>
55
<version>0.0.0</version>
6-
<title>FSharp.Compiler.Tools for F# 4.1</title>
6+
<title>FSharp.Compiler.Tools for F# 4.5</title>
77
<authors>F# Software Foundation</authors>
88
<owners>F# Software Foundation</owners>
99
<licenseUrl>https://github.com/fsharp/fsharp/blob/master/LICENSE</licenseUrl>
1010
<projectUrl>https://github.com/fsharp/fsharp</projectUrl>
1111
<iconUrl>http://fsharp.org/img/logo.png</iconUrl>
1212
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1313
<description>
14-
FSharp.Compiler.Tools for F# 4.1
14+
FSharp.Compiler.Tools for F# 4.5
1515

1616
FSharp.Compiler.Tools built by F# Software Foundation
1717
This package includes the F# compiler (fsc.exe), F# Interactive (fsi.exe, fsiAnyCpu.exe)
@@ -20,7 +20,7 @@
2020
NOTE: the compiler executes with .NET Framework and/or Mono. It does not execute with .NET Core.
2121
For a compiler that executes with .NET Core use the .NET Core SDK, which includes an F# compiler.
2222
</description>
23-
<summary>FSharp.Compiler.Tools for F# 4.1 - This package includes the F# compiler and F# Interactive.</summary>
23+
<summary>FSharp.Compiler.Tools for F# 4.5 - This package includes the F# compiler and F# Interactive.</summary>
2424
<tags>F#, FSharp, FSharp.Core, fsi, fsc</tags>
2525
</metadata>
2626
<files>
@@ -45,9 +45,8 @@
4545
<filesrc="..\Release\net40\bin\FSharp.Build.xml"target="tools\FSharp.Build.xml" />
4646
<filesrc="..\Release\net40\bin\System.Collections.Immutable.dll"target="tools\System.Collections.Immutable.dll" />
4747
<filesrc="..\Release\net40\bin\System.Reflection.Metadata.dll"target="tools\System.Reflection.Metadata.dll" />
48+
<filesrc="..\Release\net40\bin\System.IO.Compression.dll"target="tools\System.IO.Compression.dll" />
4849
<filesrc="..\Release\net40\bin\System.ValueTuple.dll"target="tools\System.ValueTuple.dll" />
49-
<filesrc="..\Release\net40\bin\Microsoft.DiaSymReader.dll"target="tools\Microsoft.DiaSymReader.dll" />
50-
<filesrc="..\Release\net40\bin\Microsoft.DiaSymReader.PortablePdb.dll"target="tools\Microsoft.DiaSymReader.PortablePdb.dll" />
5150

5251
<!-- Microsoft.FSharp.Targets : Must be used un any distribution of F# for Mono+Linux or any case-sensitive file system using MSBuild-->
5352
<!-- Microsoft.FSharp.Targets or Microsoft.FSharp.targets : Used in the Visual F# Tools distribution (on Windows it doesn't matter).-->

‎FSharp.sln‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{B8DDA694
3939
EndProject
4040
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Libraries","Libraries","{3058BC79-8E79-4645-B05D-48CC182FA8A6}"
4141
EndProject
42+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="fsharpqafiles","tests\fsharpqa\fsharpqafiles.csproj","{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}"
43+
EndProject
4244
Global
4345
GlobalSection(SolutionConfigurationPlatforms) =preSolution
4446
Debug|Any CPU=Debug|Any CPU
@@ -181,6 +183,17 @@ Global
181183
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|Any CPU.Build.0=Release|Any CPU
182184
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.ActiveCfg=Release|Any CPU
183185
{88E2D422-6852-46E3-A740-83E391DC7973}.Release|x86.Build.0=Release|Any CPU
186+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Debug|Any CPU.ActiveCfg=Debug|x86
187+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Debug|x86.ActiveCfg=Debug|x86
188+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Debug|x86.Build.0=Debug|x86
189+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|Any CPU.ActiveCfg=Debug|x86
190+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|Any CPU.Build.0=Debug|x86
191+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|x86.ActiveCfg=Debug|x86
192+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Proto|x86.Build.0=Debug|x86
193+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|Any CPU.ActiveCfg=Debug|x86
194+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|Any CPU.Build.0=Debug|x86
195+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|x86.ActiveCfg=Debug|x86
196+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA}.Release|x86.Build.0=Debug|x86
184197
EndGlobalSection
185198
GlobalSection(SolutionProperties) =preSolution
186199
HideSolutionNode =FALSE
@@ -197,5 +210,9 @@ Global
197210
{C163E892-5BF7-4B59-AA99-B0E8079C67C4} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
198211
{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
199212
{88E2D422-6852-46E3-A740-83E391DC7973} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
213+
{AAAAD274-696A-49EC-AAAA-F870BE91AAAA} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
214+
EndGlobalSection
215+
GlobalSection(ExtensibilityGlobals) =postSolution
216+
SolutionGuid ={BD5177C7-1380-40E7-94D2-7768E1A8B1B8}
200217
EndGlobalSection
201218
EndGlobal

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<add key="myget.org dotnet-buildtools" value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1919
<add key="myget.org roslyn-tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
2020
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
21-
<add key="myget.org roslyn tools" value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
2221
<add key="myget.org roslyn" value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2322
<add key="myget.org symreader-converter" value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2423
-->

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ Choose a different branch name as necessary. Then choose a visualfsharp commit
208208

209209
but if you run into trouble reset and try again at a specific hash. Then remove stripped files:
210210

211-
git rm -fr --ignore-unmatch vsintegration setup tests/fsharpqa tests/service TESTGUIDE.md src/buildfromsource* fcs netci.groovy src/fsharp/FSharp.Compiler.nuget scripts/dotnet-install.sh before_install.sh build.cmd build.sh
211+
git rm -fr --ignore-unmatch vsintegration setup tests/fsharpqa tests/service TESTGUIDE.md src/buildfromsource* fcs netci.groovy src/fsharp/FSharp.Compiler.nuget scripts/dotnet-install.sh before_install.sh build.cmd build.sh src/fsharp/FSharp.Compiler.Private src/fsharp/FSharp.Core.nuget src/fsharp/Fsc/project.json src/fsharp/fsi/project.json tests/EndToEndBuildTests tests/FSharp.Core.UnitTests/project.json DotnetCLIToolsVersion.txt DEVGUIDE.md FSharpBuild.Directory.Build.targets VisualFSharp.sln src/fsharp/FSharp.Build/project.json
212212

213213
then
214214

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.8.0
1+
2.9.0-beta8-63208-01

‎build-everything.proj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<ItemGroupCondition="'$(BUILD_VS)'=='1'">
3131
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-src-build.proj" />
3232
<ProjectsWithNet40Include="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj" />
33-
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
3433
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
34+
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
3535
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
3636
</ItemGroup>
3737

0 commit comments

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