diff options
Diffstat (limited to 'src/test')
5 files changed, 15 insertions, 15 deletions
diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs index 1b72c725..8c613acc 100644 --- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> |
@@ -6,7 +6,7 @@ | |||
6 | <bal:WixManagedBootstrapperApplicationHost /> | 6 | <bal:WixManagedBootstrapperApplicationHost /> |
7 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
8 | <Chain> | 8 | <Chain> |
9 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" /> | 9 | <ExePackage Permanent="yes" DetectCondition="no" 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/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs index 5072b813..a647945d 100644 --- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> |
@@ -7,7 +7,7 @@ | |||
7 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
8 | <Variable Name="Test1" bal:Overridable="yes" /> | 8 | <Variable Name="Test1" bal:Overridable="yes" /> |
9 | <Chain> | 9 | <Chain> |
10 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" /> | 10 | <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" /> |
11 | </Chain> | 11 | </Chain> |
12 | </Bundle> | 12 | </Bundle> |
13 | </Wix> | 13 | </Wix> |
diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 3ba305b5..1ca2e7ae 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs | |||
@@ -1,4 +1,4 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" | 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" |
3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> | 3 | xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> |
4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> | 4 | <Bundle Name="WixStdBa" Version="1.0.0.0" Manufacturer="Example Corporation" UpgradeCode="75D5D534-E177-4689-AAE9-CAC1C39002C2"> |
@@ -6,7 +6,7 @@ | |||
6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> | 6 | <bal:WixStandardBootstrapperApplication LicenseUrl="http://wixtoolset.org/about/license/" Theme="hyperlinkLicense" /> |
7 | </BootstrapperApplication> | 7 | </BootstrapperApplication> |
8 | <Chain> | 8 | <Chain> |
9 | <ExePackage SourceFile="runtimes\win-x86\native\wixnative.exe" /> | 9 | <ExePackage Permanent="yes" DetectCondition="no" SourceFile="runtimes\win-x86\native\wixnative.exe" /> |
10 | </Chain> | 10 | </Chain> |
11 | </Bundle> | 11 | </Bundle> |
12 | </Wix> | 12 | </Wix> |
diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index fa8925a8..c75c37ef 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
@@ -1,9 +1,9 @@ | |||
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.45\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" /> | 4 | <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" /> |
5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" /> |
7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
8 | <ProjectConfiguration Include="Debug|ARM64"> | 8 | <ProjectConfiguration Include="Debug|ARM64"> |
9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
@@ -76,8 +76,8 @@ | |||
76 | <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> | 76 | <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> |
77 | </PropertyGroup> | 77 | </PropertyGroup> |
78 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> | 78 | <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> |
79 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.45\build\WixToolset.BalUtil.props'))" /> | 79 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.46\build\WixToolset.BalUtil.props'))" /> |
80 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.54\build\WixToolset.BootstrapperCore.Native.props'))" /> | 80 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.64\build\WixToolset.BootstrapperCore.Native.props'))" /> |
81 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" /> | 81 | <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.59\build\WixToolset.DUtil.props'))" /> |
82 | </Target> | 82 | </Target> |
83 | </Project> \ No newline at end of file | 83 | </Project> \ No newline at end of file |
diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 0f17a2f2..08a0433c 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="3.3.37" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.54" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.64" targetFramework="native" /> |
5 | <package id="WixToolset.BalUtil" version="4.0.45" targetFramework="native" /> | 5 | <package id="WixToolset.BalUtil" version="4.0.46" targetFramework="native" /> |
6 | <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" /> | 6 | <package id="WixToolset.DUtil" version="4.0.59" targetFramework="native" /> |
7 | </packages> \ No newline at end of file | 7 | </packages> \ No newline at end of file |