From 62936dfa2da25f58423e6188745ae1307bb31a8f Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 17 Jan 2021 18:59:49 -0600 Subject: Document how to update dependencies and use local changes. --- README.md | 25 +++++++++++++++++++++- .../MsiTransactionTests/BundleAv1/BundleA.props | 3 --- .../BundleAv1/BundleAv1.wixproj | 3 +++ .../BundleAv2/BundleAv2.wixproj | 3 +++ .../MsiTransactionTests/BundleBv1/BundleB.props | 4 ---- .../BundleBv1/BundleBv1.wixproj | 4 ++++ .../BundleBv2/BundleBv2.wixproj | 4 ++++ src/WixToolsetTest.BurnE2E/PrereqBaTests.cs | 4 ++-- .../RollbackBoundaryTests.cs | 2 +- 9 files changed, 41 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 431f7b9c..8cfb9437 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,27 @@ For example, the following line runs only the specified test: The VM must have: 1. x64 .NET Core SDK of 5.0 or later (for the test runner) 1. Any version of .NET Framework (for the .NET Framework TestBA) -1. x86 .NET Core Desktop Runtime of 5.0 or later (for the .NET Core TestBA) \ No newline at end of file +1. x86 .NET Core Desktop Runtime of 5.0 or later (for the .NET Core TestBA) + +## Updating dependencies + +Use the `updatepackage.ps1` script from https://github.com/wixtoolset/Home. +For example: + +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Bal.wixext -NewVersion 4.0.80 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Mba.Core -NewVersion 4.0.45 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.NetFx.wixext -NewVersion 4.0.57 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Util.wixext -NewVersion 4.0.67 +* updatepackage.ps1 -TargetFolder path\to\repo -PackageName WixToolset.Sdk -NewVersion 4.0.0-build-0176 + +## Building with local changes + +The micro repo model makes this very difficult and painful. +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. +Put your custom nuget packages into a folder, and modify each repo's nuget.config with an entry to that folder. + +Alternatively, go into the NuGet package cache (%USERPROFILE%\.nuget\packages) and replace the official binaries with your locally built binaries. + +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: + +> nuget locals all -clear \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props index dd824926..f831fb29 100644 --- a/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleA.props @@ -9,7 +9,4 @@ - - - diff --git a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj index 607c4ce6..3a1f603f 100644 --- a/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj +++ b/src/TestData/MsiTransactionTests/BundleAv1/BundleAv1.wixproj @@ -6,4 +6,7 @@ + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj index 9600f6ba..9aae9347 100644 --- a/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj +++ b/src/TestData/MsiTransactionTests/BundleAv2/BundleAv2.wixproj @@ -9,4 +9,7 @@ + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props index e9367d44..87b402e4 100644 --- a/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props +++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleB.props @@ -10,8 +10,4 @@ - - - - diff --git a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj index 508e25ee..0e145bd3 100644 --- a/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj +++ b/src/TestData/MsiTransactionTests/BundleBv1/BundleBv1.wixproj @@ -4,4 +4,8 @@ + + + + \ No newline at end of file diff --git a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj index b84052d5..ed010a7b 100644 --- a/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj +++ b/src/TestData/MsiTransactionTests/BundleBv2/BundleBv2.wixproj @@ -11,4 +11,8 @@ + + + + \ No newline at end of file diff --git a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs index ced2e08e..b07b3aec 100644 --- a/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs +++ b/src/WixToolsetTest.BurnE2E/PrereqBaTests.cs @@ -18,7 +18,7 @@ namespace WixToolsetTest.BurnE2E /// The preqba doesn't infinitely reload itself after failing to load the managed BA. /// The engine automatically uninstalls the bundle since only permanent packages were installed. /// - [Fact] + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] public void DncPreqBaDetectsInfiniteLoop() { var packageA = this.CreatePackageInstaller("PackageA"); @@ -49,7 +49,7 @@ namespace WixToolsetTest.BurnE2E /// The preqba doesn't infinitely reload itself after failing to load the managed BA. /// The engine automatically uninstalls the bundle since only permanent packages were installed. /// - [Fact] + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6297")] public void MbaPreqBaDetectsInfiniteLoop() { var packageB = this.CreatePackageInstaller("PackageB"); diff --git a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs index effe4418..6539db34 100644 --- a/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs +++ b/src/WixToolsetTest.BurnE2E/RollbackBoundaryTests.cs @@ -22,7 +22,7 @@ namespace WixToolsetTest.BurnE2E /// install package B /// unregister since no non-permanent packages should be installed or cached. /// - [Fact] + [Fact(Skip = "https://github.com/wixtoolset/issues/issues/6309")] public void NonVitalRollbackBoundarySkipsToNextRollbackBoundary() { var packageA = this.CreatePackageInstaller("PackageA"); -- cgit v1.2.3-55-g6feb