Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Porting ObjectiveC language services VSIX to VS2017 #1745

Merged
merged 1 commit into from
Jan 26, 2017
+589 −102
Merged

Porting ObjectiveC language services VSIX to VS2017 #1745

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bin/objc-language-services-VS2017.vsix
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions bin/objc-syntax-highlighting.vsix
View file
Open in desktop
Git LFS file not shown
36 changes: 16 additions & 20 deletions msvc/language/BuildMonitor/BuildMonitor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.1.24720\build\Microsoft.VSSDK.BuildTools.props')" />
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<UseCodebase>true</UseCodebase>
<TargetFrameworkProfile />
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>14.0</OldToolsVersion>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>false</SignAssembly>
Expand All @@ -22,9 +27,9 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}</ProjectGuid>
<ProjectGuid>{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AppDesignerFolder>..\src\BuildMonitor\Properties</AppDesignerFolder>
<RootNamespace>BuildMonitor</RootNamespace>
<AssemblyName>BuildMonitor</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
Expand Down Expand Up @@ -53,15 +58,15 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="BuildMonitor.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="BuildTelemetryClient.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<Compile Include="..\src\BuildMonitor\BuildMonitor.cs" />
<Compile Include="..\src\BuildMonitor\Properties\AssemblyInfo.cs" />
<Compile Include="..\src\BuildMonitor\BuildTelemetryClient.cs" />
<Compile Include="..\src\BuildMonitor\Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="BuildEventProcessor.cs" />
<Compile Include="..\src\BuildMonitor\BuildEventProcessor.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
Expand Down Expand Up @@ -179,27 +184,18 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<EmbeddedResource Include="..\src\BuildMonitor\Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="VSPackage.resx">
<EmbeddedResource Include="..\src\BuildMonitor\VSPackage.resx">
<MergeWithCTO>true</MergeWithCTO>
<ManifestResourceName>VSPackage</ManifestResourceName>
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ObjectiveC\ObjectiveC.csproj">
<Project>{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}</Project>
<Name>ObjectiveC</Name>
<VSIXSubPath>Asset</VSIXSubPath>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
<Folder Include="..\src\BuildMonitor\Resources\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
Expand Down
44 changes: 23 additions & 21 deletions msvc/language/BuildMonitor/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="BuildMonitor..0a528553-98c4-4948-a43c-bef2784df92c" Version="1.5" Language="en-US" Publisher="Microsoft" />
<DisplayName>BuildMonitor</DisplayName>
<Description xml:space="preserve">BuildMonitor watches the solution build process and reports WinObjC errors.</Description>
</Metadata>
<Installation>
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ObjectiveC" d:VsixSubPath="Asset" Path="|ObjectiveC|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
<Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
<Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
</Assets>
<Metadata>
<Identity Id="BuildMonitor..0a528553-98c4-4948-a43c-bef2784df92c" Version="1.5" Language="en-US" Publisher="Microsoft" />
<DisplayName>BuildMonitor</DisplayName>
<Description xml:space="preserve">BuildMonitor watches the solution build process and reports WinObjC errors.</Description>
</Metadata>
<Installation>
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Premium" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
<Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
<Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
30 changes: 12 additions & 18 deletions msvc/language/ObjectiveC.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,25 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.24720.0
# Visual Studio 15
VisualStudioVersion = 15.0.26117.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveC", "ObjectiveC\ObjectiveC.csproj", "{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveCVSIX", "VSIX\ObjectiveCVSIX.csproj", "{E2DCDF86-DD71-4969-B280-B914EC0181E5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ObjectiveCVSIX", "VSIX\ObjectiveCVSIX.csproj", "{F39AC9D8-76A8-4104-8469-1B7270B49230}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildMonitor", "BuildMonitor\BuildMonitor.csproj", "{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BuildMonitor", "BuildMonitor\BuildMonitor.csproj", "{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}.Release|Any CPU.Build.0 = Release|Any CPU
{F39AC9D8-76A8-4104-8469-1B7270B49230}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F39AC9D8-76A8-4104-8469-1B7270B49230}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F39AC9D8-76A8-4104-8469-1B7270B49230}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F39AC9D8-76A8-4104-8469-1B7270B49230}.Release|Any CPU.Build.0 = Release|Any CPU
{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}.Release|Any CPU.Build.0 = Release|Any CPU
{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E2DCDF86-DD71-4969-B280-B914EC0181E5}.Release|Any CPU.Build.0 = Release|Any CPU
{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
24 changes: 6 additions & 18 deletions msvc/language/VSIX/ObjectiveCVSIX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
<FileUpgradeFlags>
Expand Down Expand Up @@ -31,9 +31,9 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<SchemaVersion>2.0</SchemaVersion>
<ProjectTypeGuids>{82b43b9b-a64c-4715-b499-d71e9ca2bd60};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ProjectGuid>{F39AC9D8-76A8-4104-8469-1B7270B49230}</ProjectGuid>
<ProjectGuid>{E2DCDF86-DD71-4969-B280-B914EC0181E5}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AppDesignerFolder>..\src\VSIX\Properties</AppDesignerFolder>
<RootNamespace>VSIX</RootNamespace>
<AssemblyName>VSIX</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
Expand Down Expand Up @@ -62,10 +62,10 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\src\VSIX\Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Visualizers\ObjectiveC.natstepfilter">
<Content Include="..\src\VSIX\Visualizers\ObjectiveC.natstepfilter">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
<None Include="source.extension.vsixmanifest">
Expand All @@ -74,19 +74,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\BuildMonitor\BuildMonitor.csproj">
<Project>{4AFFC8B4-B61B-4749-BA97-D7CD5596976A}</Project>
<Project>{AC63D242-9FDD-4958-A79B-A7CD2EBC7F25}</Project>
<Name>BuildMonitor</Name>
<VSIXSubPath>BM</VSIXSubPath>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3bPkgdefProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
<ProjectReference Include="..\ObjectiveC\ObjectiveC.csproj">
<Project>{D92AF1E6-7318-4CC0-9E1E-074E96C7E0FB}</Project>
<Name>ObjectiveC</Name>
<VSIXSubPath>Asset</VSIXSubPath>
<IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
<IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<BootstrapperPackage Include=".NETFramework,Version=v4.5">
Expand All @@ -105,11 +98,6 @@
<Install>false</Install>
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<Content Include="Visualizers\ObjectiveC.natvis">
<IncludeInVSIX>true</IncludeInVSIX>
</Content>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
44 changes: 23 additions & 21 deletions msvc/language/VSIX/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
<Metadata>
<Identity Id="VSIX..9c35fff1-f084-44c1-a38e-68c707163aa2" Version="1.5" Language="en-US" Publisher="Microsoft" />
<DisplayName>Objective-C Language Service</DisplayName>
<Description xml:space="preserve">This package contains Objective-C language service components such as syntax higlighting etc</Description>
</Metadata>
<Installation>
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Premium" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[12.0,15.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="ObjectiveC" d:VsixSubPath="Asset" Path="|ObjectiveC|" />
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
<Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
<Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
</Assets>
<Metadata>
<Identity Id="VSIX..9c35fff1-f084-44c1-a38e-68c707163aa2" Version="1.5" Language="en-US" Publisher="Microsoft" />
<DisplayName>Objective-C Language Service</DisplayName>
<Description xml:space="preserve">This package contains Objective-C language service components such as Native Visualization support etc.</Description>
</Metadata>
<Installation>
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Community" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Premium" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Pro" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Ultimate" />
<InstallationTarget Version="[15.0,16.0)" Id="Microsoft.VisualStudio.Enterprise" />
</Installation>
<Dependencies>
<Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
</Dependencies>
<Assets>
<Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:VsixSubPath="BM" Path="|BuildMonitor;PkgdefProjectOutputGroup|" />
<Asset Type="NativeVisualizer" d:Source="File" Path="Visualizers\ObjectiveC.natvis" />
<Asset Type="StepFilter" d:Source="File" Path="Visualizers\ObjectiveC.natstepfilter" />
</Assets>
<Prerequisites>
<Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0,16.0)" DisplayName="Visual Studio core editor" />
</Prerequisites>
</PackageManifest>
Loading