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

Commitd812517

Browse files
authored
Merge pull requestdotnet#4410 from brettfo/salsa-sdk
Convert `vsintegration\test` to the dotnet SDK
2 parentsf697a7d +dfd6b2e commitd812517

15 files changed

+137
-502
lines changed

‎RoslynPackageVersion.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.3.0-beta2-61719-01

‎VisualFSharp.sln‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "Project
3030
EndProject
3131
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") ="Tests","Tests","{CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}"
3232
EndProject
33-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.Salsa","vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj","{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
33+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.Salsa","vsintegration\tests\Salsa\VisualFSharp.Salsa.fsproj","{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}"
3434
EndProject
35-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") ="VisualFSharp.UnitTests","vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
35+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") ="VisualFSharp.UnitTests","vsintegration\tests\unittests\VisualFSharp.UnitTests.fsproj","{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}"
3636
EndProject
3737
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="DefinitionLocationAttribute","vsintegration\tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj","{DA39AD38-4A58-47BF-9215-E49768295169}"
3838
EndProject
@@ -246,18 +246,18 @@ Global
246246
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|Any CPU.Build.0=Release|Any CPU
247247
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.ActiveCfg=Release|Any CPU
248248
{B700E38B-F8C0-4E49-B5EC-DB7B7AC0C4E7}.Release|x86.Build.0=Release|Any CPU
249-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
250-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.Build.0=Debug|Any CPU
251-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.ActiveCfg=Debug|Any CPU
252-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.Build.0=Debug|Any CPU
249+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.ActiveCfg=Proto|Any CPU
250+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|Any CPU.Build.0=Proto|Any CPU
251+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.ActiveCfg=Proto|Any CPU
252+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Debug|x86.Build.0=Proto|Any CPU
253253
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
254254
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|Any CPU.Build.0=Proto|Any CPU
255255
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|x86.ActiveCfg=Proto|Any CPU
256256
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Proto|x86.Build.0=Proto|Any CPU
257-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.ActiveCfg=Release|Any CPU
258-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.Build.0=Release|Any CPU
259-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.ActiveCfg=Release|Any CPU
260-
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.Build.0=Release|Any CPU
257+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.ActiveCfg=Proto|Any CPU
258+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|Any CPU.Build.0=Proto|Any CPU
259+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.ActiveCfg=Proto|Any CPU
260+
{FCFB214C-462E-42B3-91CA-FC557EFEE74F}.Release|x86.Build.0=Proto|Any CPU
261261
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
262262
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|Any CPU.Build.0=Debug|Any CPU
263263
{6196B0F8-CAEA-4CF1-AF82-1B520F77FE44}.Debug|x86.ActiveCfg=Debug|Any CPU
@@ -274,10 +274,10 @@ Global
274274
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|Any CPU.Build.0=Debug|Any CPU
275275
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|x86.ActiveCfg=Debug|Any CPU
276276
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Debug|x86.Build.0=Debug|Any CPU
277-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
278-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.Build.0=Proto|Any CPU
279-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.ActiveCfg=Proto|Any CPU
280-
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.Build.0=Proto|Any CPU
277+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.ActiveCfg=Release|Any CPU
278+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|Any CPU.Build.0=Release|Any CPU
279+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.ActiveCfg=Release|Any CPU
280+
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Proto|x86.Build.0=Release|Any CPU
281281
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|Any CPU.ActiveCfg=Release|Any CPU
282282
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|Any CPU.Build.0=Release|Any CPU
283283
{FBD4B354-DC6E-4032-8EC7-C81D8DFB1AF7}.Release|x86.ActiveCfg=Release|Any CPU
@@ -286,10 +286,10 @@ Global
286286
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|Any CPU.Build.0=Debug|Any CPU
287287
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|x86.ActiveCfg=Debug|Any CPU
288288
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Debug|x86.Build.0=Debug|Any CPU
289-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.ActiveCfg=Proto|Any CPU
290-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.Build.0=Proto|Any CPU
291-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.ActiveCfg=Proto|Any CPU
292-
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.Build.0=Proto|Any CPU
289+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.ActiveCfg=Release|Any CPU
290+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|Any CPU.Build.0=Release|Any CPU
291+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.ActiveCfg=Release|Any CPU
292+
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Proto|x86.Build.0=Release|Any CPU
293293
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.ActiveCfg=Release|Any CPU
294294
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|Any CPU.Build.0=Release|Any CPU
295295
{EE85AAB7-CDA0-4C4E-BDA0-A64DDDD13E3F}.Release|x86.ActiveCfg=Release|Any CPU

‎build-everything.proj‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,17 @@
103103
<ProjectsToRestoreInclude="fcs/FSharp.Compiler.Service.Tests/FSharp.Compiler.Service.Tests.fsproj" />
104104
</ItemGroup>
105105

106-
<ItemGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
107-
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
106+
<ItemGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
107+
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-unittests-build.proj"/>
108108
</ItemGroup>
109+
<PropertyGroupCondition="'$(TEST_VS_IDEUNIT_SUITE)'=='1'">
110+
<RestoreVSIntegrationUnitTests>true</RestoreVSIntegrationUnitTests>
111+
</PropertyGroup>
109112

110113
<ItemGroup>
111114
<ProjectsToRestoreInclude="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj"Condition="'$(RestorePEVerify)' == 'true'" />
112115
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-src-build.proj"Condition="'$(RestoreVSIntegration)' == 'true'" />
116+
<ProjectsToRestoreInclude="vsintegration/fsharp-vsintegration-unittests-build.proj"Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
113117
</ItemGroup>
114118

115119
<PropertyGroup>

‎build/targets/PackageVersions.props‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,17 @@
22

33
<PropertyGroup>
44

5+
<!-- version numbers from files-->
6+
<RoslynPackageVersion>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\..\RoslynPackageVersion.txt').Trim())</RoslynPackageVersion>
7+
58
<!-- System.* packages-->
69
<SystemCollectionsImmutablePackageVersion>1.3.1</SystemCollectionsImmutablePackageVersion>
710

811
<!-- Roslyn packages-->
9-
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>2.3.0-beta2-61719-01</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
10-
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>2.3.0-beta2-61719-01</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
11-
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>2.3.0-beta2-61719-01</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
12-
<MicrosoftVisualStudioLanguageServicesPackageVersion>2.3.0-beta2-61719-01</MicrosoftVisualStudioLanguageServicesPackageVersion>
12+
<MicrosoftCodeAnalysisEditorFeaturesPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesPackageVersion>
13+
<MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisEditorFeaturesTextPackageVersion>
14+
<MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>$(RoslynPackageVersion)</MicrosoftCodeAnalysisWorkspacesCommonPackageVersion>
15+
<MicrosoftVisualStudioLanguageServicesPackageVersion>$(RoslynPackageVersion)</MicrosoftVisualStudioLanguageServicesPackageVersion>
1316

1417
<!-- Visual Studio packages-->
1518
<EnvDTE80PackageVersion>8.0.1</EnvDTE80PackageVersion>
@@ -47,6 +50,7 @@
4750
<MicrosoftMSXMLPackageVersion>8.0.0-alpha</MicrosoftMSXMLPackageVersion>
4851
<MicrosoftVisualFSharpMSBuild150PackageVersion>1.0.1</MicrosoftVisualFSharpMSBuild150PackageVersion>
4952
<NewtonsoftJsonPackageVersion>10.0.2</NewtonsoftJsonPackageVersion>
53+
<NUnitPackageVersion>3.5.0</NUnitPackageVersion>
5054
<XliffTasksPackageVersion>0.2.0-beta-000081</XliffTasksPackageVersion>
5155

5256
</PropertyGroup>

‎src/FSharpSource.Settings.targets‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,6 @@
7676
<BuildToolsTargets45>true</BuildToolsTargets45>
7777
<WarningsAsErrors />
7878

79-
<RoslynVersion>2.3.0-beta2-61719-01</RoslynVersion>
80-
<RoslynVSBinariesVersion>15.0</RoslynVSBinariesVersion>
8179
<RoslynVSPackagesVersion>15.0.26201</RoslynVSPackagesVersion>
8280
<SystemCollectionsImmutableVersion>1.3.1</SystemCollectionsImmutableVersion>
8381
<VSSDK_BUILDTOOLS_VERSION>Microsoft.VSSDK.BuildTools.15.1.192</VSSDK_BUILDTOOLS_VERSION>

‎vsintegration/fsharp-vsintegration-unittests-build.proj‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<ProjectFilesInclude="tests\Salsa\VisualFSharp.Salsa.fsproj"/>
9-
<ProjectFilesInclude="tests\unittests\VisualFSharp.UnitTests.fsproj"/>
8+
<ProjectFilesInclude="tests\Salsa\VisualFSharp.Salsa.fsproj"/>
9+
<ProjectFilesInclude="tests\unittests\VisualFSharp.UnitTests.fsproj"/>
1010
<ProjectFilesInclude="..\tests\service\data\TestTP\TestTP.fsproj" />
1111
<ProjectFilesInclude="..\tests\service\data\CSharp_Analysis\CSharp_Analysis.csproj" />
1212
<ProjectFilesInclude="tests\unittests\MockTypeProviders\DefinitionLocationAttribute\DefinitionLocationAttribute.csproj" />
@@ -23,6 +23,16 @@
2323
<ProjectFilesInclude="tests\unittests\MockTypeProviders\XmlDocAttributeWithNullComment\XmlDocAttributeWithNullComment.csproj" />
2424
</ItemGroup>
2525

26+
<ItemGroup>
27+
<SdkProjectsInclude="tests\Salsa\VisualFSharp.Salsa.fsproj" />
28+
<SdkProjectsInclude="tests\unittests\VisualFSharp.UnitTests.fsproj" />
29+
</ItemGroup>
30+
2631
<ImportProject="..\src\root.traversal.targets"/>
32+
33+
<TargetName="Restore">
34+
<MSBuildProjects="@(SdkProjects)"Targets="Restore" />
35+
</Target>
36+
2737
</Project>
2838

‎vsintegration/packages.config‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
<packageid="System.Threading.Tasks.Dataflow"version="4.5.24"targetFramework="net46" />
99
<packageid="Microsoft.Composition"version="1.0.30"targetFramework="net46" />
1010

11-
<packageid="Microsoft.CodeAnalysis.Common"version="2.3.0-beta2-61719-01"targetFramework="net46" />
12-
<packageid="Microsoft.CodeAnalysis.EditorFeatures"version="2.3.0-beta2-61719-01"targetFramework="net46" />
13-
<packageid="Microsoft.CodeAnalysis.EditorFeatures.Text"version="2.3.0-beta2-61719-01"targetFramework="net46" />
14-
<packageid="Microsoft.CodeAnalysis.Features"version="2.3.0-beta2-61719-01"targetFramework="net46" />
15-
<packageid="Microsoft.CodeAnalysis.Workspaces.Common"version="2.3.0-beta2-61719-01"targetFramework="net46" />
16-
<packageid="Microsoft.VisualStudio.LanguageServices"version="2.3.0-beta2-61719-01"targetFramework="net46" />
17-
1811
<packageid="EnvDTE"version="8.0.1"targetFramework="net46" />
1912
<packageid="EnvDTE80"version="8.0.1"targetFramework="net46" />
2013
<packageid="VSSDK.VSLangProj"version="7.0.4"targetFramework="net46" />

‎vsintegration/src/FSharp.ProjectSystem.PropertyPages/FSharp.PropertiesPages.vbproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
<UseCodebase>true</UseCodebase>
3434
<GeneratePkgDefFile>true</GeneratePkgDefFile>
3535
<IncludePkgdefInVSIXContainer>true</IncludePkgdefInVSIXContainer>
36+
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
3637
</PropertyGroup>
3738

3839
<ItemGroup>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<Project>
2+
<ImportProject="$([MSBuild]::GetPathOfFileAbove('FSharp.Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
3+
</Project>

0 commit comments

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