@joebigelow / wix / commits / 62936dfa

Document how to update dependencies and use local changes.

Sean Hall committed Jan 17, 2021 at 18:59 UTC 62936dfa2da25f58423e6188745ae1307bb31a8f
9 files changed +41 -11
README.md
+24 -1
@@ -22,4 +22,27 @@ For example, the following line runs only the specified test:
22 The VM must have:
23 1. x64 .NET Core SDK of 5.0 or later (for the test runner)
24 1. Any version of .NET Framework (for the .NET Framework TestBA)
25 -1. x86 .NET Core Desktop Runtime of 5.0 or later (for the .NET Core TestBA)
\ No newline at end of file
25 +1. x86 .NET Core Desktop Runtime of 5.0 or later (for the .NET Core TestBA)
26 +
27 +## Updating dependencies
28 +
29 +Use the `updatepackage.ps1` script from https://github.com/wixtoolset/Home.
30 +For example:
31 +
32 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Bal.wixext -NewVersion 4.0.80
33 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Mba.Core -NewVersion 4.0.45
34 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.NetFx.wixext -NewVersion 4.0.57
35 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Util.wixext -NewVersion 4.0.67
36 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Sdk -NewVersion 4.0.0-build-0176
37 +
38 +## Building with local changes
39 +
40 +The micro repo model makes this very difficult and painful.
41 +The basic idea is to make your changes in each individual repo on the master branch (to get a stable version), commit, and then use appveyor.cmd to build the nuget package.
42 +Put your custom nuget packages into a folder, and modify each repo's nuget.config with an entry to that folder.
43 +
44 +Alternatively, go into the NuGet package cache (%USERPROFILE%\.nuget\packages) and replace the official binaries with your locally built binaries.
45 +
46 +Both of those approaches will poison your NuGet package cache, so you probably will want to run the following command to clear it when you're done:
47 +
48 +> nuget locals all -clear
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleAv1/BundleA.props
-3
@@ -9,7 +9,4 @@
9 <ItemGroup>
10 <Compile Include="..\..\Templates\Bundle.wxs" Link="Bundle.wxs" />
11 </ItemGroup>
12 - <ItemGroup>
13 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
14 - </ItemGroup>
12 </Project>
src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj
+3
@@ -6,4 +6,7 @@
6 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
7 <ProjectReference Include="..\PackageCv1\PackageCv1.wixproj" />
8 </ItemGroup>
9 + <ItemGroup>
10 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
11 + </ItemGroup>
12 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj
+3
@@ -9,4 +9,7 @@
9 <ProjectReference Include="..\PackageCv2\PackageCv2.wixproj" />
10 <ProjectReference Include="..\PackageD\PackageD.wixproj" />
11 </ItemGroup>
12 + <ItemGroup>
13 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
14 + </ItemGroup>
15 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv1/BundleB.props
-4
@@ -10,8 +10,4 @@
10 <ItemGroup>
11 <ProjectReference Include="..\..\TestBA\TestBAWixlib\testbawixlib.wixproj" />
12 </ItemGroup>
13 - <ItemGroup>
14 - <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
15 - <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
16 - </ItemGroup>
13 </Project>
src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj
+4
@@ -4,4 +4,8 @@
4 <ItemGroup>
5 <ProjectReference Include="..\PackageBv1\PackageBv1.wixproj" />
6 </ItemGroup>
7 + <ItemGroup>
8 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
9 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
10 + </ItemGroup>
11 </Project>
\ No newline at end of file
src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj
+4
@@ -11,4 +11,8 @@
11 <ProjectReference Include="..\PackageBv2\PackageBv2.wixproj" />
12 <ProjectReference Include="..\PackageF\PackageF.wixproj" />
13 </ItemGroup>
14 + <ItemGroup>
15 + <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.80" />
16 + <PackageReference Include="WixToolset.NetFx.wixext" Version="4.0.57" />
17 + </ItemGroup>
18 </Project>
\ No newline at end of file
src/WixToolsetTest.BurnE2E/PrereqBaTests.cs
+2 -2
@@ -18,7 +18,7 @@ namespace WixToolsetTest.BurnE2E
18 /// The preqba doesn't infinitely reload itself after failing to load the managed BA.
19 /// The engine automatically uninstalls the bundle since only permanent packages were installed.
20 /// </summary>
21 - [Fact]
21 + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
22 public void DncPreqBaDetectsInfiniteLoop()
23 {
24 var packageA = this.CreatePackageInstaller("PackageA");
@@ -49,7 +49,7 @@ namespace WixToolsetTest.BurnE2E
49 /// The preqba doesn't infinitely reload itself after failing to load the managed BA.
50 /// The engine automatically uninstalls the bundle since only permanent packages were installed.
51 /// </summary>
52 - [Fact]
52 + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")]
53 public void MbaPreqBaDetectsInfiniteLoop()
54 {
55 var packageB = this.CreatePackageInstaller("PackageB");
src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs
+1 -1
@@ -22,7 +22,7 @@ namespace WixToolsetTest.BurnE2E
22 /// install package B
23 /// unregister since no non-permanent packages should be installed or cached.
24 /// </summary>
25 - [Fact]
25 + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6309")]
26 public void NonVitalRollbackBoundarySkipsToNextRollbackBoundary()
27 {
28 var packageA = this.CreatePackageInstaller("PackageA");