Бизнес-робот
Бизнес
робот

Темы:

Архив:

Каталог рекламы и объявлений

Ящик для предложений: sales@blogslov.ru

Wix-commits Digest, Vol 11, Issue 51

Send Wix-commits mailing list submissions to


To subscribe or unsubscribe via the World Wide Web, visit
https://lists.sourceforge.net/lists/listinfo/wix-commits
or, via email, send a message with subject or body 'help' to


You can reach the person managing the list at


When replying, please edit your Subject line so it is more specific
than "Re: Contents of Wix-commits digest..."


Today's Topics:

1. wix/src/votive/votive RunPostBuildEvent.cs, NONE, 1.1
WixBuildMacroCollection.cs, NONE, 1.1 WixHelperMethods.cs, 1.1,
1.2 WixPackage.cs, 1.3, 1.4 WixPackageSettings.cs, 1.1, 1.2
WixProjectFileConstants.cs, 1.1, 1.2 WixProjectNode.cs, 1.3, 1.4
WixStrings.Designer.cs, 1.3, 1.4 WixStrings.resx, 1.3, 1.4
votive.csproj, 1.4, 1.5 (Rob Mensching)


----------------------------------------------------------------------

Message: 1
Date: Wed, 27 Jun 2007 05:38:53 +0000
From: Rob Mensching
Subject: [WiX-commits] wix/src/votive/votive RunPostBuildEvent.cs,
NONE, 1.1 WixBuildMacroCollection.cs, NONE, 1.1 WixHelperMethods.cs,
1.1, 1.2 WixPackage.cs, 1.3, 1.4 WixPackageSettings.cs, 1.1, 1.2
WixProjectFileConstants.cs, 1.1, 1.2 WixProjectNode.cs, 1.3, 1.4
WixStrings.Designer.cs, 1.3, 1.4 WixStrings.resx, 1.3, 1.4
votive.csproj, 1.4, 1.5
To:
Message-ID:

Update of /cvsroot/wix/wix/src/votive/votive
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1332/src/votive/votive

Modified Files:
WixHelperMethods.cs WixPackage.cs WixPackageSettings.cs
WixProjectFileConstants.cs WixProjectNode.cs
WixStrings.Designer.cs WixStrings.resx votive.csproj
Added Files:
RunPostBuildEvent.cs WixBuildMacroCollection.cs
Log Message:
Benxing: Number of patch related bug fix
*Update FeatureComponent table when ComponentRef in the selected PatchFamily
*File Sequence problem

PMarcu: Allowing extension attributes on DirectoryRef and PropertyRef
Adding extension attributes to the VSExtension Refs

PMarcu: Adding UIRef and DirectoryRef to possible PatchFamily Children
Allowing extension attributes on CustomAction elements.

JRock: Added support for setting pre- and post-build event command lines via a
property page in Votive. This gets me one step closer to restoring the
inter-project variables that we had in V2 but had to pull in V3 to get
it out the door (e.g. $(var.MyProject.TargetPath)).

JRock: Added support for SolutionX variables in the wix.targets file. So, you
can now use $(var.SolutionDir) in your .wxs files and have the variables
automatically added to the preprocessor definitions when building with
wix.targets and MSBuild.

Benxing: Regardless of differences in the MST, we will compare underlying files before
copying data into the patch. Extensions can override CompareFiles to provide
custom file diffing behavior.

AaronSte: Updating Heat to use HKCU instead of HKLM when harvesting registry
information on Windows Vista to avoid UAC issues

PMarcu: Making XsdStitch only output a single prefix for each extension namespace.

Benxing: Fixing null reference exception in the binder when the file table is empty.

RobMen: Default File/@Name to File/@Id.

MikeHo: Fix bug with Setup.exe when trying to install and TEMP and AppData
folders are not on same drive, setup fails

MikeHo: Add fallback to Caching the MSI.

RobMen: SFBUG:1680666 - Correctly modularize RemoveIniFile.DirProperites.

PMarcu: Removing FragmentRef's

AaronSte: SFBUG:1675664 - Marking ComboBox value attribute as localizable.

PMarcu: Adding BinaryRef as a child of PatchFamily.

Benxing: Give warning when removing component from feature during the patch build.

PMarcu: Changing namespace keys in the VSExtension help tables to not be modularized.

PMarcu: Adding some targeted checks to patch transforms to catch possible error
conditions as early as possible.

AaronSte: Adding Visual Studio Codename Orcas detection properties.

AaronSte: SFBUG:1687207 - Update Heat so DllRegisterServer captures will work
on Windows Vista from an elevated cmd prompt.

PMarcu: Fix for DocCompiler to handle ref attributes in attribute definitions under
elements.

BobArnso: Resize and combine some controls to better fit localized strings
(affects all UI sets, dialogs UserExit, OutOfRbDiskDlg, OutOfDiskDlg)

Benxing: Skipping unreal tables when binding transforms to improve patch build
perfomance.
Adding active substorage into binder extension to give the ability to
access corresponding transform information.

JRock: SFBUG:1673425 - Cannot access the VS menu using the alt key
SFBUG:1576283 - Unable to enter 'c' or 'm' in proj properties screen fields
SFBUG:1570392 - Project Designer - Index was outside the bounds of the array
SFBUG:1566296 - Setting 'Cultures' field in project properties has no effect
SFBUG:1576287 - Modifying project properties does not force rebuild

Benxing: Ignore rows without section id in ReduceTransform.

MikeHo: Allow for multiple files to be extracted from chainer.

AaronSte: Adding Visual Studio Team Test project system detection properties.

FGrohn: Support for PubCA in WiX v3.

HeathS: Added extension support to the Validator.
Exposed extension support for the Validator through light.exe.
Exposed extension support for the Validator through smoke.exe.
Exposed multiple .cub file support through smoke.exe.

HeathS: Exposed multiple .cub file support through light.exe.
Added a test for the Validator and multiple .cub support in light.exe.

MikeHo: Add error messages for Windows Installer service can't start or Install
blocked by system policy

BobArnso: Add WixQueryOsInfo CA to detect system suite info and "special
folders" as properties over and above the MSI set

BobArnso: Default to removing library rows from decompiled output in
WixUtilExtension

PMarcu: Refactoring patch buld system to use Pyro instead of Light for filtering
and binding. Other target patch specific bug fixes are in the mix as well.

PMarcu: Adding more command line options to Pyro, specifically the ones that
provide settings for the binder.

PMarcu: Adding error and warning preprocessor instructions.

PMarcu: Fixing an exception thrown when Dark is run and no extensions are defined
in the config file or the config file is absent.
Also, bug where Customtable columns that are not foreign keys have the
keytable attribute defined on the column as keytable="". This results in
an invalid table reference to "".

PMarcu: Switching order on Pyro commandline.

Jordanf: Adding support to WixUnit for Pyro. Fixing the qtest patch.minorupgrade
to use Pyro.

BrianRe: Added code to detect a namespace prefix that is already in use and if
so it will append it with its' position within the "duplicates" for
that specific prefix; eg. sql, sql2, sql3, and so on.

RobMen: Add support for PerformanceCounters (including managed code).

FGrohn: Added COM+ and MSMQ extensions to the zip file.

FGrohn: Move to Windows Vista SDK.

JRock: SFBUG:1566807 - Display full version in about dialog.
SFBUG:1697089 - MSBuild WiX taskscannot resolve WiX tool paths automatically
SFBUG:1689830 - Error when using Wix3 when not installed on C drive

Benxing: Handle Sequence tables when building the patch.
Don't allow empty patch.

HeathS: Added an extension for installing PowerShell snap-ins.

PMarcu: Adding Melt as a tool to decompile MSM's to ComponentGroups.

PMarcu: Adding warning for when a non keypath file is updated and the keypath file
of that component is not.

Benxing: Adding information into _SummaryInformation table for patch build.

PMarcu: Adding a check to assure no duplicate fragment Id's exist.

JKuhne: Fixing a GC issue with the Validator. (Locals are rooted until last reference, not
end of scope.)

BobArnso: Add DiskId attribute to Directory and DirectoryRef to provide default
DiskId for contained components and files.

MikeHo: Fix language matching in Setup.exe

PMarcu: Making sdut and tsa defaults when passing xo to light.exe

AaronSte: Adding more CSIDL values to WixQueryOsDirs custom action

RobMen: Reverse integrate WiX v2 CustomAction fixes.

BobArnso: Add element-extensibility points to Directory and DirectoryRef.

Jordanf: Add a new test for preprocessor .

Mikeho: Add NewFolder UIText element.

AaronSte: Adding custom actions to run devenv.exe /InstallVSTemplates to the
WixVSExtension

BobArnso: Pass directory ID to Directory and DirectoryRef extension elements.

RobMen: Introducing smart-cabbing.

RobMen: SFBUG:1707259 - fix nasty memory violation
HeathS: Added patch-specific property to identify client patches and
if they can be removed.

Mikeho: Fix manifests for setupbld.exe/setup.exe

JordanF: Add the -update option to automatically update a test. Make MSI/MSI
validation explicit in the tests.

JRock: Adding back project references to Votive V3! Actually, I'm adding them
to the wix.targets MSBuild file to be exact. Votive uses it, but you get
the goodness without using Votive also. Basically, this is the feature
where if you reference other projects in your Visual Studio solution,
you can reference the output of those projects from within your wixproj
project. For example, $(var.MyCSharpApp.TargetPath). This will work for
any managed project in Visual Studio (at least it does for VC#, VB, and
VC++ managed). You have to build from within Visual Studio or from the
command line. If you build just the .wixproj, then you won't get the
project variables defined.

SFBUG:1585281 - Add solution and project variables back to Votive v3

MikeHo: Fix support for more than 10 MSIs/MSTs

JRock: SFBUG:1588291 - Support response files for MSBuild candle/light/lit
tasks

BobArnso: Have heat generate a default ComponentGroup when harvesting
directories in a fragment.

JRock: SFBUG:1717966 - Solution Build Issues (build 2911)
When a wixproj is the only thing in the solution, the SolutionX
variables aren't defined when building within Visual Studio. This
is because normally C#/VB define these variables for us. The fix
is to define them ourself.

HeathS: SFBUG:1716160 - ICE03 string overflow error, xmlFile

RobMen: SFBUG:1716160 - fix string overflow error for XmlConfig

BrianRe: Fixing wix.xsd to use W3C recognized regular expressions.

PMarcu: Defaulting Media\@Source to a form of the patchId if not specified
when Media is a child of a patch.

RobMen: SFBUG:1724535 - correctly integrate a few more fixes from WiX v2 to
WiX v3.

JordanF: WixUnit now compares the transforms inside a patch when it is diffing
two patches. Previously, only the tables in the patch were compared.

AaronSte: Added documentation for properties and custom actions in the
WixVSExtension.

PMarcu: Fix for ServiceConfig CA's to call correct rollback entrypoint.

BMurri: Add support for bound wixouts/wixmsts to torch and pyro.

PMarcu: Fix for ServiceConfig CA's to call correct rollback entrypoint.

RobMen: Schema tweaks to enable simple references on FeatureRef and
FeatureGroupRef plus tweaks to enable floating Components.
AaronSte: Added documentation for Votive functionality.

AaronSte: Fixing variable resolution problem in WiX Product item template
in Votive.

PMarcu: Updating flags in XmlConfig to match with CA after the 2.0 to
3.0 integration.

JRock: Integrated the VS SDK 4.0 into Votive.

AaronSte: Merged WiX 2.0 documentation changes into 3.0. Updated instances
of deprecated src attributes in examples in the docs.

MikeHo: Add reinstall support & logging to Chainer + fix bug when using
transforms other than Chinese.

HeathS: SFBUG:1739868 - Pyro does not find .AllowRemoval property

PMarcu: Removing primary key from EnsureTable to support patching.
Fixing documentation for XmlConfig.

RobMen: SFBUG:1739194 - Preserve whitespace when using XmlFile or XmlConfig

JKuhne: Fix a GC related bug in the cab enumeration callback. (Cab.WixEnumerateCab.Enumerate)


Index: WixPackage.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixPackage.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WixPackage.cs 2 Mar 2007 12:22:39 -0000 1.3
--- WixPackage.cs 27 Jun 2007 05:38:50 -0000 1.4
***************
*** 20,23 ****
--- 20,25 ----
{
using System;
+ using System.Globalization;
+ using System.Reflection;
using System.Runtime.InteropServices;
using Microsoft.VisualStudio;
***************
*** 41,44 ****
--- 43,47 ----
[ProvideObject(typeof(WixCompilerPropertyPage), RegisterUsing = RegistrationMethod.CodeBase)]
[ProvideObject(typeof(WixLinkerPropertyPage), RegisterUsing = RegistrationMethod.CodeBase)]
+ [ProvideObject(typeof(WixBuildEventsPropertyPage), RegisterUsing = RegistrationMethod.CodeBase)]
[ProvideProjectFactory(typeof(WixProjectFactory), WixProjectNode.ProjectTypeName, "#100", "wixproj", "wixproj", "", LanguageVsTemplate = "WiX")]
public class WixPackage : ProjectPackage, IVsInstalledProduct
***************
*** 90,94 ****
int IVsInstalledProduct.ProductDetails(out string pbstrProductDetails)
{
! pbstrProductDetails = WixStrings.ProductDetails;
return VSConstants.S_OK;
}
--- 93,99 ----
int IVsInstalledProduct.ProductDetails(out string pbstrProductDetails)
{
! // get the version number from the assembly
! string assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString();
! pbstrProductDetails = String.Format(CultureInfo.InvariantCulture, WixStrings.ProductDetails, assemblyVersion);
return VSConstants.S_OK;
}

--- NEW FILE: WixBuildMacroCollection.cs ---
//--------------------------------------------------------------------------------------------------
//
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
//
// You must not remove this notice, or any other, from this software.
//
//
//
// Contains the WixBuildMacroCollection class.
//
//--------------------------------------------------------------------------------------------------

namespace Microsoft.Tools.WindowsInstallerXml.VisualStudio
{
using System;
using System.Collections;
using System.Collections.Generic;

using EnvDTE;
using Microsoft.Build.BuildEngine;
using Microsoft.VisualStudio.Package;

///
/// Collection class for a series of solution and project variables with their associated
/// values. For example: SolutionDir=C:\MySolution, ProjectName=MyProject, etc.
///
public class WixBuildMacroCollection : ICollection, IEnumerable
{
// =========================================================================================
// Member Variables
// =========================================================================================

private static readonly string[] globalMacroNames =
{
WixProjectFileConstants.DevEnvDir,
WixProjectFileConstants.SolutionDir,
WixProjectFileConstants.SolutionExt,
WixProjectFileConstants.SolutionName,
WixProjectFileConstants.SolutionFileName,
WixProjectFileConstants.SolutionPath,
};

private static readonly string[] macroNames =
{
"ConfigurationName",
"OutDir",
"PlatformName",
"ProjectDir",
"ProjectExt",
"ProjectFileName",
"ProjectName",
"ProjectPath",
"TargetDir",
"TargetExt",
"TargetFileName",
"TargetName",
"TargetPath",
};

private SortedList list = new SortedList(macroNames.Length, StringComparer.OrdinalIgnoreCase);

// =========================================================================================
// Constructors
// =========================================================================================

///
/// Initializes a new instance of the class.
///
/// The project from which to read the properties.
public WixBuildMacroCollection(WixProjectNode project)
{
WixHelperMethods.VerifyNonNullArgument(project, "project");

// get the global SolutionX properties
project.DefineSolutionProperties();
foreach (string globalMacroName in globalMacroNames)
{
BuildProperty property = project.BuildEngine.GlobalProperties[globalMacroName];
if (property == null)
{
this.list.Add(globalMacroName, "*Undefined*");
}
else
{
string value = property.FinalValue;
this.list.Add(globalMacroName, value);
}
}

// we need to call GetTargetPath first so that TargetDir and TargetPath are resolved correctly
string config = Microsoft.VisualStudio.Package.Utilities.GetActiveConfigurationName(project.GetAutomationObject() as EnvDTE.Project);
bool builtSuccessfully = (project.Build(config, WixProjectFileConstants.MsBuildTarget.GetTargetPath) == MSBuildResult.Sucessful);

// get the ProjectX and TargetX variables
foreach (string macroName in macroNames)
{
string value = project.GetProjectProperty(macroName);
this.list.Add(macroName, value);
}
}

// =========================================================================================
// Properties
// =========================================================================================

///
/// Gets the number of elements in the collection.
///
public int Count
{
get { return this.list.Count; }
}

bool ICollection.IsSynchronized
{
get { return ((ICollection)this.list).IsSynchronized; }
}

object ICollection.SyncRoot
{
get { return ((ICollection)this.list).SyncRoot; }
}

// =========================================================================================
// Methods
// =========================================================================================

void ICollection.CopyTo(Array array, int index)
{
((ICollection)this.list).CopyTo(array, index);
}

IEnumerator IEnumerable.GetEnumerator()
{
foreach (KeyValuePair pair in this.list)
{
yield return (MacroNameValuePair)pair;
}
}

IEnumerator IEnumerable.GetEnumerator()
{
return ((IEnumerable)this).GetEnumerator();
}

// =========================================================================================
// Classes
// =========================================================================================

///
/// Defines a macro name/value pair that can be set or retrieved.
///
public struct MacroNameValuePair
{
private KeyValuePair pair;

///
/// Initializes a new instance of the class.
///
/// The macro name.
/// The macro's value.
public MacroNameValuePair(string macroName, string value)
{
this.pair = new KeyValuePair(macroName, value);
}

///
/// Initializes a new instance of the class.
///
/// The KeyValuePair<string, string> to store.
private MacroNameValuePair(KeyValuePair pair)
{
this.pair = pair;
}

///
/// Gets the macro name in the macro name/value pair.
///
public string MacroName
{
get { return this.pair.Key; }
}

///
/// Gets the value in the macro name/value pair.
///
public string Value
{
get { return this.pair.Value; }
}

///
/// Converts a KeyValuePair<string, string>
/// to a .
///
/// The KeyValuePair<string, string> to convert.
/// The converted .
public static implicit operator MacroNameValuePair(KeyValuePair source)
{
return new MacroNameValuePair(source);
}
}
}
}

Index: WixProjectNode.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixProjectNode.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WixProjectNode.cs 2 Mar 2007 12:22:39 -0000 1.3
--- WixProjectNode.cs 27 Jun 2007 05:38:50 -0000 1.4
***************
*** 20,26 ****
--- 20,28 ----
{
using System;
+ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Runtime.InteropServices;
+ using Microsoft.Build.BuildEngine;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Package;
***************
*** 249,253 ****
public override bool IsCodeFile(string fileName)
{
! string extension = Path.GetExtension(fileName);;
return String.Equals(".wxs", extension, StringComparison.OrdinalIgnoreCase);
}
--- 251,255 ----
public override bool IsCodeFile(string fileName)
{
! string extension = Path.GetExtension(fileName);
return String.Equals(".wxs", extension, StringComparison.OrdinalIgnoreCase);
}
***************
*** 338,341 ****
--- 340,344 ----
{
typeof(WixBuildPropertyPage).GUID,
+ typeof(WixBuildEventsPropertyPage).GUID,
};

***************
*** 358,364 ****
}

! if (String.IsNullOrEmpty(GetProjectProperty(WixProjectFileConstants.WixToolPath)))
{
! SetProjectProperty(WixProjectFileConstants.WixToolPath, this.package.Settings.ToolsDirectory);
}
}
--- 361,463 ----
}

! // initialize the WixToolPath property from the value in the registry
! string toolsDirectory = this.package.Settings.ToolsDirectory;
! string programFilesDirectory = WixHelperMethods.EnsureTrailingDirectoryChar(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles));
!
! // if the path in the registry starts with the same path as program files, then just put in $(ProgramFiles) to make it more portable
! if (toolsDirectory.StartsWith(programFilesDirectory, StringComparison.OrdinalIgnoreCase))
{
! toolsDirectory = "$(ProgramFiles)\\" + toolsDirectory.Substring(programFilesDirectory.Length);
! }
!
! this.SetProjectProperty(WixProjectFileConstants.WixToolPath, toolsDirectory);
! }
!
! ///
! /// Sets the value of an MSBuild project property.
! ///
! /// The name of the property to change.
! /// The value to assign the property.
! public override void SetProjectProperty(string propertyName, string propertyValue)
! {
! this.SetProjectProperty(propertyName, propertyValue, null, PropertyPosition.UseExistingOrCreateAfterLastPropertyGroup, false);
! }
!
! ///
! /// Sets the value of an MSBuild project property.
! ///
! /// The name of the property to change.
! /// The value to assign the property.
! /// The condition to use on the property. Corresponds to the Condition attribute of the Property element.
! /// A value indicating the location to insert the property.
! /// true to treat the parameter as a literal value; otherwise, false.
! public void SetProjectProperty(string propertyName, string propertyValue, string condition, PropertyPosition position, bool treatPropertyValueAsLiteral)
! {
! WixHelperMethods.VerifyStringArgument(propertyName, "propertyName");
!
! if (propertyValue == null)
! {
! propertyValue = String.Empty;
! }
!
! // see if the value is the same as what's already in the project so we
! // know whether to actually mark the project file dirty or not
! string oldValue = this.GetProjectProperty(propertyName, true);
!
! if (!String.Equals(oldValue, propertyValue, StringComparison.Ordinal))
! {
! // check out the project file
! if (!this.ProjectMgr.QueryEditProjectFile(false))
! {
! throw Marshal.GetExceptionForHR(VSConstants.OLE_E_PROMPTSAVECANCELLED);
! }
!
! this.BuildProject.SetProperty(propertyName, propertyValue, condition, position, treatPropertyValueAsLiteral);
!
! // refresh the cached values
! this.SetCurrentConfiguration();
! this.SetProjectFileDirty(true);
! }
! }
!
! ///
! /// Executes an MSBuild target.
! ///
! /// Name of the MSBuild target to execute.
! /// Result from executing the target (success/failure).
! protected override MSBuildResult InvokeMsBuild(string target)
! {
! this.DefineSolutionProperties();
! return base.InvokeMsBuild(target);
! }
!
! ///
! /// When building with only a wixproj in the solution, the SolutionX variables are not
! /// defined, so we have to define them here.
! ///
! internal void DefineSolutionProperties()
! {
! IVsSolution solution = WixHelperMethods.GetService(this.Site);
! object solutionPathObj;
! ErrorHandler.ThrowOnFailure(solution.GetProperty((int)__VSPROPID.VSPROPID_SolutionFileName, out solutionPathObj));
! string solutionPath = (string)solutionPathObj;
! string devEnvDir = WixHelperMethods.EnsureTrailingDirectoryChar(Path.GetDirectoryName(this.package.Settings.DevEnvPath));
!
! string[][] properties = new string[][]
! {
! new string [] { WixProjectFileConstants.DevEnvDir, devEnvDir },
! new string [] { WixProjectFileConstants.SolutionPath, solutionPath },
! new string [] { WixProjectFileConstants.SolutionDir, WixHelperMethods.EnsureTrailingDirectoryChar(Path.GetDirectoryName(solutionPath)) },
! new string [] { WixProjectFileConstants.SolutionExt, Path.GetExtension(solutionPath) },
! new string [] { WixProjectFileConstants.SolutionFileName, Path.GetFileName(solutionPath) },
! new string [] { WixProjectFileConstants.SolutionName,Path.GetFileNameWithoutExtension(solutionPath) },
! };
!
! foreach (string[] property in properties)
! {
! string propertyName = property[0];
! string propertyValue = property[1];
!
! this.BuildEngine.GlobalProperties.SetProperty(propertyName, propertyValue);
}
}

Index: WixProjectFileConstants.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixProjectFileConstants.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WixProjectFileConstants.cs 13 Sep 2006 08:13:31 -0000 1.1
--- WixProjectFileConstants.cs 27 Jun 2007 05:38:50 -0000 1.2
***************
*** 24,27 ****
--- 24,28 ----
/// Contains constants for MSBuild .wixproj files.
///
+ // Keep these in alphabetical order for easy referencing.
internal static class WixProjectFileConstants
{
***************
*** 34,37 ****
--- 35,39 ----
public const string Cultures = "Cultures";
public const string DefineConstants = "DefineConstants";
+ public const string DevEnvDir = "DevEnvDir";
public const string IncludeSearchPaths = "IncludeSearchPaths";
public const string IntermediateOutputPath = "IntermediateOutputPath";
***************
*** 56,62 ****
--- 58,72 ----
public const string OutputType = "OutputType";
public const string Pedantic = "Pedantic";
+ public const string PostBuildEvent = "PostBuildEvent";
+ public const string PreBuildEvent = "PreBuildEvent";
public const string ReuseCabinetCache = "ReuseCabinetCache";
+ public const string RunPostBuildEvent = "RunPostBuildEvent";
public const string SetMsiAssemblyNameFileVersion = "SetMsiAssemblyNameFileVersion";
public const string ShowSourceTrace = "ShowSourceTrace";
+ public const string SolutionDir = "SolutionDir";
+ public const string SolutionExt = "SolutionExt";
+ public const string SolutionName = "SolutionName";
+ public const string SolutionFileName = "SolutionFileName";
+ public const string SolutionPath = "SolutionPath";
public const string SuppressAclReset = "SuppressAclReset";
public const string SuppressAllWarnings = "SuppressAllWarnings";
***************
*** 87,90 ****
--- 97,101 ----
public static class MsBuildTarget
{
+ public const string GetTargetPath = "GetTargetPath";
public const string ResolveWixLibraryReferences = "ResolveWixLibraryReferences";
}

Index: WixStrings.Designer.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixStrings.Designer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WixStrings.Designer.cs 4 Oct 2006 08:07:34 -0000 1.3
--- WixStrings.Designer.cs 27 Jun 2007 05:38:50 -0000 1.4
***************
*** 2,6 ****
//
// This code was generated by a tool.
! // Runtime Version:2.0.50727.42
//
// Changes to this file may cause incorrect behavior and will be lost if
--- 2,6 ----
//
// This code was generated by a tool.
! // Runtime Version:2.0.50727.312
//
// Changes to this file may cause incorrect behavior and will be lost if
***************
*** 150,153 ****
--- 150,160 ----
}

+ internal static System.Drawing.Icon MacroIcon {
+ get {
+ object obj = ResourceManager.GetObject("MacroIcon", resourceCulture);
+ return ((System.Drawing.Icon)(obj));
+ }
+ }
+
///
/// Looks up a localized string similar to Windows Installer XML.
***************
*** 187,195 ****

///
! /// Looks up a localized string similar to Votive 2005
! ///Windows Installer XML (WiX) Toolset, Version 3.0
! ///Primary Contributor: Justin Rockwood
! ///Additional Contributors: Bob Arnson
! ///Copyright В© Microsoft Corporation. All rights reserved..
///
internal static string ProductDetails {
--- 194,202 ----

///
! /// Looks up a localized string similar to Votive 2005 - Windows Installer XML (WiX) Toolset, Version {0}
! ///Copyright В© Microsoft Corporation. All rights reserved.
! ///Core WiX Team: Aaron Stebner, Bob Arnson, Fredrik Grohn, Joe Abbott, Justin Rockwood, Mike Holcomb, Peter Marcu, Rob Mensching, Scott Kurtzeborn
! ///Emeritus Members: Derek Cicerone, Reid Gustin, Robert Flaming
! ///Additional Contributors: Adam Stritzel, John Lyon-Smith.
///
internal static string ProductDetails {
***************
*** 216,219 ****
--- 223,235 ----

///
+ /// Looks up a localized string similar to Build Events.
+ ///
+ internal static string WixBuildEventsPropertyPageName {
+ get {
+ return ResourceManager.GetString("WixBuildEventsPropertyPageName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to General.
///

Index: WixPackageSettings.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixPackageSettings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WixPackageSettings.cs 13 Sep 2006 08:13:31 -0000 1.1
--- WixPackageSettings.cs 27 Jun 2007 05:38:50 -0000 1.2
***************
*** 21,24 ****
--- 21,25 ----
using System;
using System.Globalization;
+ using System.Security.AccessControl;
using Microsoft.VisualStudio;
using Microsoft.VisualStudio.Shell.Interop;
***************
*** 37,43 ****
private static readonly Version DefaultVersion = new Version(8, 0, 50727, 42);

! private const string MachineSettingsRegKey = @"InstalledProducts\WiX";
! private const string VisualStudioVersionRegKey = @"Setup\VS\BuildNumber";
!
private string machineRootPath;
private string visualStudioRegistryRoot;
--- 38,42 ----
private static readonly Version DefaultVersion = new Version(8, 0, 50727, 42);

! private string devEnvPath;
private string machineRootPath;
private string visualStudioRegistryRoot;
***************
*** 61,65 ****
ErrorHandler.ThrowOnFailure(localRegistry.GetLocalRegistryRoot(out this.visualStudioRegistryRoot));

! this.machineRootPath = WixHelperMethods.RegistryPathCombine(this.visualStudioRegistryRoot, MachineSettingsRegKey);

// initialize all of the machine settings
--- 60,64 ----
ErrorHandler.ThrowOnFailure(localRegistry.GetLocalRegistryRoot(out this.visualStudioRegistryRoot));

! this.machineRootPath = WixHelperMethods.RegistryPathCombine(this.visualStudioRegistryRoot, @"InstalledProducts\WiX");

// initialize all of the machine settings
***************
*** 80,83 ****
--- 79,102 ----

///
+ /// Gets the absolute path to the devenv.exe that we're currently running in.
+ ///
+ public string DevEnvPath
+ {
+ get
+ {
+ if (this.devEnvPath == null)
+ {
+ string regPath = WixHelperMethods.RegistryPathCombine(this.visualStudioRegistryRoot, @"Setup\VS");
+ using (RegistryKey regKey = Registry.LocalMachine.OpenSubKey(regPath, RegistryKeyPermissionCheck.ReadSubTree, RegistryRights.ReadKey))
+ {
+ this.devEnvPath = regKey.GetValue("EnvironmentPath", String.Empty) as string;
+ }
+ }
+
+ return this.devEnvPath;
+ }
+ }
+
+ ///
/// Gets the version of the currently running instance of Visual Studio.
///
***************
*** 88,93 ****
if (this.visualStudioVersion == null)
{
! string regPath = WixHelperMethods.RegistryPathCombine(this.visualStudioRegistryRoot, VisualStudioVersionRegKey);
! using (RegistryKey regKey = Registry.LocalMachine.OpenSubKey(regPath, false))
{
string lcid = CultureInfo.CurrentUICulture.LCID.ToString();
--- 107,112 ----
if (this.visualStudioVersion == null)
{
! string regPath = WixHelperMethods.RegistryPathCombine(this.visualStudioRegistryRoot, @"Setup\VS\BuildNumber");
! using (RegistryKey regKey = Registry.LocalMachine.OpenSubKey(regPath, RegistryKeyPermissionCheck.ReadSubTree, RegistryRights.ReadKey))
{
string lcid = CultureInfo.CurrentUICulture.LCID.ToString();
***************
*** 112,115 ****
--- 131,135 ----
}
}
+
return this.visualStudioVersion;
}

Index: votive.csproj
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/votive.csproj,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** votive.csproj 2 Mar 2007 12:22:39 -0000 1.4
--- votive.csproj 27 Jun 2007 05:38:50 -0000 1.5
***************
*** 11,35 ****
votive
true
- //depot/Dev/wix/src/Votive
- ..
-
-
- MSSCCI:Source Depot


DEBUG;TRACE;CCI_TRACING;Enable_CCIDiagnostics;Enable_CCIFileOutput
-
-
false
-
-
true
-
-


TRACE
-
-


--- 11,22 ----
***************
*** 43,46 ****
--- 30,42 ----
Component

+
+ UserControl
+
+
+ WixBuildEventEditor.cs
+
+
+ Component
+

Component
***************
*** 49,52 ****
--- 45,54 ----
Component

+
+ Form
+
+
+ WixBuildEventEditorForm.cs
+

Form
***************
*** 61,64 ****
--- 63,73 ----
WixLinkerAdvancedSettingsForm.cs

+
+
+ UserControl
+
+
+ WixBuildEventsPropertyPagePanel.cs
+


***************
*** 96,99 ****
--- 105,110 ----
WixPropertyPagePanel.cs

+
+


***************
*** 126,129 ****
--- 137,141 ----


+


***************
*** 152,155 ****
--- 164,175 ----
Designer

+
+ WixBuildEventEditor.cs
+ Designer
+
+
+ WixBuildEventEditorForm.cs
+ Designer
+

WixCompilerAdvancedSettingsForm.cs
***************
*** 160,163 ****
--- 180,187 ----
Designer

+
+ WixBuildEventsPropertyPagePanel.cs
+ Designer
+

WixBuildPropertyPagePanel.cs
***************
*** 186,189 ****
--- 210,214 ----


+



Index: WixStrings.resx
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixStrings.resx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WixStrings.resx 4 Oct 2006 08:07:34 -0000 1.3
--- WixStrings.resx 27 Jun 2007 05:38:50 -0000 1.4
***************
*** 157,160 ****
--- 157,163 ----
Resources\Logo.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a

+
+ Resources\Macro.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+

Windows Installer XML
***************
*** 174,182 ****


! Votive 2005
! Windows Installer XML (WiX) Toolset, Version 3.0
! Primary Contributor: Justin Rockwood
! Additional Contributors: Bob Arnson
! Copyright В© Microsoft Corporation. All rights reserved.
Shown in the Help/About dialog

--- 177,185 ----


! Votive 2005 - Windows Installer XML (WiX) Toolset, Version {0}
! Copyright В© Microsoft Corporation. All rights reserved.
! Core WiX Team: Aaron Stebner, Bob Arnson, Fredrik Grohn, Joe Abbott, Justin Rockwood, Mike Holcomb, Peter Marcu, Rob Mensching, Scott Kurtzeborn
! Emeritus Members: Derek Cicerone, Reid Gustin, Robert Flaming
! Additional Contributors: Adam Stritzel, John Lyon-Smith
Shown in the Help/About dialog

***************
*** 188,191 ****
--- 191,198 ----
Resources\UpArrow.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a

+
+ Build Events
+ Name for the build events property page
+

General

--- NEW FILE: RunPostBuildEvent.cs ---
//--------------------------------------------------------------------------------------------------
//
// Copyright (c) Microsoft Corporation. All rights reserved.
//
// The use and distribution terms for this software are covered by the
// Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
// which can be found in the file CPL.TXT at the root of this distribution.
// By using this software in any fashion, you are agreeing to be bound by
// the terms of this license.
//
// You must not remove this notice, or any other, from this software.
//
//
//
// Contains the RunPostBuildEvent class.
//
//--------------------------------------------------------------------------------------------------

namespace Microsoft.Tools.WindowsInstallerXml.VisualStudio
{
using System;

///
/// Enumerates the values of the RunPostBuildEvent MSBuild property.
///
public enum RunPostBuildEvent
{
///
/// The post-build event is always run.
///
Always,

///
/// The post-build event is only run when the build succeeds.
///
OnBuildSuccess,

///
/// The post-build event is only run if the project's output is updated.
///
OnOutputUpdated,
}
}

Index: WixHelperMethods.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/votive/WixHelperMethods.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WixHelperMethods.cs 13 Sep 2006 08:13:30 -0000 1.1
--- WixHelperMethods.cs 27 Jun 2007 05:38:50 -0000 1.2
***************
*** 21,24 ****
--- 21,25 ----
using System;
using System.Diagnostics;
+ using System.IO;
using System.Globalization;
using System.Text;
***************
*** 33,36 ****
--- 34,47 ----

///
+ /// Adds the character to the end of the path if it doesn't already exist at the end.
+ ///
+ /// The string to add the trailing directory separator character to.
+ /// The original string with the specified character at the end.
+ public static string EnsureTrailingDirectoryChar(string path)
+ {
+ return EnsureTrailingChar(path, Path.DirectorySeparatorChar);
+ }
+
+ ///
/// Adds the specified character to the end of the string if it doesn't already exist at the end.
///




------------------------------

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

------------------------------

_______________________________________________
Wix-commits mailing list

https://lists.sourceforge.net/lists/listinfo/wix-commits


End of Wix-commits Digest, Vol 11, Issue 51
*******************************************

2007 27 июня