@@ -1,5 +1,4 @@ using System.ComponentModel.Composition; -using Microsoft.VisualStudio.ApplicationModel.Environments; using Microsoft.VisualStudio.Text.Editor; using Microsoft.VisualStudio.Utilities; using Microsoft.VisualStudio.Text.Classification; @@ -37,11 +36,11 @@ namespace Winterdom.VisualStudio.Extensions.Text { [Export(typeof(AdornmentLayerDefinition))] [Name(LineHighlight.NAME)] - [Order(Before = DefaultAdornmentLayers.Selection)] + [Order(Before = "Selection")] [TextViewRole(PredefinedTextViewRoles.Document)] public AdornmentLayerDefinition editorAdornmentLayer = null; - public void TextViewCreated(IWpfTextView textView, IEnvironment context) { + public void TextViewCreated(IWpfTextView textView) { IClassificationType classification = ClassificationRegistry.GetClassificationType(LineHighlight.NAME); IClassificationFormatMap map = AdornmentFactory.cs @@ -10,7 +10,7 @@ <OutputType>Library</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>Winterdom.VisualStudio.Extensions.Text</RootNamespace> - <AssemblyName>LineAdorments</AssemblyName> + <AssemblyName>LineAdornments</AssemblyName> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> <GeneratePkgDefFile>false</GeneratePkgDefFile> @@ -36,9 +36,6 @@ <Reference Include="Microsoft.VisualStudio.CoreUtility"> <Private>False</Private> </Reference> - <Reference Include="Microsoft.VisualStudio.ExtensibilityHosting"> - <Private>False</Private> - </Reference> <Reference Include="Microsoft.VisualStudio.Text.Data"> <Private>False</Private> </Reference> @@ -59,6 +56,7 @@ <Reference Include="System.Core" /> <Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data" /> + <Reference Include="System.Xaml" /> <Reference Include="System.Xml" /> <Reference Include="WindowsBase" /> </ItemGroup> @@ -68,6 +66,7 @@ <Compile Include="LineHighlight.cs" /> </ItemGroup> <ItemGroup> + <None Include="source.extension.vsixmanifest" /> <Content Include="TextAdornment_large.png"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> @@ -75,9 +74,6 @@ <CopyToOutputDirectory>Always</CopyToOutputDirectory> </Content> </ItemGroup> - <ItemGroup> - <None Include="extension.vsixmanifest" /> - </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets" /> <!-- To modify your build process, add your task inside one of the targets below and uncomment it. LineAdornments.csproj @@ -1,12 +1,8 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using Microsoft.VisualStudio.ExtensibilityHosting; -//Select the right catalog for MEF to pick up the extension -[assembly: VsCatalogName("Microsoft.VisualStudio.Editor")] - // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. Properties/AssemblyInfo.cs @@ -1,21 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> -<VSIX xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010"> - <Identifier ID="LineAdornments.Winterdom.c9fd1954-9fea-444d-ac36-29705c68775b"> - <Name>LineAdorments</Name> +<Vsix Version="1.0.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2010"> + <Identifier Id="LineAdornments.Winterdom.c9fd1954-9fea-444d-ac36-29705c68775b"> + <Name>LineAdornments</Name> <Author>Tomas Restrepo</Author> <Version>1.0</Version> <Description>A sample Visual Studio 2010 extension that highlights the current line of text in the editor.</Description> <Locale>1033</Locale> + <MoreInfoUrl>http://winterdom.com/</MoreInfoUrl> <Icon>TextAdornment_small.png</Icon> <PreviewImage>TextAdornment_large.png</PreviewImage> - <SupportedVSEdition version="10.0"> - <Edition>VST_All</Edition> - <Edition>Pro</Edition> - </SupportedVSEdition> - <SupportedFrameworkRuntimeEdition minversion="4.0" maxversion="4.0" /> + <SupportedProducts> + <VisualStudio Version="10.0"> + <Edition>VST_All</Edition> + <Edition>Pro</Edition> + </VisualStudio> + </SupportedProducts> + <SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.0" /> </Identifier> <References /> <Content> - <MEFComponent>LineAdorments.dll</MEFComponent> + <MefComponent>LineAdornments.dll</MefComponent> </Content> -</VSIX> +</Vsix> source.extension.vsixmanifest 14e0acc8484a93c8772e0ffd3d86693da52c6d62 Tomas Restrepo tomas@winterdom.com http://github.com/tomasr/LineAdornments/commit/74a93e9af3afe74fce8b121f59bbacfb7da5062d 74a93e9af3afe74fce8b121f59bbacfb7da5062d 2009-10-20T11:48:10-07:00 2009-10-20T11:48:10-07:00 Build and works, but left coordinate is off 94b0563a85562a2445349b6802e7a5702b10f375 Tomas Restrepo tomas@winterdom.com