Merge lp:~mandel/ubuntuone-windows-installer/add_wix into lp:ubuntuone-windows-installer/beta

Proposed by Manuel de la Peña
Status: Merged
Approved by: Stuart Colville
Approved revision: 17
Merged at revision: 35
Proposed branch: lp:~mandel/ubuntuone-windows-installer/add_wix
Merge into: lp:ubuntuone-windows-installer/beta
Prerequisite: lp:~mandel/ubuntuone-windows-installer/fix_nant_warnings
Diff against target: 377 lines (+206/-5)
13 files modified
main.build (+2/-5)
tools/Wix/CPL.TXT (+94/-0)
tools/Wix/bin/candle.exe.config (+9/-0)
tools/Wix/bin/ct.exe.config (+9/-0)
tools/Wix/bin/ctui.exe.config (+12/-0)
tools/Wix/bin/dark.exe.config (+12/-0)
tools/Wix/bin/heat.exe.config (+12/-0)
tools/Wix/bin/light.exe.config (+9/-0)
tools/Wix/bin/lit.exe.config (+9/-0)
tools/Wix/bin/melt.exe.config (+11/-0)
tools/Wix/bin/pyro.exe.config (+9/-0)
tools/Wix/bin/smoke.exe.config (+9/-0)
tools/Wix/bin/torch.exe.config (+9/-0)
To merge this branch: bzr merge lp:~mandel/ubuntuone-windows-installer/add_wix
Reviewer Review Type Date Requested Status
Stuart Colville (community) Approve
Vincenzo Di Somma (community) Approve
Review via email: mp+30281@code.launchpad.net

Description of the change

Adds wix to bzr so wix does not have to be installed in the system to be able to build the project.

To post a comment you must log in.
Revision history for this message
Vincenzo Di Somma (vds) wrote :

As usual, tests pass -> build -> install -> uninstall...

review: Approve
Revision history for this message
Stuart Colville (muffinresearch) wrote :

Works as expected after removing installed WIX.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'main.build'
2--- main.build 2010-07-19 14:29:43 +0000
3+++ main.build 2010-07-19 14:29:43 +0000
4@@ -3,9 +3,6 @@
5 <!-- the enviroment property allows to select which enviroment we are compiling to -->
6 <property name="enviroment" value="debug" />
7
8- <!-- Please provide the path where the Wix binaries are located. -->
9- <property name="wix_path" value="C:\Program Files\Windows Installer XML v3\bin" />
10-
11 <target name="clean"
12 description="Removes all the different results of the last comilation if they exist">
13 <!-- delete all the different results from the previous build -->
14@@ -146,14 +143,14 @@
15 depends="build">
16
17 <!-- wix compiler -->
18- <exec basedir="${wix_path}"
19+ <exec basedir="tools/Wix/bin"
20 managed="true"
21 workingdir="install"
22 program="candle.exe"
23 commandline=" UbuntuOne.wxs"/>
24
25 <!-- wix linker -->
26- <exec basedir="${wix_path}"
27+ <exec basedir="tools/Wix/bin"
28 managed="true"
29 workingdir="install"
30 program="light.exe"
31
32=== added directory 'tools/Wix'
33=== added file 'tools/Wix/CPL.TXT'
34--- tools/Wix/CPL.TXT 1970-01-01 00:00:00 +0000
35+++ tools/Wix/CPL.TXT 2010-07-19 14:29:43 +0000
36@@ -0,0 +1,94 @@
37+Common Public License Version 1.0
38+
39+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
40+
41+
42+1. DEFINITIONS
43+
44+"Contribution" means:
45+
46+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
47+
48+b) in the case of each subsequent Contributor:
49+
50+i) changes to the Program, and
51+
52+ii) additions to the Program;
53+
54+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
55+
56+"Contributor" means any person or entity that distributes the Program.
57+
58+"Licensed Patents " mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
59+
60+"Program" means the Contributions distributed in accordance with this Agreement.
61+
62+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
63+
64+
65+2. GRANT OF RIGHTS
66+
67+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
68+
69+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
70+
71+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
72+
73+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
74+
75+
76+3. REQUIREMENTS
77+
78+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
79+
80+a) it complies with the terms and conditions of this Agreement; and
81+
82+b) its license agreement:
83+
84+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
85+
86+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
87+
88+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
89+
90+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
91+
92+When the Program is made available in source code form:
93+
94+a) it must be made available under this Agreement; and
95+
96+b) a copy of this Agreement must be included with each copy of the Program.
97+
98+Contributors may not remove or alter any copyright notices contained within the Program.
99+
100+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
101+
102+
103+4. COMMERCIAL DISTRIBUTION
104+
105+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
106+
107+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
108+
109+
110+5. NO WARRANTY
111+
112+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement, including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
113+
114+
115+6. DISCLAIMER OF LIABILITY
116+
117+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
118+
119+
120+7. GENERAL
121+
122+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
123+
124+If Recipient institutes patent litigation against a Contributor with respect to a patent applicable to software (including a cross-claim or counterclaim in a lawsuit), then any patent licenses granted by that Contributor to such Recipient under this Agreement shall terminate as of the date such litigation is filed. In addition, if Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
125+
126+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
127+
128+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. IBM is the initial Agreement Steward. IBM may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
129+
130+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
131
132=== added directory 'tools/Wix/bin'
133=== added file 'tools/Wix/bin/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll'
134Binary files tools/Wix/bin/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/Microsoft.Tools.WindowsInstallerXml.NAntTasks.dll 2010-07-19 14:29:43 +0000 differ
135=== added file 'tools/Wix/bin/SetupBuilder.dll'
136Binary files tools/Wix/bin/SetupBuilder.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/SetupBuilder.dll 2010-07-19 14:29:43 +0000 differ
137=== added file 'tools/Wix/bin/WixComPlusExtension.dll'
138Binary files tools/Wix/bin/WixComPlusExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixComPlusExtension.dll 2010-07-19 14:29:43 +0000 differ
139=== added file 'tools/Wix/bin/WixCop.exe'
140Binary files tools/Wix/bin/WixCop.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixCop.exe 2010-07-19 14:29:43 +0000 differ
141=== added file 'tools/Wix/bin/WixDifxAppExtension.dll'
142Binary files tools/Wix/bin/WixDifxAppExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixDifxAppExtension.dll 2010-07-19 14:29:43 +0000 differ
143=== added file 'tools/Wix/bin/WixDirectXExtension.dll'
144Binary files tools/Wix/bin/WixDirectXExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixDirectXExtension.dll 2010-07-19 14:29:43 +0000 differ
145=== added file 'tools/Wix/bin/WixFirewallExtension.dll'
146Binary files tools/Wix/bin/WixFirewallExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixFirewallExtension.dll 2010-07-19 14:29:43 +0000 differ
147=== added file 'tools/Wix/bin/WixGamingExtension.dll'
148Binary files tools/Wix/bin/WixGamingExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixGamingExtension.dll 2010-07-19 14:29:43 +0000 differ
149=== added file 'tools/Wix/bin/WixIIsExtension.dll'
150Binary files tools/Wix/bin/WixIIsExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixIIsExtension.dll 2010-07-19 14:29:43 +0000 differ
151=== added file 'tools/Wix/bin/WixIsolatedAppExtension.dll'
152Binary files tools/Wix/bin/WixIsolatedAppExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixIsolatedAppExtension.dll 2010-07-19 14:29:43 +0000 differ
153=== added file 'tools/Wix/bin/WixMsmqExtension.dll'
154Binary files tools/Wix/bin/WixMsmqExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixMsmqExtension.dll 2010-07-19 14:29:43 +0000 differ
155=== added file 'tools/Wix/bin/WixNetFxExtension.dll'
156Binary files tools/Wix/bin/WixNetFxExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixNetFxExtension.dll 2010-07-19 14:29:43 +0000 differ
157=== added file 'tools/Wix/bin/WixOfficeExtension.dll'
158Binary files tools/Wix/bin/WixOfficeExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixOfficeExtension.dll 2010-07-19 14:29:43 +0000 differ
159=== added file 'tools/Wix/bin/WixPSExtension.dll'
160Binary files tools/Wix/bin/WixPSExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixPSExtension.dll 2010-07-19 14:29:43 +0000 differ
161=== added file 'tools/Wix/bin/WixSqlExtension.dll'
162Binary files tools/Wix/bin/WixSqlExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixSqlExtension.dll 2010-07-19 14:29:43 +0000 differ
163=== added file 'tools/Wix/bin/WixUIExtension.dll'
164Binary files tools/Wix/bin/WixUIExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixUIExtension.dll 2010-07-19 14:29:43 +0000 differ
165=== added file 'tools/Wix/bin/WixUtilExtension.dll'
166Binary files tools/Wix/bin/WixUtilExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixUtilExtension.dll 2010-07-19 14:29:43 +0000 differ
167=== added file 'tools/Wix/bin/WixVSExtension.dll'
168Binary files tools/Wix/bin/WixVSExtension.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/WixVSExtension.dll 2010-07-19 14:29:43 +0000 differ
169=== added file 'tools/Wix/bin/candle.exe'
170Binary files tools/Wix/bin/candle.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/candle.exe 2010-07-19 14:29:43 +0000 differ
171=== added file 'tools/Wix/bin/candle.exe.config'
172--- tools/Wix/bin/candle.exe.config 1970-01-01 00:00:00 +0000
173+++ tools/Wix/bin/candle.exe.config 2010-07-19 14:29:43 +0000
174@@ -0,0 +1,9 @@
175+<?xml version="1.0" encoding="utf-8"?>
176+<!--
177+ Copyright (c) Microsoft Corporation. All rights reserved.
178+-->
179+<configuration>
180+ <startup>
181+ <supportedRuntime version="v2.0.50727" />
182+ </startup>
183+</configuration>
184
185=== added file 'tools/Wix/bin/ct.exe'
186Binary files tools/Wix/bin/ct.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/ct.exe 2010-07-19 14:29:43 +0000 differ
187=== added file 'tools/Wix/bin/ct.exe.config'
188--- tools/Wix/bin/ct.exe.config 1970-01-01 00:00:00 +0000
189+++ tools/Wix/bin/ct.exe.config 2010-07-19 14:29:43 +0000
190@@ -0,0 +1,9 @@
191+<?xml version="1.0" encoding="utf-8"?>
192+<!--
193+ Copyright (c) Microsoft Corporation. All rights reserved.
194+-->
195+<configuration>
196+ <startup>
197+ <supportedRuntime version="v2.0.50727" />
198+ </startup>
199+</configuration>
200
201=== added file 'tools/Wix/bin/ctui.exe'
202Binary files tools/Wix/bin/ctui.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/ctui.exe 2010-07-19 14:29:43 +0000 differ
203=== added file 'tools/Wix/bin/ctui.exe.config'
204--- tools/Wix/bin/ctui.exe.config 1970-01-01 00:00:00 +0000
205+++ tools/Wix/bin/ctui.exe.config 2010-07-19 14:29:43 +0000
206@@ -0,0 +1,12 @@
207+<?xml version="1.0" encoding="utf-8"?>
208+<!--
209+ Copyright (c) Microsoft Corporation. All rights reserved.
210+-->
211+<configuration>
212+ <appSettings>
213+ <add key="extensions" value="WixIsolatedAppExtension;WixOfficeExtension"/>
214+ </appSettings>
215+ <startup>
216+ <supportedRuntime version="v2.0.50727" />
217+ </startup>
218+</configuration>
219
220=== added file 'tools/Wix/bin/darice.cub'
221Binary files tools/Wix/bin/darice.cub 1970-01-01 00:00:00 +0000 and tools/Wix/bin/darice.cub 2010-07-19 14:29:43 +0000 differ
222=== added file 'tools/Wix/bin/dark.exe'
223Binary files tools/Wix/bin/dark.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/dark.exe 2010-07-19 14:29:43 +0000 differ
224=== added file 'tools/Wix/bin/dark.exe.config'
225--- tools/Wix/bin/dark.exe.config 1970-01-01 00:00:00 +0000
226+++ tools/Wix/bin/dark.exe.config 2010-07-19 14:29:43 +0000
227@@ -0,0 +1,12 @@
228+<?xml version="1.0" encoding="utf-8"?>
229+<!--
230+ Copyright (c) Microsoft Corporation. All rights reserved.
231+-->
232+<configuration>
233+ <appSettings>
234+ <add key="extensions" value="WixDifxAppExtension;WixDirectXExtension;WixFirewallExtension;WixGamingExtension;WixIIsExtension;WixNetFxExtension;WixSqlExtension;WixUIExtension;WixUtilExtension;WixVSExtension" />
235+ </appSettings>
236+ <startup>
237+ <supportedRuntime version="v2.0.50727" />
238+ </startup>
239+</configuration>
240
241=== added file 'tools/Wix/bin/difxapp_x64.wixlib'
242Binary files tools/Wix/bin/difxapp_x64.wixlib 1970-01-01 00:00:00 +0000 and tools/Wix/bin/difxapp_x64.wixlib 2010-07-19 14:29:43 +0000 differ
243=== added file 'tools/Wix/bin/difxapp_x86.wixlib'
244Binary files tools/Wix/bin/difxapp_x86.wixlib 1970-01-01 00:00:00 +0000 and tools/Wix/bin/difxapp_x86.wixlib 2010-07-19 14:29:43 +0000 differ
245=== added file 'tools/Wix/bin/heat.exe'
246Binary files tools/Wix/bin/heat.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/heat.exe 2010-07-19 14:29:43 +0000 differ
247=== added file 'tools/Wix/bin/heat.exe.config'
248--- tools/Wix/bin/heat.exe.config 1970-01-01 00:00:00 +0000
249+++ tools/Wix/bin/heat.exe.config 2010-07-19 14:29:43 +0000
250@@ -0,0 +1,12 @@
251+<?xml version="1.0" encoding="utf-8"?>
252+<!--
253+ Copyright (c) Microsoft Corporation. All rights reserved.
254+-->
255+<configuration>
256+ <appSettings>
257+ <add key="extensions" value="WixIIsExtension;WixUtilExtension;WixVSExtension"/>
258+ </appSettings>
259+ <startup>
260+ <supportedRuntime version="v2.0.50727" />
261+ </startup>
262+</configuration>
263
264=== added file 'tools/Wix/bin/light.exe'
265Binary files tools/Wix/bin/light.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/light.exe 2010-07-19 14:29:43 +0000 differ
266=== added file 'tools/Wix/bin/light.exe.config'
267--- tools/Wix/bin/light.exe.config 1970-01-01 00:00:00 +0000
268+++ tools/Wix/bin/light.exe.config 2010-07-19 14:29:43 +0000
269@@ -0,0 +1,9 @@
270+<?xml version="1.0" encoding="utf-8"?>
271+<!--
272+ Copyright (c) Microsoft Corporation. All rights reserved.
273+-->
274+<configuration>
275+ <startup>
276+ <supportedRuntime version="v2.0.50727" />
277+ </startup>
278+</configuration>
279
280=== added file 'tools/Wix/bin/lit.exe'
281Binary files tools/Wix/bin/lit.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/lit.exe 2010-07-19 14:29:43 +0000 differ
282=== added file 'tools/Wix/bin/lit.exe.config'
283--- tools/Wix/bin/lit.exe.config 1970-01-01 00:00:00 +0000
284+++ tools/Wix/bin/lit.exe.config 2010-07-19 14:29:43 +0000
285@@ -0,0 +1,9 @@
286+<?xml version="1.0" encoding="utf-8"?>
287+<!--
288+ Copyright (c) Microsoft Corporation. All rights reserved.
289+-->
290+<configuration>
291+ <startup>
292+ <supportedRuntime version="v2.0.50727" />
293+ </startup>
294+</configuration>
295
296=== added file 'tools/Wix/bin/melt.exe'
297Binary files tools/Wix/bin/melt.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/melt.exe 2010-07-19 14:29:43 +0000 differ
298=== added file 'tools/Wix/bin/melt.exe.config'
299--- tools/Wix/bin/melt.exe.config 1970-01-01 00:00:00 +0000
300+++ tools/Wix/bin/melt.exe.config 2010-07-19 14:29:43 +0000
301@@ -0,0 +1,11 @@
302+<?xml version="1.0" encoding="utf-8"?>
303+<!--
304+ Copyright (c) Microsoft Corporation. All rights reserved.
305+-->
306+<configuration>
307+ <appSettings>
308+ </appSettings>
309+ <startup>
310+ <supportedRuntime version="v2.0.50727" />
311+ </startup>
312+</configuration>
313
314=== added file 'tools/Wix/bin/mergemod.cub'
315Binary files tools/Wix/bin/mergemod.cub 1970-01-01 00:00:00 +0000 and tools/Wix/bin/mergemod.cub 2010-07-19 14:29:43 +0000 differ
316=== added file 'tools/Wix/bin/mergemod.dll'
317Binary files tools/Wix/bin/mergemod.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/mergemod.dll 2010-07-19 14:29:43 +0000 differ
318=== added file 'tools/Wix/bin/mspatchc.dll'
319Binary files tools/Wix/bin/mspatchc.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/mspatchc.dll 2010-07-19 14:29:43 +0000 differ
320=== added file 'tools/Wix/bin/pyro.exe'
321Binary files tools/Wix/bin/pyro.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/pyro.exe 2010-07-19 14:29:43 +0000 differ
322=== added file 'tools/Wix/bin/pyro.exe.config'
323--- tools/Wix/bin/pyro.exe.config 1970-01-01 00:00:00 +0000
324+++ tools/Wix/bin/pyro.exe.config 2010-07-19 14:29:43 +0000
325@@ -0,0 +1,9 @@
326+<?xml version="1.0" encoding="utf-8"?>
327+<!--
328+ Copyright (c) Microsoft Corporation. All rights reserved.
329+-->
330+<configuration>
331+ <startup>
332+ <supportedRuntime version="v2.0.50727" />
333+ </startup>
334+</configuration>
335
336=== added file 'tools/Wix/bin/setupbld.exe'
337Binary files tools/Wix/bin/setupbld.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/setupbld.exe 2010-07-19 14:29:43 +0000 differ
338=== added file 'tools/Wix/bin/smoke.exe'
339Binary files tools/Wix/bin/smoke.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/smoke.exe 2010-07-19 14:29:43 +0000 differ
340=== added file 'tools/Wix/bin/smoke.exe.config'
341--- tools/Wix/bin/smoke.exe.config 1970-01-01 00:00:00 +0000
342+++ tools/Wix/bin/smoke.exe.config 2010-07-19 14:29:43 +0000
343@@ -0,0 +1,9 @@
344+<?xml version="1.0" encoding="utf-8"?>
345+<!--
346+ Copyright (c) Microsoft Corporation. All rights reserved.
347+-->
348+<configuration>
349+ <startup>
350+ <supportedRuntime version="v2.0.50727" />
351+ </startup>
352+</configuration>
353
354=== added file 'tools/Wix/bin/torch.exe'
355Binary files tools/Wix/bin/torch.exe 1970-01-01 00:00:00 +0000 and tools/Wix/bin/torch.exe 2010-07-19 14:29:43 +0000 differ
356=== added file 'tools/Wix/bin/torch.exe.config'
357--- tools/Wix/bin/torch.exe.config 1970-01-01 00:00:00 +0000
358+++ tools/Wix/bin/torch.exe.config 2010-07-19 14:29:43 +0000
359@@ -0,0 +1,9 @@
360+<?xml version="1.0" encoding="utf-8"?>
361+<!--
362+ Copyright (c) Microsoft Corporation. All rights reserved.
363+-->
364+<configuration>
365+ <startup>
366+ <supportedRuntime version="v2.0.50727" />
367+ </startup>
368+</configuration>
369
370=== added file 'tools/Wix/bin/wconsole.dll'
371Binary files tools/Wix/bin/wconsole.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/wconsole.dll 2010-07-19 14:29:43 +0000 differ
372=== added file 'tools/Wix/bin/winterop.dll'
373Binary files tools/Wix/bin/winterop.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/winterop.dll 2010-07-19 14:29:43 +0000 differ
374=== added file 'tools/Wix/bin/wix.dll'
375Binary files tools/Wix/bin/wix.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/wix.dll 2010-07-19 14:29:43 +0000 differ
376=== added file 'tools/Wix/bin/wui.dll'
377Binary files tools/Wix/bin/wui.dll 1970-01-01 00:00:00 +0000 and tools/Wix/bin/wui.dll 2010-07-19 14:29:43 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: