Commits

Nerzhul500 committed 9a6536b

WiX project added.
Added icon to quick fix menu with proper order.
Version changed to 2.0.1

Comments (0)

Files changed (6)

ReSpeller.Installer/ReSpeller.Installer.wixproj

+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>3.6</ProductVersion>
+    <ProjectGuid>2032aa3d-64e0-4ff9-9414-704d1f47b0a6</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>ReSpeller.Installer</OutputName>
+    <OutputType>Package</OutputType>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+    <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="Setup.wxs" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(WixTargetsPath)" />
+  <!--
+	To modify your build process, add your task inside one of the targets below and uncomment it.
+	Other similar extension points exist, see Wix.targets.
+	<Target Name="BeforeBuild">
+	</Target>
+	<Target Name="AfterBuild">
+	</Target>
+	-->
+</Project>

ReSpeller.Installer/Setup.wxs

+<?xml version="1.0"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Product Id="2857ED7D-CBCA-492C-9FC2-3ED93534DF19"
+    Name="ReSpeller for ReSharper 7.0"
+    Language="1033"
+    Version="2.0.1"
+    UpgradeCode="A6DB0C4A-75BA-4EA4-8F9C-A9F89EDAFFF6"
+    Manufacturer="Artem Bukhonov aka Nerzhul500">
+
+    <Package Description="#Description"
+      Comments="Comments"
+      InstallerVersion="200"
+      Compressed="yes"
+      InstallScope="perUser"
+      ShortNames="no" 
+      AdminImage="no"/>
+
+    <InstallExecuteSequence>
+      <RemoveExistingProducts After="InstallInitialize" />
+    </InstallExecuteSequence>
+
+    <Media Id="1" Cabinet="contents.cab" EmbedCab="yes" CompressionLevel="high"/>
+
+<!--    <Icon Id="ProductIcon" SourceFile="icon.ico"/>-->
+<!--    <Property Id="ARPPRODUCTICON">ProductIcon</Property>-->
+
+    <Property Id="RESHARPERDIR2010" Secure="yes">
+      <RegistrySearch Id="RSInstallRegistry2010" Root="HKLM" Key="Software\JetBrains\ReSharper\v7.0\vs10.0"
+        Name="InstallDir" Type="directory"/>
+    </Property>
+
+    <Property Id="RESHARPERDIR2012" Secure="yes">
+      <RegistrySearch Id="RSInstallRegistry2012" Root="HKLM" Key="Software\JetBrains\ReSharper\v7.0\vs11.0"
+        Name="InstallDir" Type="directory"/>
+    </Property>
+    
+    <Property Id="MSIUSEREALADMINDETECTION" Value="1" />
+
+    <Condition Message='ReSharper 7.0 and Visual Studio 2010 or 2012 are required to proceed with the installation.'>
+      Installed OR (RESHARPERDIR2010 OR RESHARPERDIR2012)
+    </Condition>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="LocalAppDataFolder">
+        <Directory Id="D.JetBrains" Name="JetBrains">
+          <Directory Id="D.ReSharper" Name="ReSharper">
+            <Directory Id="D.v7.0" Name="v7.0" >
+              <Directory Id="D.Plugins" Name="Plugins">
+                <Directory Id="D.ReSpeller" Name="ReSpeller">
+                  <Component Id="C.ReSpellerLib" Guid="A870D545-4730-46ED-892B-0E39FBFF0AC1" Permanent="no">
+                    <RegistryKey Action="none" Key="myKeyName" Root="HKCU" >
+                      <RegistryValue Type="integer" Value="1" KeyPath="yes" />
+                    </RegistryKey>
+                    <File Source="..\target\release\ReSpeller.dll" Vital="yes"/>
+                    <File Source="..\target\release\NHunspell.dll" Vital="yes"/>
+                    <File Source="..\target\release\Hunspellx86.dll" Vital="yes"/>
+                    <File Source="..\target\release\WPFToolkit.dll" Vital="yes"/>
+                    <File Source="..\target\release\WPFToolkit.Extended.dll" Vital="yes"/>
+                    <RemoveFolder Id="R.ReSpeller" On="uninstall" />
+                    <RemoveFolder Id="R.JetBrains" Directory="D.JetBrains" On="uninstall" />
+                    <RemoveFolder Id="R.ReSharper" Directory="D.ReSharper" On="uninstall" />
+                    <RemoveFolder Id="R.v7.0" Directory="D.v7.0" On="uninstall" />
+                    <RemoveFolder Id="R.Plugins" Directory="D.Plugins" On="uninstall" />
+                  </Component>
+                  <Directory Id="D.Dic" Name="dic">
+                    <Component Id ="C.ReSpellerDic" Guid="1D8CD928-4DE6-420A-B35C-C9AE51A7139E" Permanent="no">
+                      <RegistryKey Action="none" Key="myKeyName" Root="HKCU" >
+                        <RegistryValue Type="integer" Value="1" KeyPath="yes" />
+                      </RegistryKey>
+                      <File Source="..\target\release\dic\en_US.aff" Vital="yes"/>
+                      <File Source="..\target\release\dic\en_US.dic" Vital="yes"/>
+                      <File Source="..\target\release\dic\en_US_custom.dic" Vital="yes"/>
+                      <RemoveFolder Id="R.Dic" Directory="D.Dic" On="uninstall" />
+                    </Component>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="Complete" Title="Everything" Description="Everything" Level="1">
+      <ComponentRef Id="C.ReSpellerLib"/>
+      <ComponentRef Id="C.ReSpellerDic"/>
+    </Feature>
+    <UI>
+      <UIRef Id="WixUI_Minimal" />
+    </UI>
+  </Product>
+</Wix>
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReSpeller.RSTests", "ReSpeller.RSTests\ReSpeller.RSTests.csproj", "{55A52394-1616-42CF-9F80-21B7D66D9E7D}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ReSpeller.Installer", "ReSpeller.Installer\ReSpeller.Installer.wixproj", "{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{09E1CC92-CF8E-4B5F-A477-1EF25DF4CA86}.Release|x86.ActiveCfg = Release|Any CPU
 		{37976371-F6AC-472A-B980-A99B32426B8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{37976371-F6AC-472A-B980-A99B32426B8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{37976371-F6AC-472A-B980-A99B32426B8F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{37976371-F6AC-472A-B980-A99B32426B8F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{37976371-F6AC-472A-B980-A99B32426B8F}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{37976371-F6AC-472A-B980-A99B32426B8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37976371-F6AC-472A-B980-A99B32426B8F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{37976371-F6AC-472A-B980-A99B32426B8F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{37976371-F6AC-472A-B980-A99B32426B8F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{37976371-F6AC-472A-B980-A99B32426B8F}.Release|x86.ActiveCfg = Release|Any CPU
 		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{55A52394-1616-42CF-9F80-21B7D66D9E7D}.Release|x86.ActiveCfg = Release|Any CPU
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Debug|x86.ActiveCfg = Debug|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Debug|x86.Build.0 = Debug|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Release|Any CPU.ActiveCfg = Release|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Release|Mixed Platforms.Build.0 = Release|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Release|x86.ActiveCfg = Release|x86
+		{2032AA3D-64E0-4FF9-9414-704D1F47B0A6}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ReSpeller/Properties/AssemblyInfo.cs

 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("ReSpeller")]
+[assembly: AssemblyTitle("ReSpeller (beta)")]
 [assembly: AssemblyDescription("Spell Checker for Resharper")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Artem Bukhonov")]
 [assembly: AssemblyCopyright("Copyright © Artem Bukhonov, 2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.1.0.0")]
-[assembly: AssemblyFileVersion("1.1.0.0")]
+[assembly: AssemblyVersion("2.0.1.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]
 [assembly: ActionsXml("SpellCheckerPlugin.Actions.xml")]
 
 // The following information is displayed by ReSharper in the Plugins dialog

ReSpeller/QuickFixes/TypoQuickFix.cs

 
     public void CreateBulbItems(BulbMenu menu, Severity severity)
     {
-      menu.ArrangeContextActions(myBulbItems.ToArray());
+      BulbGroup group = menu.GetOrCreateGroup(AnchorsForBulbMenuGroups.QuickFixesAnchor);
+      foreach (var bulbItem in myBulbItems)
+      {
+        group.AddBulbAction(AnchorsForBulbMenuGroups.QuickFixesAnchor, bulbItem, ImgThemedIcons.Icon.Id);
+      }
     }
 
     public bool IsAvailable(IUserDataHolder cache)

ReSpeller/ReSpeller.csproj

     <Compile Include="Highlightings\StringLiteralTypoHighlighting.cs" />
     <Compile Include="Highlightings\TextRangeTypoHighlighting.cs" />
     <Compile Include="Highlightings\MarkupTextTypoHighlighting.cs" />
+    <Compile Include="Img\ThemedIcons.Img.Generated.cs" />
     <Compile Include="QuickFixes\TypoQuickFix.cs" />
     <Compile Include="Settings\ReSpellerSettings.cs" />
     <Compile Include="Settings\ReSpellerSettingsControl.xaml.cs">
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="Img\ThemedIcons.Img.Generated.Xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="Settings\ReSpellerSettingsControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     <ThemedIconPng Include="Img\icon.png" />
   </ItemGroup>
   <PropertyGroup>
-    <ReSharperSdkTargets Condition=" '$(ReSharperSdkTargets)' == '' ">$(MSBuildExtensionsPath)\JetBrains\ReSharper.SDK\v7.1</ReSharperSdkTargets>
+    <ReSharperSdkTargets Condition=" '$(ReSharperSdkTargets)' == '' ">$(MSBuildExtensionsPath)\JetBrains\ReSharper.SDK\v7.0</ReSharperSdkTargets>
   </PropertyGroup>
   <Import Project="$(ReSharperSdkTargets)\Plugin.Targets" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />