Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
bf4d5f7f
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
bf4d5f7f
编写于
10月 19, 2017
作者:
B
Brett V. Forsgren
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'upstream/vs2017-rtm' into merge-vs2017-rtm-to-master
上级
064d8043
69ac9afc
变更
14
显示空白变更内容
内联
并排
Showing
14 changed file
with
40 addition
and
5 deletion
+40
-5
setup/Swix/Microsoft.FSharp.vsmanproj
setup/Swix/Microsoft.FSharp.vsmanproj
+1
-0
setup/fsharp-setup-build.proj
setup/fsharp-setup-build.proj
+2
-0
src/buildfromsource/FSharp.Build/FSharp.Build.fsproj
src/buildfromsource/FSharp.Build/FSharp.Build.fsproj
+1
-0
src/buildfromsource/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
...tive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
+1
-0
src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
...ce/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+1
-0
src/buildfromsource/Fsc/Fsc.fsproj
src/buildfromsource/Fsc/Fsc.fsproj
+1
-0
src/buildfromsource/Fsi/Fsi.fsproj
src/buildfromsource/Fsi/Fsi.fsproj
+1
-1
src/fsharp/FSharp.Build/InternalsVisibleTo.fs
src/fsharp/FSharp.Build/InternalsVisibleTo.fs
+6
-0
src/fsharp/FSharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs
...Sharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs
+10
-0
src/fsharp/Fsc/InternalsVisibleTo.fs
src/fsharp/Fsc/InternalsVisibleTo.fs
+8
-0
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+2
-1
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
.../src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+2
-1
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
...tion/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+2
-1
vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
+2
-1
未找到文件。
setup/Swix/Microsoft.FSharp.vsmanproj
浏览文件 @
bf4d5f7f
...
@@ -21,6 +21,7 @@
...
@@ -21,6 +21,7 @@
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Vsix.Full.Core.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Vsix.Full.Resources.%(SetupLanguages.LocaleCode).json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.VSIX.Templates.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Dependencies.json"
/>
<MergeManifest
Include=
"$(OutputPath)\Microsoft.FSharp.Dependencies.json"
/>
</ItemGroup>
</ItemGroup>
</Target>
</Target>
...
...
setup/fsharp-setup-build.proj
浏览文件 @
bf4d5f7f
...
@@ -50,7 +50,9 @@
...
@@ -50,7 +50,9 @@
<ItemGroup>
<ItemGroup>
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpFull.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\VisualFSharpTemplate.vsix" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Full.Core.json" />
<InsertionItems Include="$(VsixBuildLocation)\Microsoft.FSharp.VSIX.Templates.json" />
</ItemGroup>
</ItemGroup>
</Target>
</Target>
...
...
src/buildfromsource/FSharp.Build/FSharp.Build.fsproj
浏览文件 @
bf4d5f7f
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
<Import
Project=
"..\BuildFromSource.targets"
/>
<Import
Project=
"..\BuildFromSource.targets"
/>
<ItemGroup>
<ItemGroup>
<FsSrGen
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSBuild.txt"
/>
<FsSrGen
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSBuild.txt"
/>
<Compile
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Build\InternalsVisibleTo.fs"
/>
<Compile
Include=
"..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs"
/>
<Compile
Include=
"..\..\assemblyinfo\assemblyinfo.FSharp.Build.dll.fs"
/>
<Compile
Include=
"..\..\utils\CompilerLocationUtils.fs"
/>
<Compile
Include=
"..\..\utils\CompilerLocationUtils.fs"
/>
<Compile
Include=
"..\..\utils\reshapedreflection.fs"
/>
<Compile
Include=
"..\..\utils\reshapedreflection.fs"
/>
...
...
src/buildfromsource/FSharp.Compiler.Interactive.Settings/FSharp.Compiler.Interactive.Settings.fsproj
浏览文件 @
bf4d5f7f
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<Import
Project=
"..\BuildFromSource.targets"
/>
<Import
Project=
"..\BuildFromSource.targets"
/>
<ItemGroup>
<ItemGroup>
<FsSrGen
Include=
"$(FSharpSourcesRoot)\fsharp\FSInteractiveSettings.txt"
/>
<FsSrGen
Include=
"$(FSharpSourcesRoot)\fsharp\FSInteractiveSettings.txt"
/>
<Compile
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Interactive.Settings\InternalsVisibleTo.fs"
/>
<Compile
Include=
"..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs"
/>
<Compile
Include=
"..\..\assemblyinfo\assemblyinfo.FSharp.Compiler.Interactive.Settings.dll.fs"
/>
<Compile
Include=
"InternalsVisibleTo.fs"
/>
<Compile
Include=
"InternalsVisibleTo.fs"
/>
<Compile
Include=
"..\..\utils\reshapedreflection.fs"
/>
<Compile
Include=
"..\..\utils\reshapedreflection.fs"
/>
...
...
src/buildfromsource/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
浏览文件 @
bf4d5f7f
...
@@ -613,6 +613,7 @@
...
@@ -613,6 +613,7 @@
<Link>
Misc/LegacyHostedCompilerForTesting.fs
</Link>
<Link>
Misc/LegacyHostedCompilerForTesting.fs
</Link>
</Compile>
</Compile>
</ItemGroup>
</ItemGroup>
<Import
Project =
"..\BuildFromSource.targets"
/>
<!--
<!--
"System.Collections.Immutable":"1.3.1",
"System.Collections.Immutable":"1.3.1",
...
...
src/buildfromsource/Fsc/Fsc.fsproj
浏览文件 @
bf4d5f7f
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
<Import
Project=
"..\BuildFromSource.targets"
/>
<Import
Project=
"..\BuildFromSource.targets"
/>
<ItemGroup>
<ItemGroup>
<Compile
Include=
"$(FSharpSourcesRoot)\fsharp\Fsc\InternalsVisibleTo.fs"
/>
<Compile
Include=
"..\..\assemblyinfo\assemblyinfo.fsc.exe.fs"
>
<Compile
Include=
"..\..\assemblyinfo\assemblyinfo.fsc.exe.fs"
>
<Link>
Resources/assemblyinfo.fsc.exe.fs
</Link>
<Link>
Resources/assemblyinfo.fsc.exe.fs
</Link>
</Compile>
</Compile>
...
...
src/buildfromsource/Fsi/Fsi.fsproj
浏览文件 @
bf4d5f7f
...
@@ -9,7 +9,7 @@
...
@@ -9,7 +9,7 @@
<AssemblyName>
fsi
</AssemblyName>
<AssemblyName>
fsi
</AssemblyName>
<NoWarn>
$(NoWarn);45;55;62;75;1204
</NoWarn>
<NoWarn>
$(NoWarn);45;55;62;75;1204
</NoWarn>
<AllowCrossTargeting>
true
</AllowCrossTargeting>
<AllowCrossTargeting>
true
</AllowCrossTargeting>
<DefineConstants>
$(DefineConstants);COMPILER;EXTENSIONTYPING
</DefineConstants>
<DefineConstants>
$(DefineConstants);
BUILD_FROM_SOURCE;
COMPILER;EXTENSIONTYPING
</DefineConstants>
<OtherFlags>
$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1
</OtherFlags>
<OtherFlags>
$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1
</OtherFlags>
</PropertyGroup>
</PropertyGroup>
...
...
src/fsharp/FSharp.Build/InternalsVisibleTo.fs
0 → 100644
浏览文件 @
bf4d5f7f
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
namespace
Microsoft
.
FSharp
[<
assembly
:
System
.
Runtime
.
CompilerServices
.
InternalsVisibleTo
(
"VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293"
)>]
do
()
src/fsharp/FSharp.Compiler.Interactive.Settings/InternalsVisibleTo.fs
0 → 100644
浏览文件 @
bf4d5f7f
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
namespace
Microsoft
.
FSharp
open
System
.
Reflection
[<
assembly
:
System
.
Runtime
.
CompilerServices
.
InternalsVisibleTo
(
"fsi, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293"
)>]
[<
assembly
:
System
.
Runtime
.
CompilerServices
.
InternalsVisibleTo
(
"fsiAnyCpu, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293"
)>]
[<
assembly
:
System
.
Runtime
.
CompilerServices
.
InternalsVisibleTo
(
"FSharp.Compiler, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293"
)>]
do
()
src/fsharp/Fsc/InternalsVisibleTo.fs
0 → 100644
浏览文件 @
bf4d5f7f
// Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.
namespace
Microsoft
.
FSharp
open
System
.
Reflection
[<
assembly
:
System
.
Runtime
.
CompilerServices
.
InternalsVisibleTo
(
"VisualFSharp.Unittests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007D1FA57C4AED9F0A32E84AA0FAEFD0DE9E8FD6AEC8F87FB03766C834C99921EB23BE79AD9D5DCC1DD9AD236132102900B723CF980957FC4E177108FC607774F29E8320E92EA05ECE4E821C0A5EFE8F1645C4C0C93C1AB99285D622CAA652C1DFAD63D745D6F2DE5F17E5EAF0FC4963D261C8A12436518206DC093344D5AD293"
)>]
do
()
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
浏览文件 @
bf4d5f7f
...
@@ -34,7 +34,8 @@
...
@@ -34,7 +34,8 @@
<InternalsVisibleTo
Include=
"VisualFSharp.Salsa"
/>
<InternalsVisibleTo
Include=
"VisualFSharp.Salsa"
/>
</ItemGroup>
</ItemGroup>
<ItemGroup>
<ItemGroup>
<EmbeddedResource
Include=
"FSharp.Editor.resx"
GenerateSource=
"true"
>
<EmbeddedResource
Include=
"FSharp.Editor.resx"
>
<GenerateSource>
true
</GenerateSource>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.Editor.SR
</GeneratedModuleName>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.Editor.SR
</GeneratedModuleName>
</EmbeddedResource>
</EmbeddedResource>
<Compile
Include=
"Common\AssemblyInfo.fs"
/>
<Compile
Include=
"Common\AssemblyInfo.fs"
/>
...
...
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
浏览文件 @
bf4d5f7f
...
@@ -62,7 +62,8 @@
...
@@ -62,7 +62,8 @@
<InProject>
false
</InProject>
<InProject>
false
</InProject>
</FilesToLocalize>
</FilesToLocalize>
<EmbeddedResource
Include=
"VSPackage.resx"
/>
<EmbeddedResource
Include=
"VSPackage.resx"
/>
<EmbeddedResource
Include=
"FSLangSvcStrings.resx"
GenerateSource=
"true"
>
<EmbeddedResource
Include=
"FSLangSvcStrings.resx"
>
<GenerateSource>
true
</GenerateSource>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.LanguageService.Strings
</GeneratedModuleName>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.LanguageService.Strings
</GeneratedModuleName>
</EmbeddedResource>
</EmbeddedResource>
<Compile
Include=
"AssemblyInfo.fs"
/>
<Compile
Include=
"AssemblyInfo.fs"
/>
...
...
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
浏览文件 @
bf4d5f7f
...
@@ -85,7 +85,8 @@
...
@@ -85,7 +85,8 @@
<Parser>
210
</Parser>
<Parser>
210
</Parser>
</FilesToLocalize>
</FilesToLocalize>
<VSCTCompile
Include=
"MenusAndCommands.vsct"
/>
<VSCTCompile
Include=
"MenusAndCommands.vsct"
/>
<EmbeddedResource
Include=
"VSPackage.resx"
GenerateSource=
"true"
>
<EmbeddedResource
Include=
"VSPackage.resx"
>
<GenerateSource>
true
</GenerateSource>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR
</GeneratedModuleName>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.ProjectSystem.FSharpSR
</GeneratedModuleName>
<MergeWithCTO>
true
</MergeWithCTO>
<MergeWithCTO>
true
</MergeWithCTO>
</EmbeddedResource>
</EmbeddedResource>
...
...
vsintegration/src/FSharp.VS.FSI/FSHarp.VS.FSI.fsproj
浏览文件 @
bf4d5f7f
...
@@ -68,7 +68,8 @@
...
@@ -68,7 +68,8 @@
<Compile
Include=
"fsiSessionToolWindow.fs"
/>
<Compile
Include=
"fsiSessionToolWindow.fs"
/>
<Compile
Include=
"fsiPackageHooks.fs"
/>
<Compile
Include=
"fsiPackageHooks.fs"
/>
<Compile
Include=
"fsiPackage.fs"
/>
<Compile
Include=
"fsiPackage.fs"
/>
<EmbeddedResource
Include=
"Properties.resx"
GenerateSource=
"true"
>
<EmbeddedResource
Include=
"Properties.resx"
>
<GenerateSource>
true
</GenerateSource>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.Interactive.SRProperties
</GeneratedModuleName>
<GeneratedModuleName>
Microsoft.VisualStudio.FSharp.Interactive.SRProperties
</GeneratedModuleName>
<GenerateLegacyCode>
true
</GenerateLegacyCode>
<GenerateLegacyCode>
true
</GenerateLegacyCode>
<ManifestResourceName>
Properties
</ManifestResourceName>
<ManifestResourceName>
Properties
</ManifestResourceName>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录