Commits

Max Kostovetski committed 0d5a9de

added R# 8 installer (issue #24)

1. Based on the 7.1 installer.
2. Updated product/component uuids.
3. Removed NuGet package restore.

  • Participants
  • Parent commits a8f6134
  • Branches rs8

Comments (0)

Files changed (3)

File YouCantSpell.sln

 EndProject
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "YouCantSpell.Installer.v71", "build\YouCantSpell.Installer.v71\YouCantSpell.Installer.v71.wixproj", "{DBFFE229-412D-4B11-A199-4C1D6D48C7E2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{3538CE6A-EAEB-49C0-B028-E5F6890B2DED}"
-	ProjectSection(SolutionItems) = preProject
-		.nuget\NuGet.Config = .nuget\NuGet.Config
-		.nuget\NuGet.exe = .nuget\NuGet.exe
-		.nuget\NuGet.targets = .nuget\NuGet.targets
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouCantSpell.ReSharper.v80", "src\YouCantSpell.ReSharper.v80\YouCantSpell.ReSharper.v80.csproj", "{36386B34-5445-47E4-8196-94A0169DF2DD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouCantSpell.ReSharper.v80.Net35", "src\YouCantSpell.ReSharper.v80.Net35\YouCantSpell.ReSharper.v80.Net35.csproj", "{310AA64E-10D8-4D31-8288-0BA4FC74CE4F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YouCantSpell.ReSharper.v80.Test", "src\YouCantSpell.ReSharper.v80.Test\YouCantSpell.ReSharper.v80.Test.csproj", "{7E46ECB8-68BB-4999-AC9E-398F54A8E31A}"
 EndProject
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "YouCantSpell.Installer.v80", "build\YouCantSpell.Installer.v80\YouCantSpell.Installer.v80.wixproj", "{9130E83B-7692-4805-8E8C-14E700ED0D81}"
+	ProjectSection(ProjectDependencies) = postProject
+		{36386B34-5445-47E4-8196-94A0169DF2DD} = {36386B34-5445-47E4-8196-94A0169DF2DD}
+		{310AA64E-10D8-4D31-8288-0BA4FC74CE4F} = {310AA64E-10D8-4D31-8288-0BA4FC74CE4F}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		{7E46ECB8-68BB-4999-AC9E-398F54A8E31A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{7E46ECB8-68BB-4999-AC9E-398F54A8E31A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{7E46ECB8-68BB-4999-AC9E-398F54A8E31A}.Release|x86.ActiveCfg = Release|Any CPU
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Debug|x86.ActiveCfg = Debug|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Debug|x86.Build.0 = Debug|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Release|Any CPU.ActiveCfg = Release|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Release|Mixed Platforms.Build.0 = Release|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Release|x86.ActiveCfg = Release|x86
+		{9130E83B-7692-4805-8E8C-14E700ED0D81}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

File build/YouCantSpell.Installer.v80/Product.wxs

+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+
+  <?define UpgradeCode="a91c73d0-f5ca-40ed-b47b-e5299aedd540"?>
+  <?define Manufacturer="Aaron Dandy"?>
+  
+  <Product
+    Id="*"
+    Name="You Can't Spell For ReSharper 8.0 ($(var.CoreAsmVersion))"
+    Language="1033"
+    Version="$(var.CoreAsmVersion)"
+    Manufacturer="$(var.Manufacturer)"
+    UpgradeCode="$(var.UpgradeCode)"
+  >
+		<Package
+      Description="A ReSharper Spell Check Plug-in."
+      InstallerVersion="200"
+      Compressed="yes"
+      InstallScope="perUser"
+      Manufacturer="$(var.Manufacturer)"
+    />
+
+    <MajorUpgrade DowngradeErrorMessage="Newer version detected." AllowSameVersionUpgrades="yes" />
+
+		<Media Id="1" Cabinet="media1.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <Property Id="RESHARPERDIRV80" Secure="yes">
+      <RegistrySearch Id="RSInstallRegistryV80" Root="HKLM" Key="Software\JetBrains\ReSharper\v8.0"
+        Name="InstallDir" Type="directory"/>
+    </Property>
+
+    <Condition Message='ReSharper 8.0 is required to proceed with the installation.'>
+      Installed OR (RESHARPERDIRV80)
+    </Condition>
+
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="LocalAppDataFolder">
+        <Directory Id="D.AppDataFolder.JetBrains" Name="JetBrains" >
+          <Directory Id="D.AppDataFolder.JetBrains.ReSharper" Name="ReSharper">
+            <Directory Id="D.AppDataFolder.JetBrains.ReSharper.V" Name="v8.0">
+              <Directory Id="D.AppDataFolder.JetBrains.ReSharper.V.Plugins" Name="Plugins">
+                <Directory Id="D.AppDataFolder.JetBrains.ReSharper.V.Plugins.YouCantSpell" Name="YouCantSpell">
+                  <Component Id="C.YCS.PerUser" Guid="{5541A0FA-20A4-4C19-8999-5EA5FFF27453}">
+                    <Registry Id="R.YouCantSpell" Root="HKCU" Key="Software\JetBrains\ReSharper\Plugins\YouCantSpell" KeyPath="yes" />
+                    <File Source="..\..\bin\$(var.Configuration)\net35\YouCantSpell.ReSharper.Core.dll" />
+                    <File Source="..\..\bin\$(var.Configuration)\net35\YouCantSpell.Core.dll" />
+                    <File Source="..\..\bin\$(var.Configuration)\net35\NHunspell.dll" />
+                    <File Source="..\..\bin\$(var.Configuration)\net35\Hunspellx86.dll" />
+                    <File Source="..\..\bin\$(var.Configuration)\net35\Hunspellx64.dll" />
+                    <File Source="..\..\NHunspell-License.txt" />
+                    <File Source="..\..\LICENSE.txt" />
+                    <RemoveFolder Id="Rem.Root" Directory="D.AppDataFolder.JetBrains" On="uninstall"/>
+                    <RemoveFolder Id="Rem.Root.R" Directory="D.AppDataFolder.JetBrains.ReSharper" On="uninstall"/>
+                    <RemoveFolder Id="Rem.Root.R.V" Directory="D.AppDataFolder.JetBrains.ReSharper.V" On="uninstall"/>
+                    <RemoveFolder Id="Rem.Root.R.V.P" Directory="D.AppDataFolder.JetBrains.ReSharper.V.Plugins" On="uninstall"/>
+                    <RemoveFolder Id="Rem.Root.R.V.P.YCS" Directory="D.AppDataFolder.JetBrains.ReSharper.V.Plugins.YouCantSpell" On="uninstall"/>
+                  </Component>
+                  <Component Id="C.YCS.PerUser.v8.0" Guid="{F2F3153B-F11D-4E79-8A24-F0C13629485A}">
+                    <Registry Id="R.YouCantSpell.v8.0" Root="HKCU" Key="Software\JetBrains\ReSharper\Plugins\YouCantSpell" Name="ReSharperVer" Value="v8.0" Type="string" KeyPath="yes" />
+                    <File Source="..\..\bin\$(var.Configuration)\net35\YouCantSpell.ReSharper.v80.dll" />
+                  </Component>
+                  <Directory Id="D.AppDataFolder.JetBrains.ReSharper.V.Plugins.YouCantSpell.Dic" Name="dic">
+                    <Component Id="C.YCS.PerUser.Dic" Guid="{A8E4ABDD-8897-44E6-A6BE-01DDC5D93994}">
+                      <Registry Id="R.YouCantSpell.Dic" Root="HKCU" Key="Software\JetBrains\ReSharper\Plugins\YouCantSpell\Dic" KeyPath="yes" />
+                      <File Source="..\..\dic\license_en_EN.txt" />
+                      <File Source="..\..\dic\README_en_GB.txt" />
+                      <File Source="..\..\dic\en_GB.aff" />
+                      <File Source="..\..\dic\en_GB.dic" />
+                      <File Source="..\..\dic\LICENSE_en_US.txt" />
+                      <File Source="..\..\dic\README_en_US.txt" />
+                      <File Source="..\..\dic\en_US.aff" />
+                      <File Source="..\..\dic\en_US.dic" />
+                      <File Source="..\..\dic\licentie_nl_NL.txt" />
+                      <File Source="..\..\dic\nl_NL.aff" />
+                      <File Source="..\..\dic\nl_NL.dic" />
+                      <File Source="..\..\dic\copyright_russian-aot-ieyo.txt" />
+                      <File Source="..\..\dic\russian-aot-ieyo.aff" />
+                      <File Source="..\..\dic\russian-aot-ieyo.dic" />
+                      <File Source="..\..\dic\LICENSE_sv_SE.txt" />
+                      <File Source="..\..\dic\sv_SE.aff" />
+                      <File Source="..\..\dic\sv_SE.dic" />
+                      <File Source="..\..\dic\README_uk_UA.txt" />
+                      <File Source="..\..\dic\uk_UA.aff" />
+                      <File Source="..\..\dic\uk_UA.dic" />
+                      <RemoveFolder Id="Rem.Root.R.V.P.YCS.Dic" Directory="D.AppDataFolder.JetBrains.ReSharper.V.Plugins.YouCantSpell.Dic" On="uninstall"/>
+                    </Component>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="YCSFeature" Title="You Can't Spell" Level="1">
+      <ComponentRef Id="C.YCS.PerUser"/>
+      <ComponentRef Id="C.YCS.PerUser.v8.0"/>
+      <ComponentRef Id="C.YCS.PerUser.Dic"/>
+    </Feature>
+
+    <WixVariable Id="WixUILicenseRtf" Value="..\..\LICENSE.RTF" />
+    <UI>
+      <UIRef Id="WixUI_Minimal" />
+    </UI>
+
+  </Product>
+</Wix>

File build/YouCantSpell.Installer.v80/YouCantSpell.Installer.v80.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.5</ProductVersion>
+    <ProjectGuid>9130e83b-7692-4805-8e8c-14e700ed0d81</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>YouCantSpell For ReSharper 8.0</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\installer\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <DefineConstants>Debug</DefineConstants>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>..\..\bin\installer\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <UsingTask TaskName="GetCoreVersion" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <BuildConfiguration ParameterType="System.String" Required="True" />
+      <CoreAsmVersion ParameterType="System.String" Output="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System.Xml" />
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Reflection" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+var filePath = Path.GetFullPath(@"..\..\bin\" + BuildConfiguration + @"\YouCantSpell.Core.dll");
+CoreAsmVersion = AssemblyName.GetAssemblyName(filePath).Version.ToString();
+]]>
+      </Code>
+    </Task>
+  </UsingTask>
+  <ItemGroup>
+    <Compile Include="Product.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">
+    <GetCoreVersion BuildConfiguration="$(Configuration)">
+      <Output PropertyName="CoreAsmVersion" TaskParameter="CoreAsmVersion" />
+    </GetCoreVersion>
+    <PropertyGroup>
+      <DefineConstants>$(DefineConstants);CoreAsmVersion=$(CoreAsmVersion)</DefineConstants>
+      <TargetName>$(TargetName) v$(CoreAsmVersion)</TargetName>
+      <TargetFileName>$(TargetName).msi</TargetFileName>
+      <TargetPath>$(TargetDir)$(TargetFileName)</TargetPath>
+    </PropertyGroup>
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+</Project>