From 16ed14a97c67b563feceff359efcb81c324cb953 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Tue, 27 Oct 2020 17:41:10 -0400 Subject: Update project for Package/SummaryInformation change. --- VisualStudio.wixext.sln | 4 +- global.json | 2 +- src/ca/vsca.vcxproj | 17 +- .../TestData/UsingVsixPackage/Package.wxs | 11 +- .../VisualStudioExtensionFixture.cs | 12 +- src/wixext/VSCompiler.cs | 2 +- src/wixext/WixToolset.VisualStudio.wixext.csproj | 1 - src/wixext/vs.xsd | 292 --------------------- src/wixlib/HTML_Help_Registration__RTL_X86.wxs | 39 ++- src/wixlib/VS11.wxs | 15 +- src/wixlib/VS14.wxs | 15 +- src/wixlib/VS2003.wxs | 5 +- src/wixlib/VS2005.wxs | 39 ++- src/wixlib/VS2008.wxs | 45 ++-- src/wixlib/VS2010.wxs | 39 ++- src/wixlib/VS2012.wxs | 23 +- src/wixlib/VS2013.wxs | 23 +- src/wixlib/VS2015.wxs | 15 +- src/wixlib/VS2017.wxs | 7 +- src/wixlib/VS2019.wxs | 7 +- src/wixlib/VSExtension_Platform.wxi | 5 +- src/wixlib/VsixPackage.wxs | 17 +- .../vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs | 35 ++- .../vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs | 49 ++-- 24 files changed, 197 insertions(+), 522 deletions(-) delete mode 100644 src/wixext/vs.xsd diff --git a/VisualStudio.wixext.sln b/VisualStudio.wixext.sln index 30cdb4a3..b00eea9e 100644 --- a/VisualStudio.wixext.sln +++ b/VisualStudio.wixext.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2003 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 15.0.26124.0 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vsca", "src\ca\vsca.vcxproj", "{45308B85-0628-4978-8FC8-6AD9E1AD5949}" EndProject diff --git a/global.json b/global.json index 7a995d0a..f94ab6df 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0143" + "WixToolset.Sdk": "4.0.0-build-0162" } } diff --git a/src/ca/vsca.vcxproj b/src/ca/vsca.vcxproj index 2a024374..e37e94fc 100644 --- a/src/ca/vsca.vcxproj +++ b/src/ca/vsca.vcxproj @@ -1,10 +1,8 @@ - - Debug @@ -15,49 +13,40 @@ Win32 - {45308B85-0628-4978-8FC8-6AD9E1AD5949} DynamicLibrary vsca - v141 + v142 Unicode vsca.def WiX Toolset VS CustomAction + 10.0 - - - - msi.lib - Create - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. @@ -66,4 +55,4 @@ - + \ No newline at end of file diff --git a/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs b/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs index 07e6ba3d..e0e6f11e 100644 --- a/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs +++ b/src/test/WixToolsetTest.VisualStudio/TestData/UsingVsixPackage/Package.wxs @@ -1,18 +1,13 @@ - - - - - + + - - - + diff --git a/src/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs b/src/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs index b8800cee..306962e3 100644 --- a/src/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs +++ b/src/test/WixToolsetTest.VisualStudio/VisualStudioExtensionFixture.cs @@ -23,13 +23,13 @@ namespace WixToolsetTest.VisualStudio "CustomAction:SetVS2012Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2012_VSIX_INSTALLER_PATH]\t", "CustomAction:SetVS2013Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2013_VSIX_INSTALLER_PATH]\t", "CustomAction:SetVS2015Vsix\t51\tVS_VSIX_INSTALLER_PATH\t[VS2015_VSIX_INSTALLER_PATH]\t", - "CustomAction:vimyrEjb_CFhXi3TTLayKNM2w7rvr4\t3122\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\" /admin\t", - "CustomAction:viuFqqe3R3R3Fh7P05ubFRhqQlCBdQ\t1074\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\"\t", - "CustomAction:vrmyrEjb_CFhXi3TTLayKNM2w7rvr4\t3442\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t", - "CustomAction:vruFqqe3R3R3Fh7P05ubFRhqQlCBdQ\t1394\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t", + "CustomAction:vimLa9TyFoAVwf8JmA0_ZJHA69J2fo\t3122\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\" /admin\t", + "CustomAction:viuMpl8IvFSDAzTulrmpAzBwAmCRTQ\t1074\tVS_VSIX_INSTALLER_PATH\t/q \"[#filzi8nwT8Ta133xcfp7qSIdGdRiC0]\"\t", + "CustomAction:vrmLa9TyFoAVwf8JmA0_ZJHA69J2fo\t3442\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t", + "CustomAction:vruMpl8IvFSDAzTulrmpAzBwAmCRTQ\t1394\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t", "CustomAction:VSFindInstances\t257\tVSCA\tFindInstances\t", - "CustomAction:vumyrEjb_CFhXi3TTLayKNM2w7rvr4\t3186\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t", - "CustomAction:vuuFqqe3R3R3Fh7P05ubFRhqQlCBdQ\t1138\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t", + "CustomAction:vumLa9TyFoAVwf8JmA0_ZJHA69J2fo\t3186\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\" /admin\t", + "CustomAction:vuuMpl8IvFSDAzTulrmpAzBwAmCRTQ\t1138\tVS_VSIX_INSTALLER_PATH\t/q /u:\"ExampleVsix\"\t", "CustomAction:Vwd2012VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2012_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", "CustomAction:Vwd2013VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2013_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", "CustomAction:Vwd2015VsixWhenVSAbsent\t51\tVS_VSIX_INSTALLER_PATH\t[VWD2015_VSIX_INSTALL_ROOT]\\Common7\\IDE\\VSIXInstaller.exe\t", diff --git a/src/wixext/VSCompiler.cs b/src/wixext/VSCompiler.cs index d3afc2ab..65f0f97d 100644 --- a/src/wixext/VSCompiler.cs +++ b/src/wixext/VSCompiler.cs @@ -60,7 +60,7 @@ namespace WixToolset.VisualStudio break; case "Fragment": case "Module": - case "Product": + case "Package": switch (element.Name.LocalName) { case "HelpCollectionRef": diff --git a/src/wixext/WixToolset.VisualStudio.wixext.csproj b/src/wixext/WixToolset.VisualStudio.wixext.csproj index 989755fc..bb7bba6b 100644 --- a/src/wixext/WixToolset.VisualStudio.wixext.csproj +++ b/src/wixext/WixToolset.VisualStudio.wixext.csproj @@ -13,7 +13,6 @@ - diff --git a/src/wixext/vs.xsd b/src/wixext/vs.xsd deleted file mode 100644 index 51172920..00000000 --- a/src/wixext/vs.xsd +++ /dev/null @@ -1,292 +0,0 @@ - - - - - - - - The source code schema for the WiX Toolset Visual Studio Extension. - - - - - - - Help Namespace for a help collection. The parent file is the key for the HxC (Collection) file. - - - - - - - - - - - - - Primary Key for HelpNamespace. - - - Friendly name for Namespace. - - - Internal Microsoft Help ID for this Namespace. - - - Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module. - - - - - - - - Filter for Help Namespace. - - - - - - - - - - Primary Key for HelpFilter. - - - Query String for Help Filter. - - - Friendly name for Filter. - - - Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module. - - - - - - - - File for Help Namespace. The parent file is the key for HxS (Title) file. - - - - - - - - Primary Key for HelpFile Table. - - - Key for HxR (Attributes) file. - - - Key for HxI (Index) file. - - - Language ID for content file. - - - Internal Microsoft Help ID for this HelpFile. - - - Key for a file that is in the "root" of the samples directory for this HelpFile. - - - Key for HxQ (Query) file. - - - Suppress linking Help registration custom actions. Help redistributable merge modules will be required. Use this when building a merge module. - - - - - - Plugin for Help Namespace. - - - Key for HxA (Attributes) file of child namespace. - - - Key for HxT file of child namespace. - - - - Foriegn Key into HelpNamespace table for the parent namespace into which the child will be inserted. - The following special keys can be used to plug into external namespaces defined outside of the installer. - MS_VSIPCC_v80 : Visual Studio 2005 - MS.VSIPCC.v90 : Visual Studio 2008 - - - - Key for HxT file of parent namespace that now includes the new child namespace. - - - Key for the feature parent of this help collection. Required only when plugging into external namespaces. - - - Suppress linking Visual Studio Help namespaces. Help redistributable merge modules will be required. Use this when building a merge module. - - - - - - Create a reference to a HelpFile element in another Fragment. - - - Primary Key for HelpFile Table. - - - - Extensibility point in the WiX XML Schema. Schema extensions can register additional - attributes at this point in the schema. - - - - - - - Create a reference to a HelpFile element in another Fragment. - - - Primary Key for HelpFilter. - - - - Extensibility point in the WiX XML Schema. Schema extensions can register additional - attributes at this point in the schema. - - - - - - - - Create a reference to a HelpCollection element in another Fragment. - - - - - - - - - - - - Primary Key for HelpNamespace Table. - - - - Extensibility point in the WiX XML Schema. Schema extensions can register additional - attributes at this point in the schema. - - - - - - - - - This element provides the metdata required to install/uninstall a file as - a VSIX Package. The VSIX package file will be installed as part of the MSI - then passed to the VSIX installer to install the VSIX package. To avoid the - duplication, simply use the MSI to install the VSIX package itself. - - - - - - - - - - - Reference to file identifer. This attribute is required when the element is not a - child of a File element and is invalid when the element is a child of the File element. - - - - - - - Identity of the VSIX package per its internal manifest. If this value is not correct - the VSIX package will not correctly uninstall. - - - - - - - Indicates whether the VSIX package is uninstalled when the parent Component is uninstalled. - The default is 'no'. - - - - - - - Specifies the SKU of Visual Studio in which to register the extension. If no target - is specified the extension is registered with all installed SKUs. If the Target - attribute is specified the TargetVersion attribute must also be specified. The - following is a list of known Visual Studio targets: integratedShell, professional, - premium, ultimate, vbExpress, vcExpress, vcsExpress, vwdExpress - - - - - - - Specifies the version of Visual Studio in which to register the extension. This attribute - is required if the Target attribute is specified. - - - - - - - Indicates whether failure to install the VSIX package causes the installation to rollback. - The default is 'yes'. - - - - - - - Optional reference to a Property element that contains the path to the VsixInstaller.exe. - By default, the latest VsixInstaller.exe on the machine will be used to install the VSIX - package. It is highly recommended that this attribute is *not* used. - - - - - - Extensibility point in the WiX XML Schema. Schema extensions can register additional - attributes at this point in the schema. - - - - - - - Values of this type will look like: "x.x.x.x" where x is an integer from 0 to 65534. - - - - - - - - Values of this type will either be "yes" or "no". - - - - - - - diff --git a/src/wixlib/HTML_Help_Registration__RTL_X86.wxs b/src/wixlib/HTML_Help_Registration__RTL_X86.wxs index fcb99f0f..2bdb810a 100644 --- a/src/wixlib/HTML_Help_Registration__RTL_X86.wxs +++ b/src/wixlib/HTML_Help_Registration__RTL_X86.wxs @@ -1,5 +1,4 @@ - - + @@ -18,23 +17,23 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + @@ -45,8 +44,8 @@ - ( NOT RollbackDisabled ) - ( RollbackDisabled ) + + diff --git a/src/wixlib/VS11.wxs b/src/wixlib/VS11.wxs index dd52e80a..d3f31843 100644 --- a/src/wixlib/VS11.wxs +++ b/src/wixlib/VS11.wxs @@ -1,5 +1,4 @@ - - + @@ -60,7 +59,7 @@ - VS11DEVENV + @@ -69,7 +68,7 @@ - VS11DEVENV + @@ -108,7 +107,7 @@ - VWD11EXPRESS_IDE + @@ -116,7 +115,7 @@ - VWD11EXPRESS_IDE + @@ -192,7 +191,7 @@ - VS11WINEXPRESS_IDE + @@ -200,7 +199,7 @@ - VS11WINEXPRESS_IDE + diff --git a/src/wixlib/VS14.wxs b/src/wixlib/VS14.wxs index 52db1562..83449802 100644 --- a/src/wixlib/VS14.wxs +++ b/src/wixlib/VS14.wxs @@ -1,5 +1,4 @@ - - + @@ -60,7 +59,7 @@ - VS14DEVENV + @@ -69,7 +68,7 @@ - VS14DEVENV + @@ -106,7 +105,7 @@ - VWD14EXPRESS_IDE + @@ -114,7 +113,7 @@ - VWD14EXPRESS_IDE + @@ -173,7 +172,7 @@ - VS14WINEXPRESS_IDE + @@ -181,7 +180,7 @@ - VS14WINEXPRESS_IDE + diff --git a/src/wixlib/VS2003.wxs b/src/wixlib/VS2003.wxs index 10515b52..1e5d36d9 100644 --- a/src/wixlib/VS2003.wxs +++ b/src/wixlib/VS2003.wxs @@ -1,5 +1,4 @@ - - + @@ -15,7 +14,7 @@ - VS2003DEVENV + diff --git a/src/wixlib/VS2005.wxs b/src/wixlib/VS2005.wxs index 3aadf08c..ef538099 100644 --- a/src/wixlib/VS2005.wxs +++ b/src/wixlib/VS2005.wxs @@ -1,5 +1,4 @@ - - + @@ -47,7 +46,7 @@ - VS2005DEVENV + @@ -56,7 +55,7 @@ - VS2005DEVENV + @@ -72,8 +71,8 @@ - - + + @@ -84,7 +83,7 @@ - VCSHARP2005EXPRESS_IDE + @@ -94,7 +93,7 @@ - VCSHARP2005EXPRESS_IDE + @@ -114,7 +113,7 @@ - + @@ -125,7 +124,7 @@ - VB2005EXPRESS_IDE + @@ -135,7 +134,7 @@ - VB2005EXPRESS_IDE + @@ -155,7 +154,7 @@ - + @@ -166,7 +165,7 @@ - VWD2005EXPRESS_IDE + @@ -176,7 +175,7 @@ - VWD2005EXPRESS_IDE + @@ -196,7 +195,7 @@ - + @@ -207,7 +206,7 @@ - VC2005EXPRESS_IDE + @@ -217,7 +216,7 @@ - VC2005EXPRESS_IDE + @@ -237,7 +236,7 @@ - + @@ -248,7 +247,7 @@ - VJSHARP2005EXPRESS_IDE + @@ -258,7 +257,7 @@ - VJSHARP2005EXPRESS_IDE + diff --git a/src/wixlib/VS2008.wxs b/src/wixlib/VS2008.wxs index 096221c2..43bf1d1e 100644 --- a/src/wixlib/VS2008.wxs +++ b/src/wixlib/VS2008.wxs @@ -1,5 +1,4 @@ - - + @@ -41,7 +40,7 @@ - VS90DEVENV + @@ -50,7 +49,7 @@ - VS90DEVENV + @@ -66,8 +65,8 @@ - - + + @@ -78,7 +77,7 @@ - VCSHARP90EXPRESS_IDE + @@ -88,7 +87,7 @@ - VCSHARP90EXPRESS_IDE + @@ -108,7 +107,7 @@ - + @@ -119,7 +118,7 @@ - VB90EXPRESS_IDE + @@ -129,7 +128,7 @@ - VB90EXPRESS_IDE + @@ -149,7 +148,7 @@ - + @@ -160,7 +159,7 @@ - VWD90EXPRESS_IDE + @@ -170,7 +169,7 @@ - VWD90EXPRESS_IDE + @@ -190,7 +189,7 @@ - + @@ -201,7 +200,7 @@ - VC90EXPRESS_IDE + @@ -211,7 +210,7 @@ - VC90EXPRESS_IDE + @@ -245,7 +244,7 @@ - + @@ -256,7 +255,7 @@ - + @@ -266,7 +265,7 @@ - + @@ -275,8 +274,8 @@ - - + + @@ -286,7 +285,7 @@ - + diff --git a/src/wixlib/VS2010.wxs b/src/wixlib/VS2010.wxs index d0d899cc..6c940b86 100644 --- a/src/wixlib/VS2010.wxs +++ b/src/wixlib/VS2010.wxs @@ -1,5 +1,4 @@ - - + @@ -60,7 +59,7 @@ - VS2010DEVENV + @@ -69,7 +68,7 @@ - VS2010DEVENV + @@ -78,8 +77,8 @@ - - + + @@ -90,7 +89,7 @@ - VCSHARP2010EXPRESS_IDE + @@ -100,7 +99,7 @@ - VCSHARP2010EXPRESS_IDE + @@ -120,7 +119,7 @@ - + @@ -131,7 +130,7 @@ - VB2010EXPRESS_IDE + @@ -141,7 +140,7 @@ - VB2010EXPRESS_IDE + @@ -161,7 +160,7 @@ - + @@ -172,7 +171,7 @@ - VWD2010EXPRESS_IDE + @@ -182,7 +181,7 @@ - VWD2010EXPRESS_IDE + @@ -202,7 +201,7 @@ - + @@ -213,7 +212,7 @@ - VC2010EXPRESS_IDE + @@ -223,7 +222,7 @@ - VC2010EXPRESS_IDE + @@ -243,7 +242,7 @@ - + @@ -254,7 +253,7 @@ - VPD2010EXPRESS_IDE + @@ -264,7 +263,7 @@ - VPD2010EXPRESS_IDE + diff --git a/src/wixlib/VS2012.wxs b/src/wixlib/VS2012.wxs index c4baa2c9..513d8684 100644 --- a/src/wixlib/VS2012.wxs +++ b/src/wixlib/VS2012.wxs @@ -1,5 +1,4 @@ - - + @@ -60,7 +59,7 @@ - VS2012DEVENV + @@ -69,7 +68,7 @@ - VS2012DEVENV + @@ -108,7 +107,7 @@ - VWD2012EXPRESS_IDE + @@ -116,7 +115,7 @@ - VWD2012EXPRESS_IDE + @@ -131,7 +130,7 @@ - VPD2012EXPRESS_IDE + @@ -139,7 +138,7 @@ - VPD2012EXPRESS_IDE + @@ -215,7 +214,7 @@ - VS2012WINEXPRESS_IDE + @@ -223,7 +222,7 @@ - VS2012WINEXPRESS_IDE + @@ -242,7 +241,7 @@ - VS2012WDEXPRESS_IDE + @@ -250,7 +249,7 @@ - VS2012WDEXPRESS_IDE + diff --git a/src/wixlib/VS2013.wxs b/src/wixlib/VS2013.wxs index fa774ff0..6681b43f 100644 --- a/src/wixlib/VS2013.wxs +++ b/src/wixlib/VS2013.wxs @@ -1,5 +1,4 @@ - - + @@ -60,7 +59,7 @@ - VS2013DEVENV + @@ -69,7 +68,7 @@ - VS2013DEVENV + @@ -108,7 +107,7 @@ - VWD2013EXPRESS_IDE + @@ -116,7 +115,7 @@ - VWD2013EXPRESS_IDE + @@ -131,7 +130,7 @@ - VPD2013EXPRESS_IDE + @@ -139,7 +138,7 @@ - VPD2013EXPRESS_IDE + @@ -209,7 +208,7 @@ - VS2013WINEXPRESS_IDE + @@ -218,7 +217,7 @@ - VS2013WINEXPRESS_IDE + @@ -238,7 +237,7 @@ - VS2013WDEXPRESS_IDE + @@ -247,7 +246,7 @@ - VS2013WDEXPRESS_IDE + diff --git a/src/wixlib/VS2015.wxs b/src/wixlib/VS2015.wxs index b7fb7b4d..f14802e2 100644 --- a/src/wixlib/VS2015.wxs +++ b/src/wixlib/VS2015.wxs @@ -1,5 +1,4 @@ - - + @@ -60,7 +59,7 @@ - VS2015DEVENV + @@ -69,7 +68,7 @@ - VS2015DEVENV + @@ -106,7 +105,7 @@ - VWD2015EXPRESS_IDE + @@ -114,7 +113,7 @@ - VWD2015EXPRESS_IDE + @@ -173,7 +172,7 @@ - VS2015WINEXPRESS_IDE + @@ -181,7 +180,7 @@ - VS2015WINEXPRESS_IDE + diff --git a/src/wixlib/VS2017.wxs b/src/wixlib/VS2017.wxs index acc96d67..5524361d 100644 --- a/src/wixlib/VS2017.wxs +++ b/src/wixlib/VS2017.wxs @@ -1,5 +1,4 @@ - - + @@ -74,7 +73,7 @@ - VS2017DEVENV + @@ -83,7 +82,7 @@ - VS2017DEVENV + diff --git a/src/wixlib/VS2019.wxs b/src/wixlib/VS2019.wxs index 57ae6168..0be63dec 100644 --- a/src/wixlib/VS2019.wxs +++ b/src/wixlib/VS2019.wxs @@ -1,5 +1,4 @@ - - + @@ -74,7 +73,7 @@ - VS2019DEVENV + @@ -83,7 +82,7 @@ - VS2019DEVENV + diff --git a/src/wixlib/VSExtension_Platform.wxi b/src/wixlib/VSExtension_Platform.wxi index 30d107ef..f9cd96f4 100644 --- a/src/wixlib/VSExtension_Platform.wxi +++ b/src/wixlib/VSExtension_Platform.wxi @@ -1,10 +1,9 @@ - - + - + diff --git a/src/wixlib/VsixPackage.wxs b/src/wixlib/VsixPackage.wxs index 8149c55b..5937177b 100644 --- a/src/wixlib/VsixPackage.wxs +++ b/src/wixlib/VsixPackage.wxs @@ -1,5 +1,4 @@ - - + @@ -47,15 +46,15 @@ - NOT VS_VSIX_INSTALLER_PATH AND VS2015_VSIX_INSTALLER_PATH - NOT VS_VSIX_INSTALLER_PATH AND VWD2015_VSIX_INSTALL_ROOT + + - NOT VS_VSIX_INSTALLER_PATH AND VS2013_VSIX_INSTALLER_PATH - NOT VS_VSIX_INSTALLER_PATH AND VWD2013_VSIX_INSTALL_ROOT + + - NOT VS_VSIX_INSTALLER_PATH AND VS2012_VSIX_INSTALLER_PATH - NOT VS_VSIX_INSTALLER_PATH AND VWD2012_VSIX_INSTALL_ROOT + + - NOT VS_VSIX_INSTALLER_PATH AND VS2010_VSIX_INSTALLER_PATH + diff --git a/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs index bb0dfd62..66757349 100644 --- a/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs +++ b/src/wixlib/vs2005/VS2005_VSIPCC_Collection_Files_RTL.wxs @@ -1,5 +1,4 @@ - - + @@ -24,41 +23,41 @@ - - + + - - + + - MS_VSIPCC_v80 - MS_VSCC_v80 - FL_vsipcc_hxt_86880________ + + + - MS_VSIPCC_v80 - MS_VSExpressCC_v80 - FL_vsipcc_hxt_86880________ + + + - MS_VSIPCC_v80 - MS.VSIPCC.v80 - FL_vsipcc_hxc_86879________ - VSIP Documentation + + + + - - + + diff --git a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs index bfeef18f..9fb1a0e5 100644 --- a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs +++ b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs @@ -1,12 +1,11 @@ - - + - - + + @@ -15,33 +14,33 @@ - - - - - - - - - - - + + + + + + + + + + + - MS.VSIPCC.v90 - MS.VSIPCC.v90 - FL_vsipcc_hxc_86879_86879_cn_ln - VSIP Documentation + + + + - MS.VSIPCC.v90 - MS.VSCC.v90 - FL_vsipcc_hxt_86880_86880_cn_ln + + + @@ -50,12 +49,12 @@ - Not Installed + - - + + -- cgit v1.2.3-55-g6feb