Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
ae135de9
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,发现更多精彩内容 >>
未验证
提交
ae135de9
编写于
7月 31, 2018
作者:
B
Brett V. Forsgren
提交者:
GitHub
7月 31, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5437 from Microsoft/merges/dev15.8-to-dev15.9
Merge dev15.8 to dev15.9
上级
6e34558d
a6e3d84c
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
27 addition
and
14 deletion
+27
-14
build.cmd
build.cmd
+14
-14
build/targets/PackageVersions.props
build/targets/PackageVersions.props
+1
-0
vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj
.../LanguageServiceProfiling/LanguageServiceProfiling.fsproj
+1
-0
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
+2
-0
vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
...p.LanguageService.Base/FSharp.LanguageService.Base.csproj
+1
-0
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
.../src/FSharp.LanguageService/FSharp.LanguageService.fsproj
+2
-0
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
...tion/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
+1
-0
vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj
vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj
+2
-0
vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
+1
-0
vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
+2
-0
未找到文件。
build.cmd
浏览文件 @
ae135de9
...
...
@@ -744,8 +744,8 @@ if "%BUILD_PROTO%" == "1" (
if "
%BUILD_PROTO_WITH_CORECLR_LKG%
" == "
1
" (
echo
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
echo
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binprotobuild-net40.build.binlog
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binprotobuild-net40.build.binlog
@if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure
)
...
...
@@ -754,8 +754,8 @@ if "%BUILD_PROTO%" == "1" (
echo
%_ngenexe%
install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
%_ngenexe%
install packages\FSharp.Compiler.Tools.4.1.27\tools\fsc.exe /nologo
echo
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
echo
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binprotobuild-coreclr.build.binlog
%_msbuildexe%
%msbuildflags%
src\fsharp-proto-build.proj /p:BUILD_PROTO_WITH_CORECLR_LKG=
%BUILD_PROTO_WITH_CORECLR_LKG%
/p:Configuration=Proto /p:DisableLocalization=true
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binprotobuild-coreclr.build.binlog
@if ERRORLEVEL 1 echo Error: compiler proto build failed && goto :failure
)
...
...
@@ -775,11 +775,11 @@ echo ---------------- Done with SDK restore, starting build --------------------
if "
%BUILD_PHASE%
" == "
1
" (
echo
%_msbuildexe%
%msbuildflags%
build-everything.proj /t:Restore
%BUILD_DIAG%
%_msbuildexe%
%msbuildflags%
build-everything.proj /t:Restore
%BUILD_DIAG%
echo
%_msbuildexe%
%msbuildflags%
build-everything.proj /t:Restore
%BUILD_DIAG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-everything.restore.
%BUILD_CONFIG%
.binlog
%_msbuildexe%
%msbuildflags%
build-everything.proj /t:Restore
%BUILD_DIAG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-everything.restore.
%BUILD_CONFIG%
.binlog
echo
%_msbuildexe%
%msbuildflags%
build-everything.proj /p:Configuration=
%BUILD_CONFIG%
%BUILD_DIAG%
/p:BUILD_PUBLICSIGN=
%BUILD_PUBLICSIGN%
%_msbuildexe%
%msbuildflags%
build-everything.proj /p:Configuration=
%BUILD_CONFIG%
%BUILD_DIAG%
/p:BUILD_PUBLICSIGN=
%BUILD_PUBLICSIGN%
echo
%_msbuildexe%
%msbuildflags%
build-everything.proj /p:Configuration=
%BUILD_CONFIG%
%BUILD_DIAG%
/p:BUILD_PUBLICSIGN=
%BUILD_PUBLICSIGN%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-everything.build.
%BUILD_CONFIG%
.binlog
%_msbuildexe%
%msbuildflags%
build-everything.proj /p:Configuration=
%BUILD_CONFIG%
%BUILD_DIAG%
/p:BUILD_PUBLICSIGN=
%BUILD_PUBLICSIGN%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-everything.build.
%BUILD_CONFIG%
.binlog
@if ERRORLEVEL 1 echo Error build failed && goto :failure
)
...
...
@@ -803,8 +803,8 @@ if not "%SIGN_TYPE%" == "" (
echo ---------------- Done with assembly signing, start package creation ---------------
echo
%_msbuildexe%
%msbuildflags%
build-nuget-packages.proj /p:Configuration=
%BUILD_CONFIG%
%_msbuildexe%
%msbuildflags%
build-nuget-packages.proj /p:Configuration=
%BUILD_CONFIG%
echo
%_msbuildexe%
%msbuildflags%
build-nuget-packages.proj /p:Configuration=
%BUILD_CONFIG%
/bl:=~dp0artifacts\msbuild.build-nuget-packages.build.
%BUILD_CONFIG%
.binlog
%_msbuildexe%
%msbuildflags%
build-nuget-packages.proj /p:Configuration=
%BUILD_CONFIG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-nuget-packages.build.
%BUILD_CONFIG%
.binlog
if ERRORLEVEL 1 echo Error building NuGet packages && goto :failure
if not "
%SIGN_TYPE%
" == "" (
...
...
@@ -814,8 +814,8 @@ if not "%SIGN_TYPE%" == "" (
)
if "
%BUILD_SETUP%
" == "
1
" (
echo
%_msbuildexe%
%msbuildflags%
setup\build-insertion.proj /p:Configuration=
%BUILD_CONFIG%
%_msbuildexe%
%msbuildflags%
setup\build-insertion.proj /p:Configuration=
%BUILD_CONFIG%
echo
%_msbuildexe%
%msbuildflags%
setup\build-insertion.proj /p:Configuration=
%BUILD_CONFIG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-insertion.build.
%BUILD_CONFIG%
.binlog
%_msbuildexe%
%msbuildflags%
setup\build-insertion.proj /p:Configuration=
%BUILD_CONFIG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.build-insertion.build.
%BUILD_CONFIG%
.binlog
if ERRORLEVEL 1 echo Error building insertion packages && goto :failure
)
...
...
@@ -828,8 +828,8 @@ if not "%SIGN_TYPE%" == "" (
echo ---------------- Done with signing, building insertion files ---------------
if "
%BUILD_SETUP%
" == "
1
" (
echo
%_msbuildexe%
%msbuildflags%
setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=
%BUILD_CONFIG%
%_msbuildexe%
%msbuildflags%
setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=
%BUILD_CONFIG%
echo
%_msbuildexe%
%msbuildflags%
setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=
%BUILD_CONFIG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.setup-swix.build.
%BUILD_CONFIG%
.binlog
%_msbuildexe%
%msbuildflags%
setup\Swix\Microsoft.FSharp.vsmanproj /p:Configuration=
%BUILD_CONFIG%
/bl:
%~dp0
%BUILD_CONFIG%
\net40\binmsbuild.setup-swix.build.
%BUILD_CONFIG%
.binlog
if ERRORLEVEL 1 echo Error building .vsmanproj && goto :failure
)
...
...
build/targets/PackageVersions.props
浏览文件 @
ae135de9
...
...
@@ -7,6 +7,7 @@
<!-- System.* packages -->
<SystemCollectionsImmutablePackageVersion>1.5.0</SystemCollectionsImmutablePackageVersion>
<SystemValueTuplePackageVersion>4.3.0</SystemValueTuplePackageVersion>
<!-- Roslyn packages -->
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
...
...
vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj
浏览文件 @
ae135de9
...
...
@@ -6,6 +6,7 @@
<OutputType>
Exe
</OutputType>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
</PropertyGroup>
...
...
vsintegration/src/FSharp.Editor/FSharp.Editor.fsproj
浏览文件 @
ae135de9
...
...
@@ -10,6 +10,7 @@
<NoWarn>
$(NoWarn);75
</NoWarn>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<OtherFlags>
$(OtherFlags) --warnon:1182 --subsystemversion:6.00
</OtherFlags>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
<EnableDefaultEmbeddedResourceItems>
false
</EnableDefaultEmbeddedResourceItems>
...
...
@@ -163,6 +164,7 @@
<PackageReference
Include=
"Microsoft.VSSDK.BuildTools"
Version=
"$(MicrosoftVSSDKBuildToolsPackageVersion)"
ExcludeAssets=
"all"
/>
<PackageReference
Include=
"Newtonsoft.Json"
Version=
"$(NewtonsoftJsonPackageVersion)"
/>
<PackageReference
Include=
"System.Collections.Immutable"
Version=
"$(SystemCollectionsImmutablePackageVersion)"
/>
<PackageReference
Include=
"System.ValueTuple"
Version=
"$(SystemValueTuplePackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSLangProj"
Version=
"$(VSSDKVSLangProjPackageVersion)"
/>
</ItemGroup>
...
...
vsintegration/src/FSharp.LanguageService.Base/FSharp.LanguageService.Base.csproj
浏览文件 @
ae135de9
...
...
@@ -62,6 +62,7 @@
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Immutable.11.0"
Version=
"$(MicrosoftVisualStudioShellImmutable110PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Interop.10.0"
Version=
"$(MicrosoftVisualStudioShellInterop100PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Interop.11.0"
Version=
"$(MicrosoftVisualStudioShellInterop110PackageVersion)"
/>
<PackageReference
Include=
"System.ValueTuple"
Version=
"$(SystemValueTuplePackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSHelp"
Version=
"$(VSSDKVSHelpPackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSLangProj.8"
Version=
"$(VSSDKVSLangProj8PackageVersion)"
/>
</ItemGroup>
...
...
vsintegration/src/FSharp.LanguageService/FSharp.LanguageService.fsproj
浏览文件 @
ae135de9
...
...
@@ -10,6 +10,7 @@
<NoWarn>
$(NoWarn);75
</NoWarn>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<OtherFlags>
$(OtherFlags) --warnon:1182 --subsystemversion:6.00
</OtherFlags>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
<EnableDefaultEmbeddedResourceItems>
false
</EnableDefaultEmbeddedResourceItems>
...
...
@@ -89,6 +90,7 @@
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Immutable.11.0"
Version=
"$(MicrosoftVisualStudioShellImmutable110PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Interop.10.0"
Version=
"$(MicrosoftVisualStudioShellInterop100PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Interop.11.0"
Version=
"$(MicrosoftVisualStudioShellInterop110PackageVersion)"
/>
<PackageReference
Include=
"System.ValueTuple"
Version=
"$(SystemValueTuplePackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSHelp"
Version=
"$(VSSDKVSHelpPackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSLangProj.8"
Version=
"$(VSSDKVSLangProj8PackageVersion)"
/>
</ItemGroup>
...
...
vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectSystem.fsproj
浏览文件 @
ae135de9
...
...
@@ -11,6 +11,7 @@
<NoWarn>
$(NoWarn);52;62;75
</NoWarn>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<OtherFlags>
$(OtherFlags) --warnon:1182 --subsystemversion:6.00
</OtherFlags>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
<EnableDefaultEmbeddedResourceItems>
false
</EnableDefaultEmbeddedResourceItems>
...
...
vsintegration/src/FSharp.VS.FSI/FSharp.VS.FSI.fsproj
浏览文件 @
ae135de9
...
...
@@ -10,6 +10,7 @@
<NoWarn>
$(NoWarn);47;75
</NoWarn>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<OtherFlags>
$(OtherFlags) --subsystemversion:6.00
</OtherFlags>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
<EnableDefaultEmbeddedResourceItems>
false
</EnableDefaultEmbeddedResourceItems>
...
...
@@ -84,6 +85,7 @@
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Design"
Version=
"$(MicrosoftVisualStudioShellDesignPackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.TextManager.Interop.10.0"
Version=
"$(MicrosoftVisualStudioTextManagerInterop100PackageVersion)"
/>
<PackageReference
Include=
"System.Collections.Immutable"
Version=
"$(SystemCollectionsImmutablePackageVersion)"
/>
<PackageReference
Include=
"System.ValueTuple"
Version=
"$(SystemValueTuplePackageVersion)"
/>
<PackageReference
Include=
"VSSDK.DebuggerVisualizers"
Version=
"$(VSSDKDebuggerVisualizersPackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSHelp"
Version=
"$(VSSDKVSHelpPackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSLangProj.8"
Version=
"$(VSSDKVSLangProj8PackageVersion)"
/>
...
...
vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
浏览文件 @
ae135de9
...
...
@@ -8,6 +8,7 @@
<NoWarn>
$(NoWarn);45;47;52;58;75
</NoWarn>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
<EnableDefaultEmbeddedResourceItems>
false
</EnableDefaultEmbeddedResourceItems>
</PropertyGroup>
...
...
vsintegration/tests/UnitTests/VisualFSharp.UnitTests.fsproj
浏览文件 @
ae135de9
...
...
@@ -9,6 +9,7 @@
<DefineConstants>
NO_PROJECTCRACKER;$(DefineConstants)
</DefineConstants>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<DisableImplicitSystemValueTupleReference>
true
</DisableImplicitSystemValueTupleReference>
<DefaultValueTuplePackageVersion>
$(SystemValueTuplePackageVersion)
</DefaultValueTuplePackageVersion>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
<EnableDefaultEmbeddedResourceItems>
false
</EnableDefaultEmbeddedResourceItems>
</PropertyGroup>
...
...
@@ -204,6 +205,7 @@
<PackageReference
Include=
"Microsoft.VisualStudio.TextManager.Interop"
Version=
"$(MicrosoftVisualStudioTextManagerInteropPackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.TextManager.Interop.8.0"
Version=
"$(MicrosoftVisualStudioTextManagerInterop80PackageVersion)"
/>
<PackageReference
Include=
"NUnit"
Version=
"$(NUnitPackageVersion)"
/>
<PackageReference
Include=
"System.ValueTuple"
Version=
"$(SystemValueTuplePackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSHelp"
Version=
"$(VSSDKVSHelpPackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSLangProj.8"
Version=
"$(VSSDKVSLangProj8PackageVersion)"
/>
</ItemGroup>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录