[Installer] Closes #129, closes #130, closes #131

rsdn · Oct 19, 2011 · 1ed0718 · 1ed0718
1 parent 5b74676
commit 1ed0718
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 23 deletions.
diff --git a/VsIntegration/Shell/NemerleStudio/NemerleStudio.rc b/VsIntegration/Shell/NemerleStudio/NemerleStudio.rc
@@ -82,7 +82,7 @@ STRINGTABLE
 BEGIN
     IDS_APP_NAME_INFORMAL   "Nemerle Studio"
     IDS_ERR_MSG_FATAL       "Cannot find one or more components. Please reinstall the application."
-    IDS_SLKSTRING           "E0HMRJJTCZCHE2HCMHITAJEHK1ZPH1C3JAZDE3K2E2P3ADP9DPMJHERRQ2HKR0Q1H3MQPIDHM3DCKHATQAKEJZH0R3MCRRJCHCHID9JJMPE8A9C9C9KPP2RKH9I3CRH9"
+    IDS_SLKSTRING           "KQDCP1D8ZJC1RCP3HTQDC1QMHCAIAIKTQ0JPCRC1ZAZQHCMZDMK3D1KHIEH3RKH0K3AMHAJ9ZZC3HQKEJKJ3MPATPKPEITH0CAQ9CJIDH2EICRQQPZJ9MQJPJPHPIDHE"
     IDS_ERR_FATAL_CAPTION   "Microsoft Visual Studio Shell Isolated Edition"
 END
 

diff --git a/VsIntegration/Shell/NemerleStudioUI/NemerleStudioUI.rc b/VsIntegration/Shell/NemerleStudioUI/NemerleStudioUI.rc
@@ -61,7 +61,7 @@ END
 
 STRINGTABLE 
 BEGIN
-    IDS_PLKSTRING           "ZMA2Q3I8I9H8KJCKR2Z9PEACHTZEMQMIRERQCAIRKARCH2I9QQE3M3R2KZCTKKKIQ3RHIRH0QAP8EMHDZHZHQTDRR0ZDM1RJIPMRQTIHKMCPAZIPCZR3PRRDAKIAD1QM"
+    IDS_PLKSTRING           "P9ACIECIEPPQICDHEPE9ADQZHDZZI8ZZM2KIR2PPR1RMKMQ1C9A0MKE1Z1P2D8J9P3EHQZJZKAC0A1KCDJJ0MTJAH8ZCIHCAKAMCK1J8QDH0RJPDZ3QDPDRIJEZPERDC"
 END
 
 #endif    // English (U.S.) resources

diff --git a/misc/packages/wix/Sources/Vs2008_Shell.wxs b/misc/packages/wix/Sources/Vs2008_Shell.wxs
@@ -87,24 +87,23 @@
       <RegistrySearch Id="VS90ShellSearch" Root="HKLM" Key="SOFTWARE\Microsoft\AppEnv\9.0" Name="AppenvStubDLLInstallPath" Type="raw" />
     </Property>
 
-    <CustomAction Id="SET_VS90SHELLENV" Return="check" Execute="immediate" Property="VS90SHELLENV" Value="[Dir_Nver]NemerleStudio\NemerleStudio.exe" />
-    <CustomAction Id="VS90ShellSetup" Property="VS90SHELLENV" ExeCommand="/setup" Execute="deferred" Return="ignore" Impersonate="no" />
-    <CustomAction Id="VS90ShellRemove" Property="VS90SHELLENV" ExeCommand="/remove" Execute="deferred" Return="ignore" Impersonate="no" />
+    <CustomAction Id="SET_VS90SHELLENV" Return="check" Execute="immediate" Property="VS90SHELLENV" Value="[APPLICATIONFOLDER]\$(var.NVer)\NemerleStudio\NemerleStudio.exe" />
+    <CustomAction Id="VS90ShellSetup" Property="VS90SHELLENV" ExeCommand="/setup" Execute="deferred" Impersonate="no" />
+    <!--
+    <CustomAction Id="VS90ShellRemove" Property="VS90SHELLENV" ExeCommand="/remove" Execute="deferred" Impersonate="no" />
+    -->
+    <FeatureRef Id="Feature_NemerleStudio2008" />
 
     <InstallExecuteSequence>
       <Custom Action="SET_VS90SHELLENV" After="ValidateProductID">VS90SHELLENV=""</Custom>
+      <Custom Action="VS90ShellSetup" Before="InstallFinalize"><![CDATA[&Feature_NemerleStudio2008 > 1]]></Custom>
+      <!--
       <Custom Action="VS90ShellSetup" After="MsiPublishAssemblies" Overridable="yes">VS90SHELL</Custom>
       <Custom Action="VS90ShellRemove" Before="MsiUnpublishAssemblies" Overridable="yes">VS90SHELL</Custom>
-    </InstallExecuteSequence>
-  </Fragment>
-
-  <Fragment>
-    <FeatureRef Id="Feature_NemerleStudio2008" />
-    <InstallExecuteSequence>
-      <Custom Action="VS90ShellSetup" Before="InstallFinalize"><![CDATA[&Feature_NemerleStudio2008 > 1]]></Custom>
+      -->
     </InstallExecuteSequence>
     <UI>
-      <ProgressText Action="VS90ShellSetup" Template="[1]">Updating Visual Studio 2008 Shell registration</ProgressText>
+      <ProgressText Action="VS90ShellSetup" Template="[1]">Updating Nemerle Studio registration</ProgressText>
     </UI>
   </Fragment>
 </Wix>
diff --git a/misc/packages/wix/Sources/Vs2010_Extension.wxs b/misc/packages/wix/Sources/Vs2010_Extension.wxs
@@ -24,12 +24,13 @@
           <Directory Id="VSExtensionsFolder" Name="Extensions">
             <Directory Id="Dir_Nemerle" Name="$(var.ProductName)" FileSource="$(var.DistPath)\vs-plugin\">
               <Component Id="Comp_VS2010ExtensionRoot" DiskId="1" Guid="$(var.Comp_VS2010ExtensionRoot_Guid)">
-                <File Id="File_vsixmanifest"                             Name="extension.vsixmanifest" />
-                <File Id="File_Microsoft.Windows.Design.Interaction.dll" Name="Microsoft.Windows.Design.Interaction.dll" />
-                <File Id="File_Nemerle.Compiler.Utils.dll"               Name="Nemerle.Compiler.Utils.dll" />
-                <File Id="File_Nemerle.VisualStudio.dll"                 Name="Nemerle.VisualStudio.dll" />
-                <File Id="File_Nemerle.VisualStudio.pkgdef"              Name="Nemerle.VisualStudio.pkgdef" />
-                <File Id="File_WpfHint.dll"                              Name="WpfHint.dll" />
+                <File Id="File_vsixmanifest"                               Name="extension.vsixmanifest" />
+                <File Id="File_Microsoft.Windows.Design.Extensibility.dll" Name="Microsoft.Windows.Design.Extensibility.dll" />
+                <File Id="File_Microsoft.Windows.Design.Interaction.dll"   Name="Microsoft.Windows.Design.Interaction.dll" />
+                <File Id="File_Nemerle.Compiler.Utils.dll"                 Name="Nemerle.Compiler.Utils.dll" />
+                <File Id="File_Nemerle.VisualStudio.dll"                   Name="Nemerle.VisualStudio.dll" />
+                <File Id="File_Nemerle.VisualStudio.pkgdef"                Name="Nemerle.VisualStudio.pkgdef" />
+                <File Id="File_WpfHint.dll"                                Name="WpfHint.dll" />
               </Component>
               <Directory Id="Dir_CodeSnippets" Name="CodeSnippets" FileSource="$(var.DistPath)\vs-plugin\CodeSnippets">
                 <Component Id="Comp_VS2010ExtensionCodeSnippets" DiskId="1" Guid="$(var.Comp_VS2010ExtensionCodeSnippets_Guid)">

diff --git a/snippets/VS2010/Nemerle.VisualStudio/Nemerle.VisualStudio.csproj b/snippets/VS2010/Nemerle.VisualStudio/Nemerle.VisualStudio.csproj
@@ -60,6 +60,7 @@
     <WarningLevel>4</WarningLevel>
     <IncrementalBuild>false</IncrementalBuild>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+    <DeployExtension>False</DeployExtension>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Build.Engine" />
@@ -117,9 +118,9 @@
          ProjectReference to Nemerle projects. 
     -->
     <Reference Include="ISymWrapper" />
-    <Reference Include="Microsoft.VisualStudio.Design" />
-    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework" />
-    <Reference Include="Microsoft.VisualStudio.Web.Application" />
+    <Reference Include="Microsoft.VisualStudio.Design, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Web.Application, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="Nemerle">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(Nemerle)\Nemerle.dll</HintPath>

diff --git a/snippets/VS2010/ProjectBase/WebProjectBase.Files b/snippets/VS2010/ProjectBase/WebProjectBase.Files
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
     <Reference Include="System.Web" />