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

Commit8be369e

Browse files
committed
Merge remote-tracking branch 'upstream/master' into xliff
2 parents9c91187 +3f667b5 commit8be369e

File tree

196 files changed

+13776
-1768
lines changed

Some content is hidden

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

196 files changed

+13776
-1768
lines changed

‎DEVGUIDE.md‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,8 @@ Install Xamarin Studio, then
9797
To build and test Visual F# IDE Tools, install these requirements:
9898
-[Visual Studio 2017](https://www.visualstudio.com/downloads/)
9999
- Under the "Windows" workloads, select ".NET desktop development"
100-
- Select "F# language support" under the optional components
100+
- Select "F#desktoplanguage support" under the optional components
101101
- Under the "Other Toolsets" workloads, select "Visual Studio extension development"
102-
- Under the "Individual components" tab select "Windows 10 SDK" as shown below (needed for compiling RC resource, see#2556):\
103-
![image](https://cloud.githubusercontent.com/assets/1249087/23730261/5c78c850-041b-11e7-9d9d-62766351fd0f.png)
104-
- Failing to install this will lead to error FS0193: Could not find file visualfsharp\vsintegration\src\FSharp.ProjectSystem.FSharp\obj\net40\ProjectResources.rc.res.
105102

106103
Steps to build:
107104

@@ -111,7 +108,6 @@ Steps to build:
111108

112109
Use``VisualFSharp.sln`` if you're building the Visual F# IDE Tools.
113110

114-
115111
Note on Debug vs Release:``Release`` Configuration has a degraded debugging experience, so if you want to test a change locally, it is recommended to do it in the``Debug`` configuration. For more information seehttps://github.com/Microsoft/visualfsharp/issues/2771 andhttps://github.com/Microsoft/visualfsharp/pull/2773.
116112

117113
Note: if you face this error[#2351](https://github.com/Microsoft/visualfsharp/issues/2351):
@@ -125,7 +121,6 @@ Or hard crash on launch ("Unknown Error"), delete these folders:
125121

126122
####[Optional] Install the Visual F# IDE Tools (Windows Only)
127123

128-
At time of writing, the Visual F# IDE Tools can only be installed into the latest Visual Studio 2017 RC releases.
129124
The new builds of the Visual F# IDE Tools can no longer be installed into Visual Studio 2015.
130125

131126
You can install Visual Studio 2017 fromhttps://www.visualstudio.com/downloads/.
@@ -155,7 +150,6 @@ changes, but the root (default) hive will remain untouched. You can also start t
155150

156151
Because this uses the "RoslynDev" hive you can simultaneously test changes to an appropriate build of Roslyn binaries.
157152

158-
159153
####[Optional] Rapid deployment of incremental changes to Visual F# IDE Tools components
160154

161155
For the brave, you can rapidly deploy incrementally updated versions of Visual F# IDE Tool components such as``FSHarp.Editor.dll`` by copying them directly into the extension directory in your user AppData folder:
@@ -176,7 +170,6 @@ For **Release**:
176170

177171
vsintegration\update-vsintegration.cmd release
178172

179-
180173
#Notes
181174

182175
####Windows: Links to Additional frameworks
@@ -192,10 +185,9 @@ For **Release**:
192185
-[Windows 8.1 SDK](http://msdn.microsoft.com/en-us/library/windows/desktop/bg162891.aspx)
193186
-[Windows 10 SDK](https://developer.microsoft.com/en-US/windows/downloads/windows-10-sdk)
194187

195-
196188
####Notes on the Windows .NET Framework build
197189

198-
1. The`update.cmd` script adds required strong name validation skips, and NGens the compiler and libraries. This requires admin privileges.
190+
1. The`update.cmd` script adds required strong name validation skips and NGens the compiler and libraries. This requires admin privileges.
199191
1. The compiler binaries produced are "private" and strong-named signed with a test key.
200192
1. Some additional tools are required to build the compiler, notably`fslex.exe`,`fsyacc.exe`,`FSharp.PowerPack.Build.Tasks.dll`,`FsSrGen.exe`,`FSharp.SRGen.Build.Tasks.dll`, and the other tools found in the`lkg` directory.
201193
1. The overall bootstrapping process executes as follows
@@ -217,4 +209,3 @@ Where you should set proper proxy address, user name and password.
217209
####Resources
218210

219211
The primary technical guide to the core compiler code is[The F# Compiler Technical Guide](http://fsharp.github.io/2015/09/29/fsharp-compiler-guide.html). Please read and contribute to that guide.
220-

‎DotnetCLIToolsVersion.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.0.0-preview2-006502
1+
2.0.3-servicing-007056

‎PublishToBlob.proj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,25 @@
1010
<PropertyGroup>
1111
<FeedTasksPackage>Microsoft.DotNet.Build.Tasks.Feed</FeedTasksPackage>
1212
<!-- This version should be kept in sync with `packages.config`-->
13-
<FeedTasksPackageVersion>1.0.0-prerelease-02121-01</FeedTasksPackageVersion>
13+
<FeedTasksPackageVersion>1.0.0-prerelease-02219-01</FeedTasksPackageVersion>
1414
</PropertyGroup>
1515

1616
<ImportProject="$(MSBuildThisFileDirectory)packages\$(FeedTasksPackage).$(FeedTasksPackageVersion)\build\$(FeedTasksPackage).targets" />
1717

1818
<ItemGroup>
19-
<ItemsToPushInclude="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
19+
<NuGetPackagesInclude="$(MSBuildThisFileDirectory)artifacts\**\*.nupkg" />
20+
<OtherAssetsInclude="$(MSBuildThisFileDirectory)insertion\**" />
2021
</ItemGroup>
2122

2223
<TargetName="Build">
2324
<PushToBlobFeedExpectedFeedUrl="$(ExpectedFeedUrl)"
2425
AccountKey="$(AccountKey)"
25-
ItemsToPush="@(ItemsToPush)"
26+
ItemsToPush="@(NuGetPackages)"
27+
Overwrite="$(PublishOverwrite)" />
28+
<PushToBlobFeedExpectedFeedUrl="$(ExpectedFeedUrl)"
29+
AccountKey="$(AccountKey)"
30+
ItemsToPush="@(OtherAssets)"
31+
PublishFlatContainer="true"
2632
Overwrite="$(PublishOverwrite)" />
2733
</Target>
2834

‎VisualFSharp.sln‎

Lines changed: 16 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion =15.0.27005.2
4+
VisualStudioVersion =15.0.27116.0
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Compiler.Private","src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj","{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
77
EndProject
@@ -96,14 +96,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleProject", "vsintegra
9696
EndProject
9797
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="LibraryProject","vsintegration\ProjectTemplates\LibraryProject\LibraryProject.csproj","{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}"
9898
EndProject
99-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="NetCore78Project","vsintegration\ProjectTemplates\NetCore78Project\NetCore78Project.csproj","{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}"
100-
EndProject
101-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="NetCore259Project","vsintegration\ProjectTemplates\NetCore259Project\NetCore259Project.csproj","{D9D95330-3626-4199-B7AF-17B8E4AF6D87}"
102-
EndProject
103-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="NetCoreProject","vsintegration\ProjectTemplates\NetCoreProject\NetCoreProject.csproj","{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}"
104-
EndProject
105-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="PortableLibraryProject","vsintegration\ProjectTemplates\PortableLibraryProject\PortableLibraryProject.csproj","{DB374A0C-7560-479F-9B21-D37C81F7624F}"
106-
EndProject
10799
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="TutorialProject","vsintegration\ProjectTemplates\TutorialProject\TutorialProject.csproj","{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}"
108100
EndProject
109101
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="ItemTemplates","ItemTemplates","{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}"
@@ -146,6 +138,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ResourceFile", "vsintegrati
146138
EndProject
147139
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="FSharp.Build.UnitTests","src\fsharp\FSharp.Build.UnitTests\FSharp.Build.UnitTests.fsproj","{400FAB03-786E-40CC-85A8-04B0C2869B14}"
148140
EndProject
141+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="PEVerify","tests\fsharpqa\testenv\src\PEVerify\PEVerify.csproj","{B0689A4E-07D8-494D-A0C8-791CB1D74E54}"
142+
EndProject
149143
Global
150144
GlobalSection(SolutionConfigurationPlatforms) =preSolution
151145
Debug|Any CPU=Debug|Any CPU
@@ -564,54 +558,6 @@ Global
564558
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}.Release|Any CPU.Build.0=Release|Any CPU
565559
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}.Release|x86.ActiveCfg=Release|Any CPU
566560
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7}.Release|x86.Build.0=Release|Any CPU
567-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
568-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|Any CPU.Build.0=Debug|Any CPU
569-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|x86.ActiveCfg=Debug|Any CPU
570-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Debug|x86.Build.0=Debug|Any CPU
571-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
572-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|Any CPU.Build.0=Proto|Any CPU
573-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|x86.ActiveCfg=Proto|Any CPU
574-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Proto|x86.Build.0=Proto|Any CPU
575-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|Any CPU.ActiveCfg=Release|Any CPU
576-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|Any CPU.Build.0=Release|Any CPU
577-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|x86.ActiveCfg=Release|Any CPU
578-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210}.Release|x86.Build.0=Release|Any CPU
579-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
580-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|Any CPU.Build.0=Debug|Any CPU
581-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|x86.ActiveCfg=Debug|Any CPU
582-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Debug|x86.Build.0=Debug|Any CPU
583-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
584-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|Any CPU.Build.0=Proto|Any CPU
585-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|x86.ActiveCfg=Proto|Any CPU
586-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Proto|x86.Build.0=Proto|Any CPU
587-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|Any CPU.ActiveCfg=Release|Any CPU
588-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|Any CPU.Build.0=Release|Any CPU
589-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|x86.ActiveCfg=Release|Any CPU
590-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87}.Release|x86.Build.0=Release|Any CPU
591-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
592-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|Any CPU.Build.0=Debug|Any CPU
593-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|x86.ActiveCfg=Debug|Any CPU
594-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Debug|x86.Build.0=Debug|Any CPU
595-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
596-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|Any CPU.Build.0=Proto|Any CPU
597-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|x86.ActiveCfg=Proto|Any CPU
598-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Proto|x86.Build.0=Proto|Any CPU
599-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|Any CPU.ActiveCfg=Release|Any CPU
600-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|Any CPU.Build.0=Release|Any CPU
601-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|x86.ActiveCfg=Release|Any CPU
602-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5}.Release|x86.Build.0=Release|Any CPU
603-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
604-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|Any CPU.Build.0=Debug|Any CPU
605-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|x86.ActiveCfg=Debug|Any CPU
606-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Debug|x86.Build.0=Debug|Any CPU
607-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
608-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|Any CPU.Build.0=Proto|Any CPU
609-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|x86.ActiveCfg=Proto|Any CPU
610-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Proto|x86.Build.0=Proto|Any CPU
611-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|Any CPU.ActiveCfg=Release|Any CPU
612-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|Any CPU.Build.0=Release|Any CPU
613-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|x86.ActiveCfg=Release|Any CPU
614-
{DB374A0C-7560-479F-9B21-D37C81F7624F}.Release|x86.Build.0=Release|Any CPU
615561
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
616562
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|Any CPU.Build.0=Debug|Any CPU
617563
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -816,6 +762,18 @@ Global
816762
{400FAB03-786E-40CC-85A8-04B0C2869B14}.Release|Any CPU.Build.0=Release|Any CPU
817763
{400FAB03-786E-40CC-85A8-04B0C2869B14}.Release|x86.ActiveCfg=Release|Any CPU
818764
{400FAB03-786E-40CC-85A8-04B0C2869B14}.Release|x86.Build.0=Release|Any CPU
765+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
766+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Debug|Any CPU.Build.0=Debug|Any CPU
767+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Debug|x86.ActiveCfg=Debug|Any CPU
768+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Debug|x86.Build.0=Debug|Any CPU
769+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Proto|Any CPU.ActiveCfg=Debug|Any CPU
770+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Proto|Any CPU.Build.0=Debug|Any CPU
771+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Proto|x86.ActiveCfg=Debug|Any CPU
772+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Proto|x86.Build.0=Debug|Any CPU
773+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|Any CPU.ActiveCfg=Release|Any CPU
774+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|Any CPU.Build.0=Release|Any CPU
775+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.ActiveCfg=Release|Any CPU
776+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54}.Release|x86.Build.0=Release|Any CPU
819777
EndGlobalSection
820778
GlobalSection(SolutionProperties) =preSolution
821779
HideSolutionNode =FALSE
@@ -858,10 +816,6 @@ Global
858816
{F7876C9B-FB6A-4EFB-B058-D6967DB75FB2} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
859817
{604F0DAA-2D33-48DD-B162-EDF0B672803D} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
860818
{01678CDA-A11F-4DEE-9344-2EDF91CF1AE7} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
861-
{1A8DBF70-4178-4AE3-AF5F-39DDD5692210} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
862-
{D9D95330-3626-4199-B7AF-17B8E4AF6D87} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
863-
{5B739CF3-1116-4EB4-B598-6C16BEA81CE5} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
864-
{DB374A0C-7560-479F-9B21-D37C81F7624F} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
865819
{2FACEE44-48BD-40B5-A2EE-B54A0C9BB7C4} ={C9B1D3F5-4971-4F04-9C26-37E3AC809AB4}
866820
{F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA} ={4C7B48D7-19AF-4AE7-9D1D-3BB289D5480D}
867821
{6BA13AA4-C25F-480F-856B-8E8000299A72} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
@@ -883,6 +837,7 @@ Global
883837
{FF76BD3C-5E0A-4752-B6C3-044F6E15719B} ={35636A82-401A-4C3A-B2AB-EB7DC5E9C268}
884838
{0385564F-07B4-4264-AB8A-17C393E9140C} ={F6DAEE9A-8BE1-4C4A-BC83-09215517C7DA}
885839
{400FAB03-786E-40CC-85A8-04B0C2869B14} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
840+
{B0689A4E-07D8-494D-A0C8-791CB1D74E54} ={CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
886841
EndGlobalSection
887842
GlobalSection(ExtensibilityGlobals) =postSolution
888843
SolutionGuid ={48EDBBBE-C8EE-4E3C-8B19-97184A487B37}

0 commit comments

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