wixtoolset
/
integration
зеркало из https://github.com/wixtoolset/integration.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update to latest.

This commit is contained in:
Sean Hall 2020-12-08 16:01:28 -06:00
Родитель 50b8c862c4
Коммит 83f5dfce5a
16 изменённых файлов: 30 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
global.json
Просмотреть файл

@ -1,6 +1,6 @@
{
"msbuild-sdks": {
"WixToolset.Sdk": "4.0.0-build-0170"
"WixToolset.Sdk": "4.0.0-build-0171"
},
"sdk": {
"allowPrerelease": false

5
src/TestData/MsiTransaction/BundleAv1/BundleA.wxi
Просмотреть файл

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
<!-- 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. -->
<?ifndef Version?>
<?define Version = 1.0.0.0?>
@ -7,7 +6,7 @@
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Bundle Name="~$(var.TestGroupName) - Bundle A" Version="$(var.Version)" UpgradeCode="{90ED10D5-B187-4470-B498-05D80DAB729A}" Compressed="yes">
<Log Prefix="~$(var.TestGroupName)_BundleA"/>
<Log Prefix="~$(var.TestGroupName)_BundleA" />
<Variable Name="TestGroupName" Value="$(var.TestGroupName)" />

4
src/TestData/MsiTransaction/BundleAv1/BundleAv1.wixproj
Просмотреть файл

@ -10,7 +10,7 @@
<ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
</ItemGroup>
</Project>

7
src/TestData/MsiTransaction/BundleAv1/BundleAv1.wxs
Просмотреть файл

@ -1,13 +1,12 @@
<?xml version='1.0' encoding='utf-8'?>
<!-- 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. -->
<!-- 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. -->
<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?include BundleA.wxi ?>
<Fragment>
<PackageGroup Id="BundlePackages">
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
<RollbackBoundary Transaction='yes' />
<RollbackBoundary Transaction="yes" />
<MsiPackage Id="PackageB" SourceFile="$(var.PackageBv1.TargetPath)" />
<MsiPackage Id="PackageC" SourceFile="$(var.PackageCv1.TargetPath)" />
</PackageGroup>

4
src/TestData/MsiTransaction/BundleAv2/BundleAv2.wixproj
Просмотреть файл

@ -11,7 +11,7 @@
<ProjectReference Include="..\PackageD\PackageD.wixproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
</ItemGroup>
</Project>

7
src/TestData/MsiTransaction/BundleAv2/BundleAv2.wxs
Просмотреть файл

@ -1,13 +1,12 @@
<?xml version='1.0' encoding='utf-8'?>
<!-- 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. -->
<!-- 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. -->
<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?include ..\BundleAv1\BundleA.wxi ?>
<Fragment>
<PackageGroup Id="BundlePackages">
<MsiPackage Id="PackageD" SourceFile="$(var.PackageD.TargetPath)" />
<RollbackBoundary Transaction='yes' />
<RollbackBoundary Transaction="yes" />
<MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
<MsiPackage Id="PackageC" SourceFile="$(var.PackageCv2.TargetPath)" />
</PackageGroup>

5
src/TestData/MsiTransaction/BundleBv1/BundleB.wxi
Просмотреть файл

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
<!-- 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. -->
<?ifndef Version?>
<?define Version = 1.0.0.0?>
@ -7,7 +6,7 @@
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Bundle Name="~$(var.TestGroupName) - Bundle B" Version="$(var.Version)" UpgradeCode="{552FD011-4DD6-42B2-A4C6-AD1417C829B2}" Compressed="yes">
<Log Prefix="~$(var.TestGroupName)_BundleB"/>
<Log Prefix="~$(var.TestGroupName)_BundleB" />
<Variable Name="TestGroupName" Value="$(var.TestGroupName)" />

4
src/TestData/MsiTransaction/BundleBv1/BundleBv1.wixproj
Просмотреть файл

@ -8,7 +8,7 @@
<ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
</ItemGroup>
</Project>

5
src/TestData/MsiTransaction/BundleBv1/BundleBv1.wxs
Просмотреть файл

@ -1,8 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<!-- 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. -->
<!-- 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. -->
<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?include BundleB.wxi ?>
<Fragment>
<PackageGroup Id="BundlePackages">

4
src/TestData/MsiTransaction/BundleBv2/BundleBv2.wixproj
Просмотреть файл

@ -11,7 +11,7 @@
<ProjectReference Include="..\PackageF\PackageF.wixproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.51" />
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
<PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.53" />
</ItemGroup>
</Project>

7
src/TestData/MsiTransaction/BundleBv2/BundleBv2.wxs
Просмотреть файл

@ -1,13 +1,12 @@
<?xml version='1.0' encoding='utf-8'?>
<!-- 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. -->
<!-- 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. -->
<Wix xmlns='http://wixtoolset.org/schemas/v4/wxs'>
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?include ..\BundleBv1\BundleB.wxi ?>
<Fragment>
<PackageGroup Id="BundlePackages">
<MsiPackage Id="PackageA" SourceFile="$(var.PackageA.TargetPath)" />
<RollbackBoundary Transaction='yes' />
<RollbackBoundary Transaction="yes" />
<MsiPackage Id="PackageB" SourceFile="$(var.PackageBv2.TargetPath)" />
<MsiPackage Id="PackageF" SourceFile="$(var.PackageF.TargetPath)" />
</PackageGroup>

2
src/TestData/MsiTransaction/PackageF/PackageF.wixproj
Просмотреть файл

@ -7,6 +7,6 @@
<Compile Include="..\..\Templates\PackageFail.wxs" Link="PackageFail.wxs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.65" />
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.66" />
</ItemGroup>
</Project>

2
src/TestData/Templates/Package.wxs
Просмотреть файл

@ -8,8 +8,6 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes" />

2
src/TestData/Templates/PackageFail.wxs
Просмотреть файл

@ -8,8 +8,6 @@
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:util="http://wixtoolset.org/schemas/v4/wxs/util">
<Package Name="~$(var.TestGroupName) - $(var.PackageName)" Language="1033" Version="$(var.Version)" Manufacturer="Microsoft Corporation" UpgradeCode="$(var.UpgradeCode)" Compressed="yes">
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MediaTemplate EmbedCab="yes" />

8
src/TestData/TestBA/TestBAWixlib/TestBA.wxs
Просмотреть файл

@ -1,9 +1,9 @@
<!-- 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. -->
<!-- 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. -->
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
<Fragment>
<BootstrapperApplicationRef Id='ManagedBootstrapperApplicationHost'>
<Payload Name='WixToolset.Mba.Host.config' SourceFile='!(bindpath.x86)\TestBA.BootstrapperCore.config' />
<Payload SourceFile='!(bindpath.x86)\TestBA.dll' />
<BootstrapperApplicationRef Id="ManagedBootstrapperApplicationHost">
<Payload Name="WixToolset.Mba.Host.config" SourceFile="!(bindpath.x86)\TestBA.BootstrapperCore.config" />
<Payload SourceFile="!(bindpath.x86)\TestBA.dll" />
<Payload SourceFile="!(bindpath.x86)\mbanative.dll" />
<Payload SourceFile="!(bindpath.x86)\WixToolset.Mba.Core.dll" />
</BootstrapperApplicationRef>

2
src/TestData/TestBA/TestBAWixlib/testbawixlib.wixproj
Просмотреть файл

@ -12,6 +12,6 @@
<ProjectReference Include="..\..\..\Utilities\TestBA\TestBA.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.66" />
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.70" />
</ItemGroup>
</Project>