Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
b6cce2c9
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,发现更多精彩内容 >>
提交
b6cce2c9
编写于
2月 28, 2018
作者:
B
Brett V. Forsgren
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
convert `vsintegration/tests` to the dotnet SDK
上级
3f424469
变更
12
展开全部
隐藏空白更改
内联
并排
Showing
12 changed file
with
129 addition
and
489 deletion
+129
-489
VisualFSharp.sln
VisualFSharp.sln
+18
-18
build-everything.proj
build-everything.proj
+6
-2
build/targets/PackageVersions.props
build/targets/PackageVersions.props
+1
-0
vsintegration/fsharp-vsintegration-unittests-build.proj
vsintegration/fsharp-vsintegration-unittests-build.proj
+12
-2
vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
...ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
+1
-0
vsintegration/tests/Directory.Build.props
vsintegration/tests/Directory.Build.props
+3
-0
vsintegration/tests/Directory.Build.targets
vsintegration/tests/Directory.Build.targets
+3
-0
vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
+33
-178
vsintegration/tests/Salsa/VsMocks.fs
vsintegration/tests/Salsa/VsMocks.fs
+0
-10
vsintegration/tests/unittests/LegacyLanguageService/Tests.LanguageService.Script.fs
...sts/LegacyLanguageService/Tests.LanguageService.Script.fs
+1
-10
vsintegration/tests/unittests/VisualFSharp.UnitTests.dll.config
...gration/tests/unittests/VisualFSharp.UnitTests.dll.config
+2
-2
vsintegration/tests/unittests/VisualFSharp.UnitTests.fsproj
vsintegration/tests/unittests/VisualFSharp.UnitTests.fsproj
+49
-267
未找到文件。
VisualFSharp.sln
浏览文件 @
b6cce2c9
...
...
@@ -30,9 +30,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "Project
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
EndProject
Project("{
F2A71F9B-5D33-465A-A702-920D77279786
}") = "VisualFSharp.Salsa", "vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj", "{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
Project("{
6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705
}") = "VisualFSharp.Salsa", "vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj", "{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
EndProject
Project("{
F2A71F9B-5D33-465A-A702-920D77279786
}") = "VisualFSharp.UnitTests", "vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
Project("{
6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705
}") = "VisualFSharp.UnitTests", "vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj", "{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DefinitionLocationAttribute", "vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj", "{DA39AD38-4A58-47BF-9215-E49768295169}"
EndProject
...
...
@@ -246,18 +246,18 @@ Global
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.Build.0 = Release|Any CPU
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.ActiveCfg = Release|Any CPU
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.Build.0 = Release|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.ActiveCfg =
Debug
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.Build.0 =
Debug
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.ActiveCfg =
Debug
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.Build.0 =
Debug
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.ActiveCfg =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.Build.0 =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.ActiveCfg =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.Build.0 =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|Any CPU.Build.0 = Proto|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|x86.ActiveCfg = Proto|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|x86.Build.0 = Proto|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.ActiveCfg =
Release
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.Build.0 =
Release
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.ActiveCfg =
Release
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.Build.0 =
Release
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.ActiveCfg =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.Build.0 =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.ActiveCfg =
Proto
|Any CPU
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.Build.0 =
Proto
|Any CPU
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.ActiveCfg = Debug|Any CPU
...
...
@@ -274,10 +274,10 @@ Global
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|x86.ActiveCfg = Debug|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|x86.Build.0 = Debug|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.ActiveCfg =
Proto
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.Build.0 =
Proto
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.ActiveCfg =
Proto
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.Build.0 =
Proto
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.ActiveCfg =
Release
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.Build.0 =
Release
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.ActiveCfg =
Release
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.Build.0 =
Release
|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|Any CPU.Build.0 = Release|Any CPU
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|x86.ActiveCfg = Release|Any CPU
...
...
@@ -286,10 +286,10 @@ Global
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|x86.ActiveCfg = Debug|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|x86.Build.0 = Debug|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.ActiveCfg =
Proto
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.Build.0 =
Proto
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.ActiveCfg =
Proto
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.Build.0 =
Proto
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.ActiveCfg =
Release
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.Build.0 =
Release
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.ActiveCfg =
Release
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.Build.0 =
Release
|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.Build.0 = Release|Any CPU
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|x86.ActiveCfg = Release|Any CPU
...
...
build-everything.proj
浏览文件 @
b6cce2c9
...
...
@@ -103,13 +103,17 @@
<ProjectsToRestore Include="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
</ItemGroup>
<ItemGroup Condition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'"
>
<ProjectsWithNet40 Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
<ItemGroup Condition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
<ProjectsWithNet40 Include="vsintegration/fsharp-vsintegration-unittests-build.proj"
/>
</ItemGroup>
<PropertyGroup Condition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
<RestoreVSIntegrationUnitTests>true</RestoreVSIntegrationUnitTests>
</PropertyGroup>
<ItemGroup>
<ProjectsToRestore Include="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" Condition="'$(RestorePEVerify)' == 'true'" />
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-src-build.proj" Condition="'$(RestoreVSIntegration)' == 'true'" />
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
</ItemGroup>
<PropertyGroup>
...
...
build/targets/PackageVersions.props
浏览文件 @
b6cce2c9
...
...
@@ -47,6 +47,7 @@
<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>
<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>
<NewtonsoftJsonPackageVersion>10.0.2</NewtonsoftJsonPackageVersion>
<NUnitPackageVersion>3.5.0</NUnitPackageVersion>
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>
</PropertyGroup>
...
...
vsintegration/fsharp-vsintegration-unittests-build.proj
浏览文件 @
b6cce2c9
...
...
@@ -5,8 +5,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectFiles Include="tests\Salsa\VisualFSharp.Salsa.fsproj"/>
<ProjectFiles Include="tests\unittests\VisualFSharp.UnitTests.fsproj"/>
<ProjectFiles Include="tests\Salsa\VisualFSharp.Salsa.fsproj"
/>
<ProjectFiles Include="tests\unittests\VisualFSharp.UnitTests.fsproj"
/>
<ProjectFiles Include="..\tests\service\data\TestTP\TestTP.fsproj" />
<ProjectFiles Include="..\tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj" />
<ProjectFiles Include="tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" />
...
...
@@ -23,6 +23,16 @@
<ProjectFiles Include="tests\unittests\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj" />
</ItemGroup>
<ItemGroup>
<SdkProjects Include="tests\Salsa\VisualFSharp.Salsa.fsproj" />
<SdkProjects Include="tests\unittests\VisualFSharp.UnitTests.fsproj" />
</ItemGroup>
<Import Project="..\src\root.traversal.targets"/>
<Target Name="Restore">
<MSBuild Projects="@(SdkProjects)" Targets="Restore" />
</Target>
</Project>
vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj
浏览文件 @
b6cce2c9
...
...
@@ -33,6 +33,7 @@
<UseCodebase>
true
</UseCodebase>
<GeneratePkgDefFile>
true
</GeneratePkgDefFile>
<IncludePkgdefInVSIXContainer>
true
</IncludePkgdefInVSIXContainer>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
</PropertyGroup>
<ItemGroup>
...
...
vsintegration/tests/Directory.Build.props
0 → 100644
浏览文件 @
b6cce2c9
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
</Project>
vsintegration/tests/Directory.Build.targets
0 → 100644
浏览文件 @
b6cce2c9
<Project>
<Import Project="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
</Project>
vsintegration/tests/Salsa/VisualFSharp.Salsa.fsproj
浏览文件 @
b6cce2c9
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) Microsoft Corporation. All Rights Reserved. See License.txt in the project root for license information.-->
<Project
ToolsVersion=
"15.0"
DefaultTargets=
"Build"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<PropertyGroup>
<FSharpSourcesRoot>
$(MSBuildProjectDirectory)\..\..\..\src
</FSharpSourcesRoot>
<ProjectLanguage>
FSharp
</ProjectLanguage>
<Name>
VisualFSharp.Salsa
</Name>
</PropertyGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.settings.targets"
/>
<Project
Sdk=
"Microsoft.NET.Sdk"
>
<PropertyGroup>
<Configuration
Condition=
" '$(Configuration)' == '' "
>
Debug
</Configuration>
<Platform
Condition=
" '$(Platform)' == '' "
>
AnyCPU
</Platform>
<SchemaVersion>
2.0
</SchemaVersion>
<ProjectGuid>
{fbd4b354-dc6e-4032-8ec7-c81d8dfb1af7}
</ProjectGuid>
<TargetFramework>
net46
</TargetFramework>
<OutputType>
Library
</OutputType>
<AssemblyName>
VisualFSharp.Salsa
</AssemblyName>
<NoWarn>
$(NoWarn);45;47;52;58;75
</NoWarn>
<TargetFrameworkVersion>
v4.6
</TargetFrameworkVersion>
<DisableImplicitFSharpCoreReference>
true
</DisableImplicitFSharpCoreReference>
<UsePackageTargetFallbackHack>
true
</UsePackageTargetFallbackHack>
</PropertyGroup>
<ItemGroup>
...
...
@@ -35,177 +27,40 @@
<Compile
Include=
"SalsaUtils.fs"
/>
</ItemGroup>
<ItemGroup>
<ProjectReference
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj"
/>
<ProjectReference
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharp.Build.fsproj"
/>
<ProjectReference
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj"
/>
<ProjectReference
Include=
"..\..\src\FSharp.Editor\FSharp.Editor.fsproj"
/>
<ProjectReference
Include=
"..\..\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj"
/>
<ProjectReference
Include=
"..\..\src\FSharp.LanguageService\FSharp.LanguageService.fsproj"
/>
<ProjectReference
Include=
"..\..\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj"
/>
<ProjectReference
Include=
"..\..\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj"
/>
</ItemGroup>
<ItemGroup>
<Reference
Include=
"mscorlib"
/>
<Reference
Include=
"System"
/>
<Reference
Include=
"System.ComponentModel.Composition"
/>
<Reference
Include=
"System.Xml"
/>
<Reference
Include=
"System.Windows.Forms"
/>
<Reference
Include=
"System.Xml"
/>
</ItemGroup>
<ItemGroup>
<Reference
Include=
"Microsoft.Build.Framework, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Framework.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Build, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Build.Utilities.Core, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Utilities.Core.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.Build.Tasks.Core, Version=$(VisualStudioVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualFSharp.Msbuild.15.0.1.0.1\lib\net45\Microsoft.Build.Tasks.Core.dll
</HintPath>
</Reference>
<Reference
Include=
"EnvDTE"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"EnvDTE80"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"VSLangProj"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.7.0.4\lib\net20\VSLangProj.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"VSLangProj80"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\VSSDK.VSLangProj.8.8.0.4\lib\net20\VSLangProj80.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.OLE.Interop"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.Interop"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.Interop.8.0"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.Interop.9.0"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.Interop.10.0"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.Interop.11.0"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Interop.11.0.11.0.61030\lib\Microsoft.VisualStudio.Shell.Interop.11.0.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.ProjectAggregator"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.ProjectAggregator.8.0.50727\lib\net45\Microsoft.VisualStudio.ProjectAggregator.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.TextManager.Interop"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.TextManager.Interop.8.0"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Designer.Interfaces"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Designer.Interfaces.1.1.4322\lib\microsoft.visualstudio.designer.interfaces.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Text.Internal, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Internal.$(RoslynVSPackagesVersion)-alpha\lib\net46\Microsoft.VisualStudio.Text.Internal.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Platform.VSEditor, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Platform.VSEditor.$(RoslynVSPackagesVersion)-alpha\lib\net46\Microsoft.VisualStudio.Platform.VSEditor.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Platform.VSEditor.Interop, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Platform.VSEditor.Interop.$(RoslynVSPackagesVersion)-alpha\lib\net46\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Telemetry, Version=15.0.777-rtm6FAA2C78, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Telemetry.15.0.777-rtm6FAA2C78\lib\net45\Microsoft.VisualStudio.Telemetry.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.VSHelp"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\VSSDK.VSHelp.7.0.4\lib\net20\Microsoft.VisualStudio.VSHelp.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Threading"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Threading.$(MicrosoftVisualStudioThreadingVersion)\lib\net45\Microsoft.VisualStudio.Threading.dll
</HintPath>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Text.UI.Wpf, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.UI.Wpf.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Text.Data, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Text.Data.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Text.Data.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.CoreUtility, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.CoreUtility.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.CoreUtility.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.Design, Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.Design.$(RoslynVSPackagesVersion)\lib\net45\Microsoft.VisualStudio.Shell.Design.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion), Version=$(RoslynVSBinariesVersion).0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).$(RoslynVSPackagesVersion)\lib\Microsoft.VisualStudio.Shell.$(RoslynVSBinariesVersion).dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"Microsoft.CodeAnalysis.Workspaces"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\Microsoft.CodeAnalysis.Workspaces.Common.$(RoslynVersion)\lib\netstandard1.3\Microsoft.CodeAnalysis.Workspaces.dll
</HintPath>
<Private>
True
</Private>
</Reference>
<Reference
Include=
"nunit.framework"
>
<Private>
True
</Private>
<HintPath>
$(NUnitLibDir)\nunit.framework.dll
</HintPath>
</Reference>
<Reference
Include=
"System.ValueTuple"
>
<HintPath>
$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll
</HintPath>
<Private>
true
</Private>
</Reference>
<ProjectReference
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj"
>
<Project>
{DED3BBD7-53F4-428A-8C9F-27968E768605}
</Project>
<Name>
FSharp.Core
</Name>
</ProjectReference>
<ProjectReference
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Build\FSharp.Build.fsproj"
>
<Name>
FSharp.Build
</Name>
<Project>
{702a7979-bcf9-4c41-853e-3adfc9897890}
</Project>
<Private>
True
</Private>
</ProjectReference>
<ProjectReference
Include=
"$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj"
>
<Project>
{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}
</Project>
<Name>
FSharp.Compiler.Private
</Name>
<Private>
True
</Private>
</ProjectReference>
<ProjectReference
Include=
"..\..\src\FSharp.Editor\FSharp.Editor.fsproj"
>
<Name>
FSharp.Editor
</Name>
<Project>
{65e0e82a-eace-4787-8994-888674c2fe87}
</Project>
<Private>
True
</Private>
</ProjectReference>
<ProjectReference
Include=
"..\..\src\FSharp.LanguageService.Base\FSharp.LanguageService.Base.csproj"
>
<Name>
FSharp.LanguageService.Base
</Name>
<Project>
{1c5c163c-37ea-4a3c-8ccc-0d34b74bf8ef}
</Project>
<Private>
True
</Private>
</ProjectReference>
<ProjectReference
Include=
"..\..\src\FSharp.LanguageService\FSharp.LanguageService.fsproj"
>
<Name>
FSharp.LanguageService
</Name>
<Project>
{ee85aab7-cda0-4c4e-bda0-a64ccc413e3f}
</Project>
<Private>
True
</Private>
</ProjectReference>
<ProjectReference
Include=
"..\..\src\FSharp.ProjectSystem.Base\Project\ProjectSystem.Base.csproj"
>
<Name>
ProjectSystem.Base
</Name>
<Project>
{b700e38b-f8c0-4e49-b5ec-db7b7ac0c4e7}
</Project>
<Private>
True
</Private>
</ProjectReference>
<ProjectReference
Include=
"..\..\src\FSharp.ProjectSystem.FSharp\ProjectSystem.fsproj"
>
<Name>
FSharp.ProjectSystem.FSharp
</Name>
<Project>
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}
</Project>
<Private>
True
</Private>
</ProjectReference>
<PackageReference
Include=
"EnvDTE80"
Version=
"$(EnvDTE80PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.CodeAnalysis.Workspaces.Common"
Version=
"$(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualFSharp.Msbuild.15.0"
Version=
"$(MicrosoftVisualFSharpMSBuild150PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Designer.Interfaces"
Version=
"$(MicrosoftVisualStudioDesignerInterfacesPackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.ProjectAggregator"
Version=
"$(MicrosoftVisualStudioProjectAggregatorPackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.15.0"
Version=
"$(MicrosoftVisualStudioShell150PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Design"
Version=
"$(MicrosoftVisualStudioShellDesignPackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Interop.10.0"
Version=
"$(MicrosoftVisualStudioShellInterop100PackageVersion)"
/>
<PackageReference
Include=
"Microsoft.VisualStudio.Shell.Interop.11.0"
Version=
"$(MicrosoftVisualStudioShellInterop110PackageVersion)"
/>
<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=
"VSSDK.VSHelp"
Version=
"$(VSSDKVSHelpPackageVersion)"
/>
<PackageReference
Include=
"VSSDK.VSLangProj.8"
Version=
"$(VSSDKVSLangProj8PackageVersion)"
/>
</ItemGroup>
<Import
Project=
"$(FSharpSourcesRoot)\FSharpSource.targets"
/>
<Import
Project=
"$(FSharpSourcesRoot)\..\vsintegration\vsintegration.targets"
/>
</Project>
\ No newline at end of file
</Project>
vsintegration/tests/Salsa/VsMocks.fs
浏览文件 @
b6cce2c9
...
...
@@ -1637,18 +1637,8 @@ module internal VsActual =
let
vsInstallDir
=
// use the environment variable to find the VS installdir
#
if
VS_VERSION_DEV12
let
vsvar
=
System
.
Environment
.
GetEnvironmentVariable
(
"VS120COMNTOOLS"
)
if
String
.
IsNullOrEmpty
vsvar
then
failwith
"VS120COMNTOOLS environment variable was not found."
#
endif
#
if
VS_VERSION_DEV14
let
vsvar
=
System
.
Environment
.
GetEnvironmentVariable
(
"VS140COMNTOOLS"
)
if
String
.
IsNullOrEmpty
vsvar
then
failwith
"VS140COMNTOOLS environment variable was not found."
#
endif
#
if
VS_VERSION_DEV15
let
vsvar
=
System
.
Environment
.
GetEnvironmentVariable
(
"VS150COMNTOOLS"
)
if
String
.
IsNullOrEmpty
vsvar
then
failwith
"VS150COMNTOOLS environment variable was not found."
#
endif
Path
.
Combine
(
vsvar
,
".."
)
let
CreateEditorCatalog
()
=
...
...
vsintegration/tests/unittests/LegacyLanguageService/Tests.LanguageService.Script.fs
浏览文件 @
b6cce2c9
...
...
@@ -1335,16 +1335,7 @@ type UsingMSBuild() as this =
use
_
guard
=
this
.
UsingNewVS
()
let
solution
=
this
.
CreateSolution
()
let
project
=
CreateProject
(
solution
,
"testproject"
)
let
fsVersion
=
#
if
VS_VERSION_DEV12
"4.3.1.0"
#
endif
#
if
VS_VERSION_DEV14
"4.4.0.0"
#
endif
#
if
VS_VERSION_DEV15
"4.4.1.0"
#
endif
let
fsVersion
=
"4.4.1.0"
let
binariesFolder
=
match
Internal
.
Utilities
.
FSharpEnvironment
.
BinFolderOfDefaultFSharpCompiler
(
None
)
with
|
Some
(
x
)
->
x
|
None
->
failwith
"Location of binaries folder cannot be found"
...
...
vsintegration/tests/unittests/VisualFSharp.UnitTests.dll.config
浏览文件 @
b6cce2c9
...
...
@@ -20,11 +20,11 @@
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"Microsoft.Build.Framework"
publicKeyToken
=
"b03f5f7f11d50a3a"
culture
=
"neutral"
/>
<
bindingRedirect
oldVersion
=
"2.0.0.0-
{VisualStudioVersion}.0.0"
newVersion
=
"{VisualStudioVersion}
.0.0"
/>
<
bindingRedirect
oldVersion
=
"2.0.0.0-
15.6.0.0"
newVersion
=
"15.6
.0.0"
/>
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"Microsoft.Build.Utilities"
publicKeyToken
=
"b03f5f7f11d50a3a"
culture
=
"neutral"
/>
<
bindingRedirect
oldVersion
=
"2.0.0.0-
{VisualStudioVersion}.0.0"
newVersion
=
"{VisualStudioVersion}
.0.0"
/>
<
bindingRedirect
oldVersion
=
"2.0.0.0-
15.6.0.0"
newVersion
=
"15.6
.0.0"
/>
</
dependentAssembly
>
<
dependentAssembly
>
<
assemblyIdentity
name
=
"FSharp.Core"
publicKeyToken
=
"b03f5f7f11d50a3a"
culture
=
"neutral"
/>
...
...
vsintegration/tests/unittests/VisualFSharp.UnitTests.fsproj
浏览文件 @
b6cce2c9
此差异已折叠。
点击以展开。
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录