Skip to content

Commit f214dcc

Browse files
brettfobrettfo
authored
Merge pull request #4417 from brettfo/vsix-sdk
convert VSIX packages to the dotnet SDK
2 parents c0ac091 + 2296c2b commit f214dcc

24 files changed

+165
-463
lines changed

‎VisualFSharp.sln‎

Lines changed: 16 additions & 16 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.27130.2024
4+
VisualStudioVersion = 15.0.27130.2036
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
@@ -114,17 +114,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "XMLFile", "vsintegration\It
114114
EndProject
115115
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Vsix", "Vsix", "{141F6C23-E1B1-4D89-9F10-F0B8AD58E71F}"
116116
EndProject
117-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpFull", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj", "{59ADCE46-9740-4079-834D-9A03A3494EBC}"
117+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualFSharpFull", "vsintegration\Vsix\VisualFSharpFull\VisualFSharpFull.csproj", "{59ADCE46-9740-4079-834D-9A03A3494EBC}"
118118
EndProject
119-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualFSharpOpenSource", "vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj", "{E6A45CDF-B408-420F-B475-74611BEFC52B}"
119+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VisualFSharpOpenSource", "vsintegration\Vsix\VisualFSharpOpenSource\VisualFSharpOpenSource.csproj", "{E6A45CDF-B408-420F-B475-74611BEFC52B}"
120120
EndProject
121121
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HostedCompilerServer", "tests\fsharpqa\testenv\src\HostedCompilerServer\HostedCompilerServer.fsproj", "{4239EFEA-E746-446A-BF7A-51FCBAB13946}"
122122
EndProject
123123
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ILComparer", "tests\fsharpqa\testenv\src\ILComparer\ILComparer.fsproj", "{2E60864A-E3FF-4BCC-810F-DC7C34E6B236}"
124124
EndProject
125125
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utils", "Utils", "{D086C8C6-D00D-4C3B-9AB2-A4286C9F5922}"
126126
EndProject
127-
Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "LanguageServiceProfiling", "vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj", "{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
127+
Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "LanguageServiceProfiling", "vsintegration\Utils\LanguageServiceProfiling\LanguageServiceProfiling.fsproj", "{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}"
128128
EndProject
129129
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FSharp.UIResources", "vsintegration\src\FSharp.UIResources\FSharp.UIResources.csproj", "{C4586A06-1402-48BC-8E35-A1B8642F895B}"
130130
EndProject
@@ -646,10 +646,10 @@ Global
646646
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
647647
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.ActiveCfg = Debug|Any CPU
648648
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Debug|x86.Build.0 = Debug|Any CPU
649-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
650-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0 = Proto|Any CPU
651-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg = Proto|Any CPU
652-
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0 = Proto|Any CPU
649+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.ActiveCfg = Release|Any CPU
650+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|Any CPU.Build.0 = Release|Any CPU
651+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.ActiveCfg = Release|Any CPU
652+
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Proto|x86.Build.0 = Release|Any CPU
653653
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
654654
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|Any CPU.Build.0 = Release|Any CPU
655655
{59ADCE46-9740-4079-834D-9A03A3494EBC}.Release|x86.ActiveCfg = Release|Any CPU
@@ -658,10 +658,10 @@ Global
658658
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|Any CPU.Build.0 = Debug|Any CPU
659659
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.ActiveCfg = Debug|Any CPU
660660
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Debug|x86.Build.0 = Debug|Any CPU
661-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
662-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0 = Proto|Any CPU
663-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg = Proto|Any CPU
664-
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0 = Proto|Any CPU
661+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.ActiveCfg = Release|Any CPU
662+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|Any CPU.Build.0 = Release|Any CPU
663+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.ActiveCfg = Release|Any CPU
664+
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Proto|x86.Build.0 = Release|Any CPU
665665
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.ActiveCfg = Release|Any CPU
666666
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|Any CPU.Build.0 = Release|Any CPU
667667
{E6A45CDF-B408-420F-B475-74611BEFC52B}.Release|x86.ActiveCfg = Release|Any CPU
@@ -694,10 +694,10 @@ Global
694694
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|Any CPU.Build.0 = Debug|Any CPU
695695
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.ActiveCfg = Debug|Any CPU
696696
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Debug|x86.Build.0 = Debug|Any CPU
697-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg = Proto|Any CPU
698-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0 = Proto|Any CPU
699-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg = Proto|Any CPU
700-
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0 = Proto|Any CPU
697+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.ActiveCfg = Release|Any CPU
698+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|Any CPU.Build.0 = Release|Any CPU
699+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.ActiveCfg = Release|Any CPU
700+
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Proto|x86.Build.0 = Release|Any CPU
701701
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.ActiveCfg = Release|Any CPU
702702
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|Any CPU.Build.0 = Release|Any CPU
703703
{E7FA3A71-51AF-4FCA-9C2F-7C853E515903}.Release|x86.ActiveCfg = Release|Any CPU

‎build-everything.proj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@
3636
</ItemGroup>
3737
<PropertyGroup Condition="'$(BUILD_VS)'=='1'">
3838
<RestoreVSIntegration>true</RestoreVSIntegration>
39+
<RestoreLanguageServiceProfiling>true</RestoreLanguageServiceProfiling>
3940
<RestoreVSIntegrationItemTemplates>true</RestoreVSIntegrationItemTemplates>
4041
<RestoreVSIntegrationProjectTemplates>true</RestoreVSIntegrationProjectTemplates>
42+
<RestoreVSIntegrationVsix>true</RestoreVSIntegrationVsix>
4143
</PropertyGroup>
4244

4345
<ItemGroup Condition="'$(BUILD_FCS)'=='1'">
@@ -114,10 +116,12 @@
114116

115117
<ItemGroup>
116118
<ProjectsToRestore Include="tests/fsharpqa/testenv/src/PEVerify/PEVerify.csproj" Condition="'$(RestorePEVerify)' == 'true'" />
119+
<ProjectsToRestore Include="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj" Condition="'$(RestoreLanguageServiceProfiling)' == 'true'" />
117120
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-src-build.proj" Condition="'$(RestoreVSIntegration)' == 'true'" />
118121
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(RestoreVSIntegrationUnitTests)' == 'true'" />
119122
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" Condition="'$(RestoreVSIntegrationItemTemplates)' == 'true'" />
120123
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" Condition="'$(RestoreVSIntegrationProjectTemplates)' == 'true'" />
124+
<ProjectsToRestore Include="vsintegration/fsharp-vsintegration-vsix-build.proj" Condition="'$(RestoreVSIntegrationVsix)' == 'true'" />
121125
</ItemGroup>
122126

123127
<PropertyGroup>

‎build.cmd‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -624,11 +624,6 @@ if "%RestorePackages%" == "true" (
624624
%_nugetexe% restore packages.config !_nugetoptions!
625625
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
626626

627-
if "%BUILD_VS%" == "1" (
628-
%_nugetexe% restore vsintegration\packages.config !_nugetoptions!
629-
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure
630-
)
631-
632627
if "%BUILD_SETUP%" == "1" (
633628
%_nugetexe% restore setup\packages.config !_nugetoptions!
634629
@if ERRORLEVEL 1 echo Error: Nuget restore failed && goto :failure

‎build/targets/AssemblyVersions.props‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,8 @@
4343
<VsixPackageVersion>$(MicroBuildAssemblyVersion_WithoutRevision).$(BuildTimeStamp)</VsixPackageVersion>
4444
<NuGetPackageVersionSuffix>$(BuildTimeStamp_Date)-$(BuildTimeStamp_Number)</NuGetPackageVersionSuffix>
4545
</PropertyGroup>
46+
47+
<Target Name="GetVsixPackageVersion" Outputs="$(VsixPackageVersion)">
48+
</Target>
49+
4650
</Project>

‎vsintegration/FSharp.Directory.Build.props‎ renamed to ‎vsintegration/Directory.Build.props‎

File renamed without changes.

‎vsintegration/FSharp.Directory.Build.targets‎ renamed to ‎vsintegration/Directory.Build.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
<PackageTargetFallback>net462</PackageTargetFallback>
1212
</PropertyGroup>
1313

14+
<PropertyGroup Condition="'$(CreateVsixContainer)' == 'true'">
15+
<!-- Ensure VSIX packages end up in the proper location. -->
16+
<OutDir>$(OutputPath)\</OutDir>
17+
</PropertyGroup>
18+
1419
<ImportGroup Condition="'$(ImportVsSDK)' == 'true'">
1520
<Import Project="$(NuGetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.props" />
1621
<Import Project="$(NugetPackageRoot)Microsoft.VSSDK.BuildTools\$(MicrosoftVSSDKBuildToolsPackageVersion)\build\Microsoft.VsSDK.BuildTools.targets" />

‎vsintegration/Templates.Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22

3-
<Import Project="FSharp.Directory.Build.props" />
3+
<Import Project="Directory.Build.props" />
44

55
<PropertyGroup>
66
<TargetFramework>net46</TargetFramework>

‎vsintegration/Templates.Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22

3-
<Import Project="FSharp.Directory.Build.targets" />
3+
<Import Project="Directory.Build.targets" />
44

55
<PropertyGroup>
66
<OutputPath>$(FSharpSourcesRoot)\..\$(Configuration)\$(TargetDotnetProfile)\bin\$(TemplateCategory)\$(AssemblyName)</OutputPath>

‎vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj‎

Lines changed: 14 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
2+
<Project Sdk="Microsoft.NET.Sdk">
3+
44
<PropertyGroup>
5-
<FSharpSourcesRoot>$(MSBuildProjectDirectory)\..\..\..\src</FSharpSourcesRoot>
6-
<ProjectLanguage>FSharp</ProjectLanguage>
7-
</PropertyGroup>
8-
<Import Project="$(FSharpSourcesRoot)\FSharpSource.settings.targets" />
9-
<PropertyGroup>
10-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
11-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
12-
<SchemaVersion>2.0</SchemaVersion>
13-
<ProjectGuid>e7fa3a71-51af-4fca-9c2f-7c853e515903</ProjectGuid>
5+
<TargetFramework>net46</TargetFramework>
146
<OutputType>Exe</OutputType>
15-
<RootNamespace>LanguageServiceProfiling</RootNamespace>
16-
<AssemblyName>LanguageServiceProfiling</AssemblyName>
17-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
18-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
19-
<TargetFSharpCoreVersion>4.4.1.0</TargetFSharpCoreVersion>
20-
<Name>LanguageServiceProfiling</Name>
21-
</PropertyGroup>
22-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23-
<DebugSymbols>true</DebugSymbols>
24-
<Optimize>false</Optimize>
25-
<Tailcalls>false</Tailcalls>
26-
<OutputPath>bin\$(Configuration)\</OutputPath>
27-
<DefineConstants>DEBUG;TRACE</DefineConstants>
28-
<WarningLevel>3</WarningLevel>
29-
<PlatformTarget>x86</PlatformTarget>
30-
<DocumentationFile>
31-
</DocumentationFile>
32-
<Prefer32Bit>true</Prefer32Bit>
33-
</PropertyGroup>
34-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
35-
<Optimize>true</Optimize>
36-
<Tailcalls>true</Tailcalls>
37-
<OutputPath>bin\$(Configuration)\</OutputPath>
38-
<DefineConstants>TRACE</DefineConstants>
39-
<WarningLevel>3</WarningLevel>
40-
<PlatformTarget>x86</PlatformTarget>
41-
<DocumentationFile>
42-
</DocumentationFile>
43-
<Prefer32Bit>true</Prefer32Bit>
7+
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
8+
<UsePackageTargetFallbackHack>true</UsePackageTargetFallbackHack>
449
</PropertyGroup>
10+
4511
<ItemGroup>
4612
<Compile Include="AssemblyInfo.fs" />
4713
<Compile Include="ProjectCracker.fs" />
4814
<Compile Include="Options.fs" />
4915
<Compile Include="Program.fs" />
5016
<None Include="App.config" />
51-
<Content Include="packages.config" />
5217
</ItemGroup>
18+
19+
<ItemGroup>
20+
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Core\FSharp.Core.fsproj" />
21+
<ProjectReference Include="$(FSharpSourcesRoot)\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj" />
22+
</ItemGroup>
23+
5324
<ItemGroup>
5425
<Reference Include="mscorlib" />
5526
<Reference Include="System" />
5627
<Reference Include="System.Core" />
5728
<Reference Include="System.Numerics" />
58-
<Reference Include="System.ValueTuple">
59-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
60-
</Reference>
6129
<Reference Include="System.Xml" />
6230
</ItemGroup>
63-
<ItemGroup>
64-
<ProjectReference Include="..\..\..\src\fsharp\FSharp.Core\FSharp.Core.fsproj">
65-
<Name>FSharp.Core</Name>
66-
<Project>{ded3bbd7-53f4-428a-8c9f-27968e768605}</Project>
67-
<Private>True</Private>
68-
</ProjectReference>
69-
<ProjectReference Include="..\..\..\src\fsharp\FSharp.Compiler.Private\FSharp.Compiler.Private.fsproj">
70-
<Project>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</Project>
71-
<Name>FSharp.Compiler.Private</Name>
72-
<Private>True</Private>
73-
</ProjectReference>
74-
<Reference Include="System.ValueTuple">
75-
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.1\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
76-
<Private>true</Private>
77-
</Reference>
78-
</ItemGroup>
79-
<Import Project="$(FSharpSourcesRoot)\FSharpSource.targets" />
80-
</Project>
31+
32+
</Project>

‎vsintegration/Utils/LanguageServiceProfiling/packages.config‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)