diff options
Diffstat (limited to 'src/test')
6 files changed, 14 insertions, 12 deletions
diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index c5a25948..06727afd 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | |||
@@ -9,7 +9,7 @@ namespace WixToolsetTest.Bal | |||
9 | 9 | ||
10 | public class BalExtensionFixture | 10 | public class BalExtensionFixture |
11 | { | 11 | { |
12 | [Fact(Skip = "Test demonstrates failure")] | 12 | [Fact] |
13 | public void CanBuildUsingWixStdBa() | 13 | public void CanBuildUsingWixStdBa() |
14 | { | 14 | { |
15 | using (var fs = new DisposableFileSystem()) | 15 | using (var fs = new DisposableFileSystem()) |
@@ -17,12 +17,14 @@ namespace WixToolsetTest.Bal | |||
17 | var baseFolder = fs.GetFolder(); | 17 | var baseFolder = fs.GetFolder(); |
18 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); | 18 | var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); |
19 | var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); | 19 | var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); |
20 | var intermediateFolder = Path.Combine(baseFolder, "obj"); | ||
20 | 21 | ||
21 | var compileResult = WixRunner.Execute(new[] | 22 | var compileResult = WixRunner.Execute(new[] |
22 | { | 23 | { |
23 | "build", | 24 | "build", |
24 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), | 25 | Path.Combine(bundleSourceFolder, "Bundle.wxs"), |
25 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), | 26 | "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), |
27 | "-intermediateFolder", intermediateFolder, | ||
26 | "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), | 28 | "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), |
27 | "-o", bundleFile, | 29 | "-o", bundleFile, |
28 | }); | 30 | }); |
diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 3a884020..09348ac8 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | |||
@@ -3,7 +3,7 @@ | |||
3 | 3 | ||
4 | 4 | ||
5 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 5 | <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
6 | <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" /> | 6 | <Import Project="..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props" Condition="Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props')" /> |
7 | <PropertyGroup> | 7 | <PropertyGroup> |
8 | <ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid> | 8 | <ProjectGuid>{CC4236FC-226E-4232-AB50-24CBEC4D314D}</ProjectGuid> |
9 | <AssemblyName>Example.FullFramework2MBA</AssemblyName> | 9 | <AssemblyName>Example.FullFramework2MBA</AssemblyName> |
@@ -40,7 +40,7 @@ | |||
40 | <Reference Include="System.Data" /> | 40 | <Reference Include="System.Data" /> |
41 | <Reference Include="System.Xml" /> | 41 | <Reference Include="System.Xml" /> |
42 | <Reference Include="WixToolset.Mba.Core"> | 42 | <Reference Include="WixToolset.Mba.Core"> |
43 | <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll</HintPath> | 43 | <HintPath>..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll</HintPath> |
44 | </Reference> | 44 | </Reference> |
45 | </ItemGroup> | 45 | </ItemGroup> |
46 | <ItemGroup> | 46 | <ItemGroup> |
@@ -67,7 +67,7 @@ | |||
67 | <PropertyGroup> | 67 | <PropertyGroup> |
68 | <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> | 68 | <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> |
69 | </PropertyGroup> | 69 | </PropertyGroup> |
70 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\build\net20\WixToolset.Mba.Core.props'))" /> | 70 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\build\net20\WixToolset.Mba.Core.props'))" /> |
71 | <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'))" /> | 71 | <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'))" /> |
72 | </Target> | 72 | </Target> |
73 | 73 | ||
diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config index 6a2328ef..9950b1b6 100644 --- a/src/test/examples/FullFramework2MBA/packages.config +++ b/src/test/examples/FullFramework2MBA/packages.config | |||
@@ -1,4 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="WixToolset.Mba.Core" version="4.0.13" targetFramework="net461" /> | 3 | <package id="WixToolset.Mba.Core" version="4.0.16" targetFramework="net461" /> |
4 | </packages> \ No newline at end of file | 4 | </packages> \ No newline at end of file |
diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 04553354..549e096e 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | |||
@@ -7,7 +7,7 @@ | |||
7 | 7 | ||
8 | <ItemGroup> | 8 | <ItemGroup> |
9 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> | 9 | <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" /> |
10 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.13" PrivateAssets="All" /> | 10 | <PackageReference Include="WixToolset.Mba.Core" Version="4.0.16" PrivateAssets="All" /> |
11 | </ItemGroup> | 11 | </ItemGroup> |
12 | 12 | ||
13 | <ItemGroup> | 13 | <ItemGroup> |
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 90002795..44ba2c9b 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
@@ -1,8 +1,8 @@ | |||
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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" /> | 4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" /> |
5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" /> |
7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
8 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
@@ -63,8 +63,8 @@ | |||
63 | <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> | 63 | <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> |
64 | </PropertyGroup> | 64 | </PropertyGroup> |
65 | <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'))" /> | 65 | <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'))" /> |
66 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.13\build\WixToolset.BalUtil.props'))" /> | 66 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.16\build\WixToolset.BalUtil.props'))" /> |
67 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.11\build\WixToolset.BootstrapperCore.Native.props'))" /> | 67 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.13\build\WixToolset.BootstrapperCore.Native.props'))" /> |
68 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" /> | 68 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" /> |
69 | </Target> | 69 | </Target> |
70 | </Project> \ No newline at end of file | 70 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index fbcb6700..56b68f10 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config | |||
@@ -1,7 +1,7 @@ | |||
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" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.11" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.13" targetFramework="native" /> |
5 | <package id="WixToolset.BalUtil" version="4.0.13" targetFramework="native" /> | 5 | <package id="WixToolset.BalUtil" version="4.0.16" targetFramework="native" /> |
6 | <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" /> |
7 | </packages> \ No newline at end of file | 7 | </packages> \ No newline at end of file |