diff options
13 files changed, 8 insertions, 27 deletions
diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 97ac68a7..18b4727f 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | |||
@@ -26,7 +26,6 @@ namespace WixToolsetTest.Bal | |||
26 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 26 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
27 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 27 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
28 | "-intermediateFolder", intermediateFolder, | 28 | "-intermediateFolder", intermediateFolder, |
29 | "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), | ||
30 | "-o", bundleFile, | 29 | "-o", bundleFile, |
31 | }); | 30 | }); |
32 | compileResult.AssertSuccess(); | 31 | compileResult.AssertSuccess(); |
@@ -52,7 +51,6 @@ namespace WixToolsetTest.Bal | |||
52 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 51 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
53 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), | 52 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), |
54 | "-intermediateFolder", intermediateFolder, | 53 | "-intermediateFolder", intermediateFolder, |
55 | "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), | ||
56 | "-o", bundleFile, | 54 | "-o", bundleFile, |
57 | }); | 55 | }); |
58 | Assert.Equal(6802, compileResult.ExitCode); | 56 | Assert.Equal(6802, compileResult.ExitCode); |
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 45bb25d1..82b0434d 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs | |||
@@ -6,7 +6,7 @@ | |||
6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> | 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" /> |
7 | </BootstrapperApplicationRef> | 7 | </BootstrapperApplicationRef> |
8 | <Chain> | 8 | <Chain> |
9 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.x86.exe" /> | 9 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" /> |
10 | </Chain> | 10 | </Chain> |
11 | </Bundle> | 11 | </Bundle> |
12 | </Wix> | 12 | </Wix> |
diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 19c86839..f970c2c8 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | |||
@@ -25,7 +25,6 @@ | |||
25 | </ItemGroup> | 25 | </ItemGroup> |
26 | 26 | ||
27 | <ItemGroup> | 27 | <ItemGroup> |
28 | <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" /> | ||
29 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> | 28 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
30 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 29 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
31 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 30 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index f33709ab..a2a9a107 100644 --- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs | |||
@@ -28,7 +28,6 @@ namespace WixToolsetTest.ManagedHost | |||
28 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 28 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
29 | "-intermediateFolder", intermediateFolder, | 29 | "-intermediateFolder", intermediateFolder, |
30 | "-bindpath", baSourceFolder, | 30 | "-bindpath", baSourceFolder, |
31 | "-burnStub", TestEngine.BurnStubFile, | ||
32 | "-o", bundleFile, | 31 | "-o", bundleFile, |
33 | }); | 32 | }); |
34 | compileResult.AssertSuccess(); | 33 | compileResult.AssertSuccess(); |
@@ -63,7 +62,6 @@ namespace WixToolsetTest.ManagedHost | |||
63 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 62 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
64 | "-intermediateFolder", intermediateFolder, | 63 | "-intermediateFolder", intermediateFolder, |
65 | "-bindpath", baSourceFolder, | 64 | "-bindpath", baSourceFolder, |
66 | "-burnStub", TestEngine.BurnStubFile, | ||
67 | "-o", bundleFile, | 65 | "-o", bundleFile, |
68 | }); | 66 | }); |
69 | compileResult.AssertSuccess(); | 67 | compileResult.AssertSuccess(); |
@@ -98,7 +96,6 @@ namespace WixToolsetTest.ManagedHost | |||
98 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 96 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
99 | "-intermediateFolder", intermediateFolder, | 97 | "-intermediateFolder", intermediateFolder, |
100 | "-bindpath", baSourceFolder, | 98 | "-bindpath", baSourceFolder, |
101 | "-burnStub", TestEngine.BurnStubFile, | ||
102 | "-o", bundleFile, | 99 | "-o", bundleFile, |
103 | }); | 100 | }); |
104 | compileResult.AssertSuccess(); | 101 | compileResult.AssertSuccess(); |
@@ -133,7 +130,6 @@ namespace WixToolsetTest.ManagedHost | |||
133 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 130 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
134 | "-intermediateFolder", intermediateFolder, | 131 | "-intermediateFolder", intermediateFolder, |
135 | "-bindpath", baSourceFolder, | 132 | "-bindpath", baSourceFolder, |
136 | "-burnStub", TestEngine.BurnStubFile, | ||
137 | "-o", bundleFile, | 133 | "-o", bundleFile, |
138 | }); | 134 | }); |
139 | compileResult.AssertSuccess(); | 135 | compileResult.AssertSuccess(); |
@@ -172,7 +168,6 @@ namespace WixToolsetTest.ManagedHost | |||
172 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 168 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
173 | "-intermediateFolder", intermediateFolder, | 169 | "-intermediateFolder", intermediateFolder, |
174 | "-bindpath", baSourceFolder, | 170 | "-bindpath", baSourceFolder, |
175 | "-burnStub", TestEngine.BurnStubFile, | ||
176 | "-o", bundleFile, | 171 | "-o", bundleFile, |
177 | }); | 172 | }); |
178 | compileResult.AssertSuccess(); | 173 | compileResult.AssertSuccess(); |
@@ -206,7 +201,6 @@ namespace WixToolsetTest.ManagedHost | |||
206 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 201 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
207 | "-intermediateFolder", intermediateFolder, | 202 | "-intermediateFolder", intermediateFolder, |
208 | "-bindpath", baSourceFolder, | 203 | "-bindpath", baSourceFolder, |
209 | "-burnStub", TestEngine.BurnStubFile, | ||
210 | "-o", bundleFile, | 204 | "-o", bundleFile, |
211 | }); | 205 | }); |
212 | compileResult.AssertSuccess(); | 206 | compileResult.AssertSuccess(); |
@@ -246,7 +240,6 @@ namespace WixToolsetTest.ManagedHost | |||
246 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 240 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
247 | "-intermediateFolder", intermediateFolder, | 241 | "-intermediateFolder", intermediateFolder, |
248 | "-bindpath", baSourceFolder, | 242 | "-bindpath", baSourceFolder, |
249 | "-burnStub", TestEngine.BurnStubFile, | ||
250 | "-o", bundleFile, | 243 | "-o", bundleFile, |
251 | }); | 244 | }); |
252 | compileResult.AssertSuccess(); | 245 | compileResult.AssertSuccess(); |
@@ -281,7 +274,6 @@ namespace WixToolsetTest.ManagedHost | |||
281 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 274 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
282 | "-intermediateFolder", intermediateFolder, | 275 | "-intermediateFolder", intermediateFolder, |
283 | "-bindpath", baSourceFolder, | 276 | "-bindpath", baSourceFolder, |
284 | "-burnStub", TestEngine.BurnStubFile, | ||
285 | "-o", bundleFile, | 277 | "-o", bundleFile, |
286 | }); | 278 | }); |
287 | compileResult.AssertSuccess(); | 279 | compileResult.AssertSuccess(); |
@@ -316,7 +308,6 @@ namespace WixToolsetTest.ManagedHost | |||
316 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 308 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
317 | "-intermediateFolder", intermediateFolder, | 309 | "-intermediateFolder", intermediateFolder, |
318 | "-bindpath", baSourceFolder, | 310 | "-bindpath", baSourceFolder, |
319 | "-burnStub", TestEngine.BurnStubFile, | ||
320 | "-o", bundleFile, | 311 | "-o", bundleFile, |
321 | }); | 312 | }); |
322 | compileResult.AssertSuccess(); | 313 | compileResult.AssertSuccess(); |
@@ -355,7 +346,6 @@ namespace WixToolsetTest.ManagedHost | |||
355 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 346 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
356 | "-intermediateFolder", intermediateFolder, | 347 | "-intermediateFolder", intermediateFolder, |
357 | "-bindpath", baSourceFolder, | 348 | "-bindpath", baSourceFolder, |
358 | "-burnStub", TestEngine.BurnStubFile, | ||
359 | "-o", bundleFile, | 349 | "-o", bundleFile, |
360 | }); | 350 | }); |
361 | compileResult.AssertSuccess(); | 351 | compileResult.AssertSuccess(); |
diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs index 8b0a3691..45b3e9d0 100644 --- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs | |||
@@ -29,7 +29,6 @@ namespace WixToolsetTest.ManagedHost | |||
29 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), | 29 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), |
30 | "-intermediateFolder", intermediateFolder, | 30 | "-intermediateFolder", intermediateFolder, |
31 | "-bindpath", baSourceFolder, | 31 | "-bindpath", baSourceFolder, |
32 | "-burnStub", TestEngine.BurnStubFile, | ||
33 | "-o", bundleFile, | 32 | "-o", bundleFile, |
34 | }); | 33 | }); |
35 | compileResult.AssertSuccess(); | 34 | compileResult.AssertSuccess(); |
@@ -64,7 +63,6 @@ namespace WixToolsetTest.ManagedHost | |||
64 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), | 63 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), |
65 | "-intermediateFolder", intermediateFolder, | 64 | "-intermediateFolder", intermediateFolder, |
66 | "-bindpath", baSourceFolder, | 65 | "-bindpath", baSourceFolder, |
67 | "-burnStub", TestEngine.BurnStubFile, | ||
68 | "-o", bundleFile, | 66 | "-o", bundleFile, |
69 | }); | 67 | }); |
70 | compileResult.AssertSuccess(); | 68 | compileResult.AssertSuccess(); |
@@ -99,7 +97,6 @@ namespace WixToolsetTest.ManagedHost | |||
99 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), | 97 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), |
100 | "-intermediateFolder", intermediateFolder, | 98 | "-intermediateFolder", intermediateFolder, |
101 | "-bindpath", baSourceFolder, | 99 | "-bindpath", baSourceFolder, |
102 | "-burnStub", TestEngine.BurnStubFile, | ||
103 | "-o", bundleFile, | 100 | "-o", bundleFile, |
104 | }); | 101 | }); |
105 | compileResult.AssertSuccess(); | 102 | compileResult.AssertSuccess(); |
@@ -138,7 +135,6 @@ namespace WixToolsetTest.ManagedHost | |||
138 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), | 135 | "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), |
139 | "-intermediateFolder", intermediateFolder, | 136 | "-intermediateFolder", intermediateFolder, |
140 | "-bindpath", baSourceFolder, | 137 | "-bindpath", baSourceFolder, |
141 | "-burnStub", TestEngine.BurnStubFile, | ||
142 | "-o", bundleFile, | 138 | "-o", bundleFile, |
143 | }); | 139 | }); |
144 | compileResult.AssertSuccess(); | 140 | compileResult.AssertSuccess(); |
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs index bb8d56aa..6699b094 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs | |||
@@ -63,7 +63,7 @@ | |||
63 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> | 63 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> |
64 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' /> | 64 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' /> |
65 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' /> | 65 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' /> |
66 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore_x86_x86_4.700.19.57202.dll' Name='mscordaccore_x86_x86_4.700.19.57202.dll' /> | 66 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordaccore_x86_x86_4.700.20.6603.dll' Name='mscordaccore_x86_x86_4.700.20.6603.dll' /> |
67 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' /> | 67 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' /> |
68 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' /> | 68 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' /> |
69 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> | 69 | <Payload SourceFile='publish\Example.EarliestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> |
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs index 336eef4c..7eb56061 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs | |||
@@ -59,7 +59,7 @@ | |||
59 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' /> | 59 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' /> |
60 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> | 60 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> |
61 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' /> | 61 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' /> |
62 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.19.57202.dll' Name='mscordaccore_x86_x86_4.700.19.57202.dll' /> | 62 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.20.6603.dll' Name='mscordaccore_x86_x86_4.700.20.6603.dll' /> |
63 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' /> | 63 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' /> |
64 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> | 64 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> |
65 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' /> | 65 | <Payload SourceFile='publish\Example.EarliestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' /> |
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs index 09433669..35373631 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs | |||
@@ -63,7 +63,7 @@ | |||
63 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> | 63 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> |
64 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' /> | 64 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\Microsoft.Win32.Registry.dll' Name='Microsoft.Win32.Registry.dll' /> |
65 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' /> | 65 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore.dll' Name='mscordaccore.dll' /> |
66 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore_x86_x86_4.700.19.60701.dll' Name='mscordaccore_x86_x86_4.700.19.60701.dll' /> | 66 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordaccore_x86_x86_4.700.20.11803.dll' Name='mscordaccore_x86_x86_4.700.20.11803.dll' /> |
67 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' /> | 67 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscordbi.dll' Name='mscordbi.dll' /> |
68 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' /> | 68 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorlib.dll' Name='mscorlib.dll' /> |
69 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> | 69 | <Payload SourceFile='publish\Example.LatestCoreMBA\scd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> |
diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs index 58ba7b39..9076d2e6 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs | |||
@@ -59,7 +59,7 @@ | |||
59 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' /> | 59 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.DiaSymReader.Native.x86.dll' Name='Microsoft.DiaSymReader.Native.x86.dll' /> |
60 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> | 60 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\Microsoft.Win32.Primitives.dll' Name='Microsoft.Win32.Primitives.dll' /> |
61 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' /> | 61 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore.dll' Name='mscordaccore.dll' /> |
62 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.19.60701.dll' Name='mscordaccore_x86_x86_4.700.19.60701.dll' /> | 62 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordaccore_x86_x86_4.700.20.11803.dll' Name='mscordaccore_x86_x86_4.700.20.11803.dll' /> |
63 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' /> | 63 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscordbi.dll' Name='mscordbi.dll' /> |
64 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> | 64 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.debug.dll' Name='mscorrc.debug.dll' /> |
65 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' /> | 65 | <Payload SourceFile='publish\Example.LatestCoreMBA\trimmedscd\mscorrc.dll' Name='mscorrc.dll' /> |
diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs index cda32895..44538227 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs | |||
@@ -11,7 +11,6 @@ namespace WixToolsetTest.ManagedHost | |||
11 | public class TestEngine | 11 | public class TestEngine |
12 | { | 12 | { |
13 | private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); | 13 | private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); |
14 | public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"); | ||
15 | 14 | ||
16 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) | 15 | public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) |
17 | { | 16 | { |
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index ff472322..d446d3a1 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | |||
@@ -63,7 +63,6 @@ | |||
63 | </ItemGroup> | 63 | </ItemGroup> |
64 | 64 | ||
65 | <ItemGroup> | 65 | <ItemGroup> |
66 | <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" /> | ||
67 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> | 66 | <PackageReference Include="WixBuildTools.TestSupport" Version="4.0.*" /> |
68 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | 67 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
69 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | 68 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index a158cd81..23b52788 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj | |||
@@ -1,7 +1,7 @@ | |||
1 | <?xml version="1.0" encoding="utf-8" ?> | 1 | <?xml version="1.0" encoding="utf-8" ?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> | 3 | <Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> |
4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" /> |
5 | <Import Project="..\FindLocalWix.props" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
6 | <PropertyGroup> | 6 | <PropertyGroup> |
7 | <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid> | 7 | <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid> |
@@ -57,7 +57,7 @@ | |||
57 | <ErrorText>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}.</ErrorText> | 57 | <ErrorText>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}.</ErrorText> |
58 | </PropertyGroup> | 58 | </PropertyGroup> |
59 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | 59 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> |
60 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" /> | 60 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0101\build\WixToolset.MSBuild.props'))" /> |
61 | </Target> | 61 | </Target> |
62 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 62 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> |
63 | </Project> | 63 | </Project> |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 1e5a9850..9190b5d0 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> |
4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" /> | 4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0101" developmentDependency="true" targetFramework="net40" /> |
5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |