Skip to content

Commit

Permalink
Update compatibility of ReSharper from 8.1 to 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
Andy Reeves committed Mar 31, 2014
1 parent 950bc70 commit ebaa36d
Show file tree
Hide file tree
Showing 28 changed files with 29 additions and 29 deletions.
Binary file modified .../AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.ComponentModel.dll
View file
Binary file not shown.
Binary file modified ...AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.DocumentManager.dll
View file
Binary file not shown.
Binary file modified ...c/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.DocumentModel.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.IDE.dll
View file
Binary file not shown.
Binary file modified .../AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.Interop.WinApi.dll
View file
Binary file not shown.
Binary file modified ...ct/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.Metadata.dll
View file
Binary file not shown.
Binary file modified ...rc/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.ProjectModel.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.Shell.dll
View file
Binary file not shown.
Binary file modified ...Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.TextControl.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.UI.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.Util.dll
View file
Binary file not shown.
Binary file modified ...dIns/ReSharper800/ReferencedAssemblies/JetBrains.Platform.ReSharper.VisualStudio.Core.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Daemon.CSharp.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Daemon.Engine.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Daemon.dll
View file
Binary file not shown.
Binary file modified .../AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Feature.Services.CSharp.dll
View file
Binary file not shown.
Binary file modified ...ect/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Feature.Services.dll
View file
Binary file not shown.
Binary file modified ...Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Features.Environment.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Intentions.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Psi.CSharp.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Psi.Xml.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Psi.dll
View file
Binary file not shown.
Binary file modified Project/Src/AddIns/ReSharper800/ReferencedAssemblies/JetBrains.ReSharper.Resources.dll
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions Project/Src/WixSetup/Product.wxs
View file
Expand Up @@ -26,11 +26,11 @@

<Feature Id='Feature_ReSharper'
Title='R# integration'
Description='Files for integration with JetBrains ReSharper 5.1.3, 6.0, 6.1, 6.1.1, 7.0.1, 7.1 or 8.1.'
Description='Files for integration with JetBrains ReSharper 5.1.3, 6.0, 6.1, 6.1.1, 7.0.1, 7.1 or 8.2.'
Level='500' AllowAdvertise="no" Display="expand" InstallDefault="local" TypicalDefault="install" Absent="allow">
<ComponentGroupRef Id="ReSharper_Common" />
<Condition Level="1"><![CDATA[RESHARPER51_VERSION <> "" OR RESHARPER60_VERSION <> "" OR RESHARPER61_VERSION <> "" OR RESHARPER70_VERSION <> "" OR RESHARPER71_VERSION <> ""OR RESHARPER81_VERSION <> ""]]></Condition>
<Condition Level="0"><![CDATA[RESHARPER51_VERSION = "" AND RESHARPER60_VERSION = "" AND RESHARPER61_VERSION = "" AND RESHARPER70_VERSION = "" AND RESHARPER71_VERSION = "" AND RESHARPER81_VERSION = ""]]></Condition>
<Condition Level="1"><![CDATA[RESHARPER51_VERSION <> "" OR RESHARPER60_VERSION <> "" OR RESHARPER61_VERSION <> "" OR RESHARPER70_VERSION <> "" OR RESHARPER71_VERSION <> ""OR RESHARPER82_VERSION <> ""]]></Condition>
<Condition Level="0"><![CDATA[RESHARPER51_VERSION = "" AND RESHARPER60_VERSION = "" AND RESHARPER61_VERSION = "" AND RESHARPER70_VERSION = "" AND RESHARPER71_VERSION = "" AND RESHARPER82_VERSION = ""]]></Condition>
</Feature>

<Feature Id='Feature_VisualStudioTemplates'
Expand Down Expand Up @@ -105,7 +105,7 @@
OR
(RESHARPER71_VERSION <> "" AND RESHARPER71_VERSION <> "$(var.SupportedReSharper710Version)")
OR
(RESHARPER81_VERSION <> "" AND RESHARPER81_VERSION <> "$(var.SupportedReSharper810Version)")
(RESHARPER82_VERSION <> "" AND RESHARPER82_VERSION <> "$(var.SupportedReSharper820Version)")
)
]]>
</Publish>
Expand All @@ -124,7 +124,7 @@
AND
(RESHARPER71_VERSION = "" OR RESHARPER71_VERSION = "$(var.SupportedReSharper710Version)")
AND
(RESHARPER81_VERSION = "" OR RESHARPER81_VERSION = "$(var.SupportedReSharper810Version)")
(RESHARPER82_VERSION = "" OR RESHARPER82_VERSION = "$(var.SupportedReSharper820Version)")
)
]]>
</Publish>
Expand Down
24 changes: 12 additions & 12 deletions Project/Src/WixSetup/ReSharper.wxs
View file
Expand Up @@ -4,12 +4,12 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
<Fragment>

<Property Id="RESHARPER81_VERSION" Admin="yes" Secure="yes">
<RegistrySearch Id="REG_RESHARPER81_VERSION" Root="HKLM" Key="Software\JetBrains\ReSharper\v8.1" Name="ProductVersion" Type="raw" />
<Property Id="RESHARPER82_VERSION" Admin="yes" Secure="yes">
<RegistrySearch Id="REG_RESHARPER82_VERSION" Root="HKLM" Key="Software\JetBrains\ReSharper\v8.2" Name="ProductVersion" Type="raw" />
</Property>

<Property Id="RESHARPER81_INSTALLDIR" Admin="yes" Secure="yes">
<RegistrySearch Id="REG_RESHARPER81_INSTALLDIR" Type="directory" Root="HKLM" Key="SOFTWARE\JetBrains\ReSharper\v8.1" Name="InstallDir" />
<Property Id="RESHARPER82_INSTALLDIR" Admin="yes" Secure="yes">
<RegistrySearch Id="REG_RESHARPER82_INSTALLDIR" Type="directory" Root="HKLM" Key="SOFTWARE\JetBrains\ReSharper\v8.2" Name="InstallDir" />
</Property>

<Property Id="RESHARPER71_VERSION" Admin="yes" Secure="yes">
Expand Down Expand Up @@ -179,14 +179,14 @@
</Directory>
</Directory>

<Directory Id="RESHARPER81_INSTALLDIR" Name="[RESHARPER81_INSTALLDIR]">
<Directory Id="Dir_JetBrains_ReSharper_v81_Plugins" Name="Plugins">
<Directory Id="Dir_JetBrains_ReSharper_v81_Plugins_Drop" Name="$(var.ProductNameShort)" FileSource="$(var.DropDir)">
<Component Id="COM_RESHARPER810" Guid="*">
<File Id="FILE_RESHARPER810" Name="StyleCop.ReSharper800.dll" Checksum="yes" Vital="yes">
<netfx:NativeImage Id="ngen_FILE_RESHARPER810" Platform="all" Priority="0"/>
<Directory Id="RESHARPER82_INSTALLDIR" Name="[RESHARPER82_INSTALLDIR]">
<Directory Id="Dir_JetBrains_ReSharper_v82_Plugins" Name="Plugins">
<Directory Id="Dir_JetBrains_ReSharper_v82_Plugins_Drop" Name="$(var.ProductNameShort)" FileSource="$(var.DropDir)">
<Component Id="COM_RESHARPER820" Guid="*">
<File Id="FILE_RESHARPER820" Name="StyleCop.ReSharper800.dll" Checksum="yes" Vital="yes">
<netfx:NativeImage Id="ngen_FILE_RESHARPER820" Platform="all" Priority="0"/>
</File>
<Condition><![CDATA[RESHARPER81_VERSION <> ""]]></Condition>
<Condition><![CDATA[RESHARPER82_VERSION <> ""]]></Condition>
</Component>
</Directory>
</Directory>
Expand Down Expand Up @@ -276,7 +276,7 @@
<ComponentRef Id="COM_RESHARPER611" />
<ComponentRef Id="COM_RESHARPER700" />
<ComponentRef Id="COM_RESHARPER710" />
<ComponentRef Id="COM_RESHARPER810" />
<ComponentRef Id="COM_RESHARPER820" />
<ComponentRef Id="StandardRegistryKeys" />
<ComponentRef Id="COM_RESHARPER60_VS90_StyleCopForReSharper_1"/>
<ComponentRef Id="COM_RESHARPER60_VS90_StyleCopForReSharper_2"/>
Expand Down
16 changes: 8 additions & 8 deletions Project/Src/WixSetup/ReSharperVersionDlg.wxs
View file
Expand Up @@ -45,10 +45,10 @@
<Condition Action="hide"><![CDATA[RESHARPER71_VERSION = ""]]></Condition>
<Condition Action="show"><![CDATA[RESHARPER71_VERSION <> ""]]></Condition>
</Control>
<Control Id="Supported810VersionInfo" Type="Text" X="135" Y="150" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
<Text><![CDATA[8.1 : $(var.SupportedReSharper810Version)]]></Text>
<Condition Action="hide"><![CDATA[RESHARPER81_VERSION = ""]]></Condition>
<Condition Action="show"><![CDATA[RESHARPER81_VERSION <> ""]]></Condition>
<Control Id="Supported820VersionInfo" Type="Text" X="135" Y="150" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
<Text><![CDATA[8.2 : $(var.SupportedReSharper820Version)]]></Text>
<Condition Action="hide"><![CDATA[RESHARPER82_VERSION = ""]]></Condition>
<Condition Action="show"><![CDATA[RESHARPER82_VERSION <> ""]]></Condition>
</Control>
<Control Id="RunningVersionInfo51" Type="Text" X="260" Y="100" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
<Text><![CDATA[5.1 : [RESHARPER51_VERSION]]]></Text>
Expand All @@ -75,10 +75,10 @@
<Condition Action="hide"><![CDATA[RESHARPER71_VERSION = ""]]></Condition>
<Condition Action="show"><![CDATA[RESHARPER71_VERSION <> ""]]></Condition>
</Control>
<Control Id="RunningVersionInfo81" Type="Text" X="260" Y="150" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
<Text><![CDATA[8.1 : [RESHARPER81_VERSION]]]></Text>
<Condition Action="hide"><![CDATA[RESHARPER81_VERSION = ""]]></Condition>
<Condition Action="show"><![CDATA[RESHARPER81_VERSION <> ""]]></Condition>
<Control Id="RunningVersionInfo82" Type="Text" X="260" Y="150" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
<Text><![CDATA[8.1 : [RESHARPER82_VERSION]]]></Text>
<Condition Action="hide"><![CDATA[RESHARPER82_VERSION = ""]]></Condition>
<Condition Action="show"><![CDATA[RESHARPER82_VERSION <> ""]]></Condition>
</Control>
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />

Expand Down
2 changes: 1 addition & 1 deletion Project/Src/WixSetup/SharedIncludes.wxi
View file
Expand Up @@ -18,5 +18,5 @@
<?define SupportedReSharper611Version = "6.1.1000.82" ?> <!-- 6.1.1000.82 -->
<?define SupportedReSharper700Version = "7.0.1098.2760" ?> <!-- 7.0.1098.2760 -->
<?define SupportedReSharper710Version = "7.1.3000.2254" ?> <!-- 7.1.3000.2254 -->
<?define SupportedReSharper810Version = "8.1.23.546" ?> <!-- 8.1.23.546 -->
<?define SupportedReSharper820Version = "8.2.0.2160" ?> <!-- 8.2.0.2160 -->
</Include>
6 changes: 3 additions & 3 deletions Tools/Scripts/Environment.cmd
View file
Expand Up @@ -45,17 +45,17 @@ REM Set up ReSharper dlls if installed

SET ReSharperFound=0

SET "RESHARPERINSTALLDIR=%ProgramFiles%\JetBrains\ReSharper\v8.1\Bin"
SET "RESHARPERINSTALLDIR=%ProgramFiles%\JetBrains\ReSharper\v8.2\Bin"

if "%IsWoW64%" == "1" (
SET "RESHARPERINSTALLDIR=%PROGRAMFILES(x86)%\JetBrains\ReSharper\v8.1\Bin"
SET "RESHARPERINSTALLDIR=%PROGRAMFILES(x86)%\JetBrains\ReSharper\v8.2\Bin"
)

IF EXIST "%RESHARPERINSTALLDIR%\JetBrains.Annotations.dll" ( SET ReSharperFound=1 )

IF "%ReSharperFound%"=="0" GOTO ResharperDone

echo JetBrains ReSharper 8.1 was found...
echo JetBrains ReSharper 8.2 was found...

:ResharperDone
REM --------------------------------------------------------------------------------------
Expand Down

0 comments on commit ebaa36d

Please sign in to comment.