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

Commit9721405

Browse files
authored
Merge branch 'dev16.0' into merges/dev16.0-preview1-to-dev16.0
2 parents9c833d0 +cf98786 commit9721405

File tree

515 files changed

+7601
-4072
lines changed

Some content is hidden

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

515 files changed

+7601
-4072
lines changed

‎DEVGUIDE.md‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ See the "Debugging The Compiler" section of this [article](https://medium.com/@w
230230
- We use the proto compiler to compile the source for`FSharp.Core.dll` in this distribution.
231231
- We use the proto compiler to compile the source for`FSharp.Compiler.dll`,`fsc.exe`,`fsi.exe`, and other binaries found in this distribution.
232232

233-
####Updating FSComp.fs
233+
####Updating FSComp.fs, FSComp.resx and XLF
234234

235235
If you change error messages you may need to update FSComp.fs in`src\buildfromsource\FSharp.Compiler.Private`.
236236

@@ -239,6 +239,14 @@ To do this, build the non-buildfromsource version of FSharp.Compiler.Private (sr
239239
.\build net40
240240
copy /y src\fsharp\FSharp.Compiler.Private\obj\release\net40\FSComp.* src\buildfromsource\FSharp.Compiler.Private\
241241

242+
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
243+
244+
pushd src\fsharp\FSharp.Compiler.Private
245+
msbuild FSharp.Compiler.Private.fsproj /t:UpdateXlf
246+
popd
247+
248+
This only works on Windows/.NETStandard framework, so changing this from any other platform requires editing and syncing all of the XLF files manually.
249+
242250
You can also change build.cmd to default COPY_FSCOMP_RESOURCE_FOR_BUILD_FROM_SOURCES to 1 under ":ARGUMENTS_OK" label.
243251

244252
####Configuring proxy server
@@ -251,11 +259,6 @@ If you are behind a proxy server, NuGet client tool must be configured to use it
251259

252260
Where you should set proper proxy address, user name and password.
253261

254-
####When modifying, adding, or removing keywords or compiler messages
255-
256-
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`msbuild FSharp.Compiler.Private.fsproj /t:UpdateXlf` (located in[src\fsharp\FSharp.Compiler.Private](https://github.com/Microsoft/visualfsharp/tree/master/src/fsharp/FSharp.Compiler.Private)). This only works on Windows/.NETStandard framework, so changing this from any other platform requires editing and syncing all of the XLF files manually.
257-
258-
After this, you must copy any differing`resx` files from the output directory into the corresponding subdirectory in[src\buildfromsource](https://github.com/Microsoft/visualfsharp/tree/master/src/fsharp/FSharp.Compiler.Private). This step will soon be eliminated (see issue[#3905](https://github.com/Microsoft/visualfsharp/issues/3905)).
259262

260263
####Resources
261264

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.1.403
1+
2.1.403

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.11.0-beta1-63505-03
1+
2.11.0-beta1-63431-08

‎build/targets/AssemblyVersions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<_Build_Number>$(BUILD_BUILDNUMBER.Substring(9))</_Build_Number>
2222
<Build_FileVersion>$(_Build_Year).$(_Build_Month).$(_Build_Day).$(_Build_Number)</Build_FileVersion>
2323

24-
<FSCoreMajorVersion>4.5</FSCoreMajorVersion>
25-
<FSCorePackageVersion>$(FSCoreMajorVersion).4</FSCorePackageVersion>
24+
<FSCoreMajorVersion>4.6</FSCoreMajorVersion>
25+
<FSCorePackageVersion>$(FSCoreMajorVersion).0</FSCorePackageVersion>
2626
<FSCoreVersion>$(FSCoreMajorVersion).0.0</FSCoreVersion>
2727

28-
<FSPackageMajorVersion>10.3</FSPackageMajorVersion>
28+
<FSPackageMajorVersion>10.4</FSPackageMajorVersion>
2929
<FSPackageVersion>$(FSPackageMajorVersion).0</FSPackageVersion>
3030
<FSProductVersion>$(FSPackageVersion).0</FSProductVersion>
3131

‎fcs/FSharp.Compiler.Service.MSBuild.v12/FSharp.Compiler.Service.MSBuild.v12.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<ItemGroup>
3030
<ReferenceInclude="System.Runtime" />
3131
<ReferenceInclude="System.IO" />
32+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
3233
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
3334
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3435
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />

‎fcs/FSharp.Compiler.Service.ProjectCracker/FSharp.Compiler.Service.ProjectCracker.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<ItemGroup>
3232
<ReferenceInclude="System.Runtime" />
3333
<ReferenceInclude="System.IO" />
34+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
3435
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
3536
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
3637
<ProjectReferenceInclude="..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />

‎fcs/FSharp.Compiler.Service.ProjectCrackerTool/FSharp.Compiler.Service.ProjectCrackerTool.fsproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<HintPath>$(FSharpSourcesRoot)\..\packages\Microsoft.Portable.FSharp.Core.$(FSharpCoreFrozenPortablePackageVersion)\lib\profiles\net40\FSharp.Core.dll</HintPath>
2929
<Private>false</Private>
3030
</Reference>
31-
<PackageReferenceInclude="FSharp.Core"Version="4.1.18" />
31+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
3232
<ReferenceInclude="Microsoft.Build.Framework, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
3333
<HintPath>$(FSharpSourcesRoot)\..\fcs\dependencies\MSBuild.v12.0\Microsoft.Build.Framework.dll</HintPath>
3434
<Private>false</Private>

‎fcs/build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ let isMono = false
2424
// Utilities
2525
// --------------------------------------------------------------------------------------
2626

27-
letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.201"
27+
letdotnetExePath= DotNetCli.InstallDotNetSDK"2.1.403"
2828

2929
letrunDotnet workingDir args=
3030
letresult=

‎fcs/samples/EditorService/EditorService.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<NoneInclude="App.config" />
1313
</ItemGroup>
1414
<ItemGroup>
15+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
1516
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
1617
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1718
<PackageReferenceInclude="System.Reflection.Metadata"Version="1.6.0" />

‎fcs/samples/FscExe/FscExe.fsproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
</ItemGroup>
1515
<ItemGroup>
1616
<ReferenceInclude="System.Runtime.Remoting" />
17+
<PackageReferenceInclude="FSharp.Core"Version="4.5.2" />
1718
<PackageReferenceInclude="FSharp.Core"Version="4.1.19" />
1819
<ProjectReferenceInclude="..\..\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj" />
1920
</ItemGroup>

0 commit comments

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