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

Commitb914569

Browse files
committed
merge master
2 parents579f31b +4529c8f commitb914569

File tree

577 files changed

+27337
-19713
lines changed

Some content is hidden

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

577 files changed

+27337
-19713
lines changed

‎.vsts-pr.yaml‎

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

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

Lines changed: 2 additions & 9 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
@@ -34,7 +34,7 @@ steps:
3434
inputs:
3535
scriptName:'setup\publish-assets.ps1'
3636
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'))
37+
condition:and(succeeded(), contains(variables['PB_PublishType'], 'myget'))
3838

3939
# Publish packages to Azure Blob Storage
4040
-task:MSBuild@1
@@ -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

‎CONTRIBUTING.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,6 @@ Contributions to this repository will be rigorously policed for quality.
6868

6969
All code submissions should be submitted with regression test cases, and will be subject to peer review by the community and Microsoft. The bar for contributions will be high. This will result in a higher-quality, more stable product.
7070

71-
- We expect contributors to be actively involved in quality assurance.
72-
- We expect contributors to be actively involved in quality assurance.
7371
- We expect contributors to be actively involved in quality assurance.
7472
- Partial, incomplete, or poorly-tested contributions will not be accepted.
7573
- Contributions may be put on hold according to stability, testing, and design-coherence requirements.

‎DEVGUIDE.md‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
#Development Guide
22

3+
##Get the Latest F# Compiler Source Code
4+
5+
Get the latest source code from the master branch by running this git command:
6+
7+
git clone https://github.com/Microsoft/visualfsharp.git
8+
9+
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
10+
11+
git clean -xfd
12+
13+
This will remove any files that are not under version control. This is necessary only if you have already attempted to build the solution or have made other changes that might prevent it from building.
14+
15+
##Installing Dependencies and Building
16+
317
Follow the instructions below to build and develop the F# Compiler, Core Library and tools on Windows, macOS and Linux.
418

519
-[Developing the F# Compiler (Windows)](#developing-the-f-compiler-windows)
@@ -20,10 +34,6 @@ Install
2034

2135
2. The command prompt must have Administrator rights (`Run as Administrator`).
2236

23-
Before running the build scripts, ensure that you have cleaned up the visualfsharp repo by running this git command:
24-
25-
git clean -xfd
26-
2737
On Windows you can build the F# compiler for .NET Framework as follows:
2838

2939
build.cmd
@@ -120,7 +130,8 @@ Testing the .NET Core version of the F# compiler on macOS and Linux is TBD.
120130

121131
To build and test Visual F# IDE Tools, install these requirements:
122132

123-
-[Visual Studio 2017](https://www.visualstudio.com/downloads/)
133+
- Download[Visual Studio 2017](https://www.visualstudio.com/downloads/)
134+
- Launch the Visual Studio Installer
124135
- Under the "Windows" workloads, select ".NET desktop development"
125136
- Select "F# desktop language support" under the optional components
126137
- Under the "Other Toolsets" workloads, select "Visual Studio extension development"
@@ -195,7 +206,11 @@ For **Release**:
195206

196207
vsintegration\update-vsintegration.cmd release
197208

198-
#Notes
209+
##Debugging the F# Compiler
210+
211+
See the "Debugging The Compiler" section of this[article](https://medium.com/@willie.tetlow/f-mentorship-week-1-36f51d3812d4)
212+
213+
##Notes
199214

200215
####Windows: Links to Additional frameworks
201216

@@ -223,15 +238,16 @@ To do this, build the non-buildfromsource version of FSharp.Compiler.Private (sr
223238

224239
.\build net40
225240
copy /y src\fsharp\FSharp.Compiler.Private\obj\release\net40\FSComp.* src\buildfromsource\FSharp.Compiler.Private\
226-
241+
227242
If your changes involve modifying the list of language keywords in any way, (e.g. when implementing a new keyword), the XLF localization files need to be synced with the corresponding resx files. This can be done automatically by running
228243

229244
pushd src\fsharp\FSharp.Compiler.Private
230-
msbuild FSharp.Compiler.Private.fsproj /t:UpdateXlf
231-
popd
245+
msbuild FSharp.Compiler.Private.fsproj /t:UpdateXlf
246+
popd
232247

233248
This only works on Windows/.NETStandard framework, so changing this from any other platform requires editing and syncing all of the XLF files manually.
234249

250+
You can also change build.cmd to default COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES to 1 under ":ARGUMENTS_OK" label.
235251

236252
####Configuring proxy server
237253

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.300-rtm-008707
1+
2.1.400-preview-009197

‎FSharp.sln‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,16 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Tests.FSharpSuite",
3131
EndProject
3232
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.UnitTests","tests\FSharp.Compiler.UnitTests\FSharp.Compiler.UnitTests.fsproj","{A8D9641A-9170-4CF4-8FE0-6DB8C134E1B5}"
3333
EndProject
34-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.Unittests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
34+
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Core.UnitTests","tests\FSharp.Core.UnitTests\FSharp.Core.UnitTests.fsproj","{88E2D422-6852-46E3-A740-83E391DC7973}"
3535
EndProject
3636
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Compiler","Compiler","{3881429D-A97A-49EB-B7AE-A82BA5FE9C77}"
3737
EndProject
3838
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Tools","Tools","{B8DDA694-7939-42E3-95E5-265C2217C142}"
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

‎FSharpBuild.Directory.Build.props‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@
5454

5555
<!-- SDK targets override-->
5656
<PropertyGroupCondition="'$(Configuration)' != 'Proto'">
57-
<ProtoFSharpTargetsShim>$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</ProtoFSharpTargetsShim>
58-
<FSharpTargetsShimCondition="Exists('$(ProtoFSharpTargetsShim)')">$(ProtoFSharpTargetsShim)</FSharpTargetsShim>
57+
<FSharpPropsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props')">$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.props</FSharpPropsShim>
58+
<FSharpTargetsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets')">$(ProtoOutputPath)\Microsoft.FSharp.NetSdk.targets</FSharpTargetsShim>
59+
<FSharpOverridesTargetsShimCondition="Exists('$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets')">$(ProtoOutputPath)\Microsoft.FSharp.Overrides.NetSdk.targets</FSharpOverridesTargetsShim>
5960
</PropertyGroup>
6061

6162
</Project>

‎FSharpBuild.Directory.Build.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
<MessageText="Copying build artifacts to $(FinalOutputPath)" />
3131
<MakeDirDirectories="$(FinalOutputPath);$(FinalIntermediateOutputPath)" />
32-
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)" />
33-
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)" />
32+
<CopySourceFiles="@(OutputFilesToCopy)"DestinationFolder="$(FinalOutputPath)\%(RecursiveDir)" />
33+
<CopySourceFiles="@(IntermediateFilesToCopy)"DestinationFolder="$(FinalIntermediateOutputPath)\%(RecursiveDir)" />
3434
</Target>
3535

3636
<ImportProject="build\targets\AssemblyVersions.props" />

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ build:
3838
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/FSharp.Compiler.Server.Shared/FSharp.Compiler.Server.Shared.fsproj
3939
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsi/Fsi.fsproj
4040
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 src/fsharp/fsiAnyCpu/FsiAnyCPU.fsproj
41-
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.Unittests.fsproj
41+
MONO_ENV_OPTIONS=$(monoopts)$(MSBUILD) /p:Configuration=$(Configuration) /p:TargetDotnetProfile=net40 tests/FSharp.Core.UnitTests/FSharp.Core.UnitTests.fsproj
4242
mkdir -p$(Configuration)/fsharp30/net40/bin
4343
mkdir -p$(Configuration)/fsharp31/net40/bin
4444
mkdir -p$(Configuration)/fsharp40/net40/bin

‎NuGet.Config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
<addkey="myget.org dotnet-buildtools"value="https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json" />
1616
<addkey="myget.org roslyn-tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1717
<addkey="api.nuget.org"value="https://api.nuget.org/v3/index.json" />
18-
<addkey="myget.org roslyn tools"value="https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json" />
1918
<addkey="myget.org roslyn"value="https://dotnet.myget.org/F/roslyn/api/v3/index.json" />
2019
<addkey="myget.org symreader-converter"value="https://dotnet.myget.org/F/symreader-converter/api/v3/index.json" />
2120
</packageSources>

0 commit comments

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