SF.net SVN: orm:[1562] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 1562
          http://sourceforge.net/p/orm/code/1562
Author:   mcurland
Date:     2015-09-07 20:50:14 +0000 (Mon, 07 Sep 2015)
Log Message:
-----------
Use VSIX installation with devenv /udateconfiguration for VS2012/2013/2015 Setup.sln
 * Shows NORMA as an installed extension in VS
 * /updateconfiguration will cause next VS launch to slow down and potentially file/new and opening the first .orm file. However, this is still much faster than devenv /setup, which has gotten significantly slower for each new VS version.
 * Adjust vsix manifest editions for VS2013 and VS2015

Modified Paths:
--------------
    trunk/Setup/Config.wxi
    trunk/Setup/Product.wxs
    trunk/Setup/Strings.wxl
    trunk/Setup/UI/ErrorProgressText.wxs
    trunk/VSIXInstall/VS2013/extension.vsixmanifest
    trunk/VSIXInstall/VS2015/extension.vsixmanifest

Modified: trunk/Setup/Config.wxi
===================================================================

--- trunk/Setup/Config.wxi	2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/Config.wxi	2015-09-07 20:50:14 UTC (rev 1562)
@@ -70,9 +70,10 @@
 		<?define RootSuffixVersion="11.0"?>
 		<?define LinqSupport=1 ?>
 		<?define HelpFileTargetCollection="MS.VSIPCC.v110"?>
-		<!--<?define VSIXInstall?>-->
+		<?define VSIXInstall?>
 		<?define VSRegistryPackageOnly?>
 		<?define NewORMFileViaNewFileItems?>
+		<!-- DoDevenvSetup modified by VSIXInstall, runs /updateconfiguration instead -->
 		<?define DoDevenvSetup?>
 		<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
 		<?define ModelingProjectSupport=1 ?>
@@ -81,9 +82,10 @@
 		<?define RootSuffixVersion="12.0"?>
 		<?define LinqSupport=1 ?>
 		<?define HelpFileTargetCollection="MS.VSIPCC.v120"?>
-		<!--<?define VSIXInstall?>-->
+		<?define VSIXInstall?>
 		<?define VSRegistryPackageOnly?>
 		<?define NewORMFileViaNewFileItems?>
+		<!-- DoDevenvSetup modified by VSIXInstall, runs /updateconfiguration instead -->
 		<?define DoDevenvSetup?>
 		<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
 		<?define ModelingProjectSupport=1 ?>
@@ -92,9 +94,10 @@
 		<?define RootSuffixVersion="14.0"?>
 		<?define LinqSupport=1 ?>
 		<?define HelpFileTargetCollection="MS.VSIPCC.v140"?>
-		<!--<?define VSIXInstall?>-->
+		<?define VSIXInstall?>
 		<?define VSRegistryPackageOnly?>
 		<?define NewORMFileViaNewFileItems?>
+		<!-- DoDevenvSetup modified by VSIXInstall, runs /updateconfiguration instead -->
 		<?define DoDevenvSetup?>
 		<?define FixedCSharpPackageGuid="{FAE04EC1-301F-11D3-BF4B-00C04F79EFBC}"?>
 		<?define ModelingProjectSupport=1 ?>

Modified: trunk/Setup/Product.wxs
===================================================================
--- trunk/Setup/Product.wxs	2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/Product.wxs	2015-09-07 20:50:14 UTC (rev 1562)
@@ -135,7 +135,11 @@
 		</AdvertiseExecuteSequence>
 
 		<CustomAction Id="ArpInstallLocationCustomAction" Property="ARPINSTALLLOCATION" Value="[$(var.DefaultShortProductDir)]"/>
+		<?ifdef VSIXInstall?>
+		<CustomAction Id="DevEnvSetupCustomAction" Property="VSENVIRONMENTPATH" ExeCommand="$(var.RootSuffixCmd)/updateconfiguration" Return="ignore" Impersonate="no" Execute="commit"/>
+		<?else?>
 		<CustomAction Id="DevEnvSetupCustomAction" Property="VSENVIRONMENTPATH" ExeCommand="$(var.RootSuffixCmd)/Setup" Return="ignore" Impersonate="no" Execute="commit"/>
+		<?endif?>
 		<InstallExecuteSequence>
 			<RemoveExistingProducts Before="ArpInstallLocationCustomAction"/>
 			<Custom Before="InstallInitialize" Action="ArpInstallLocationCustomAction"/>

Modified: trunk/Setup/Strings.wxl
===================================================================
--- trunk/Setup/Strings.wxl	2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/Strings.wxl	2015-09-07 20:50:14 UTC (rev 1562)
@@ -65,6 +65,7 @@
 	<!-- HACK: DevEnvSetupCustomAction runs as a commit custom action, which makes it hard to show UI for it. -->
 	<!-- Instead, we hijack the ProgressTextRollbackCleanup string, since it is the last string normally shown before the custom action executes. -->
 	<String Id="ProgressTextRollbackCleanup">Running Visual Studio "/Setup" command. This may take several minutes...</String>
+	<String Id="ProgressTextRollbackCleanupVSIX">Running Visual Studio "/UpdateConfiguration" command.</String>
 
 	<String Id="ProgressTextExportTempHxDs">MSHelp2: Exporting temporary HxDs</String>
 	<String Id="ProgressTextRollbackHelpTransaction">MSHelp2: Rolling back transaction</String>

Modified: trunk/Setup/UI/ErrorProgressText.wxs
===================================================================
--- trunk/Setup/UI/ErrorProgressText.wxs	2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/Setup/UI/ErrorProgressText.wxs	2015-09-07 20:50:14 UTC (rev 1562)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <?include ..\Config.wxi?>
   <Fragment>
     <UI Id="WixUI_ErrorProgressText">
       <!-- action text -->
@@ -70,7 +71,11 @@
       <ProgressText Action="MsiPublishAssemblies" Template="!(loc.ProgressTextMsiPublishAssembliesTemplate)">!(loc.ProgressTextMsiPublishAssemblies)</ProgressText>
       <ProgressText Action="MsiUnpublishAssemblies" Template="!(loc.ProgressTextMsiUnpublishAssembliesTemplate)">!(loc.ProgressTextMsiUnpublishAssemblies)</ProgressText>
       <ProgressText Action="Rollback" Template="!(loc.ProgressTextRollbackTemplate)">!(loc.ProgressTextRollback)</ProgressText>
-      <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanup)</ProgressText>
+      <?ifdef VSIXInstall?>
+        <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanupVSIX)</ProgressText>
+      <?else?>
+        <ProgressText Action="RollbackCleanup" Template="!(loc.ProgressTextRollbackCleanupTemplate)">!(loc.ProgressTextRollbackCleanup)</ProgressText>
+      <?endif?>
       <ProgressText Action="UnmoveFiles" Template="!(loc.ProgressTextUnmoveFilesTemplate)">!(loc.ProgressTextUnmoveFiles)</ProgressText>
       <ProgressText Action="UnpublishProduct">!(loc.ProgressTextUnpublishProduct)</ProgressText>
       <!-- error text -->

Modified: trunk/VSIXInstall/VS2013/extension.vsixmanifest
===================================================================
--- trunk/VSIXInstall/VS2013/extension.vsixmanifest	2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/VSIXInstall/VS2013/extension.vsixmanifest	2015-09-07 20:50:14 UTC (rev 1562)
@@ -16,6 +16,7 @@
         <Edition>Ultimate</Edition>
         <Edition>Premium</Edition>
         <Edition>Pro</Edition>
+        <Edition>Community</Edition>
       </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.5" MaxVersion="4.5" />

Modified: trunk/VSIXInstall/VS2015/extension.vsixmanifest
===================================================================
--- trunk/VSIXInstall/VS2015/extension.vsixmanifest	2015-09-07 07:40:51 UTC (rev 1561)
+++ trunk/VSIXInstall/VS2015/extension.vsixmanifest	2015-09-07 20:50:14 UTC (rev 1562)
@@ -13,9 +13,9 @@
     <InstalledByMsi>true</InstalledByMsi>
     <SupportedProducts>
       <VisualStudio Version="14.0">
-        <Edition>Ultimate</Edition>
-        <Edition>Premium</Edition>
+        <Edition>Enterprise</Edition>
         <Edition>Pro</Edition>
+        <Edition>Community</Edition>
       </VisualStudio>
     </SupportedProducts>
     <SupportedFrameworkRuntimeEdition MinVersion="4.6" MaxVersion="4.6" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



