aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--appveyor.yml2
-rw-r--r--src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj2
-rw-r--r--src/WixBuildTools.TestSupport/WixAssert.cs10
-rw-r--r--src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj2
-rw-r--r--src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj2
5 files changed, 14 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 8d80c6af..522e5af3 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ branches:
8 - master 8 - master
9 - develop 9 - develop
10 10
11image: Visual Studio 2017 11image: Visual Studio 2019
12 12
13version: 0.0.0.{build} 13version: 0.0.0.{build}
14configuration: Release 14configuration: Release
diff --git a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
index ccbb92c2..1c728c00 100644
--- a/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
+++ b/src/WixBuildTools.MsgGen/WixBuildTools.MsgGen.csproj
@@ -19,7 +19,7 @@
19 19
20 <ItemGroup> 20 <ItemGroup>
21 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 21 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
22 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> 22 <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
23 </ItemGroup> 23 </ItemGroup>
24 24
25</Project> 25</Project>
diff --git a/src/WixBuildTools.TestSupport/WixAssert.cs b/src/WixBuildTools.TestSupport/WixAssert.cs
index 4a5c6a97..71dc6b67 100644
--- a/src/WixBuildTools.TestSupport/WixAssert.cs
+++ b/src/WixBuildTools.TestSupport/WixAssert.cs
@@ -7,6 +7,16 @@ namespace WixBuildTools.TestSupport
7 7
8 public class WixAssert : Assert 8 public class WixAssert : Assert
9 { 9 {
10 public static void AssertEqualLineByLine(string[] expectedLines, string[] actualLines)
11 {
12 for (var i = 0; i < expectedLines.Length; ++i)
13 {
14 Assert.True(actualLines.Length > i, $"{i}: expectedLines longer than actualLines");
15 Assert.Equal($"{i}: {expectedLines[i]}", $"{i}: {actualLines[i]}");
16 }
17 Assert.True(expectedLines.Length == actualLines.Length, "actualLines longer than expectedLines");
18 }
19
10 public static void Succeeded(int hr, string format, params object[] formatArgs) 20 public static void Succeeded(int hr, string format, params object[] formatArgs)
11 { 21 {
12 if (0 > hr) 22 if (0 > hr)
diff --git a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
index e6cdddef..9aa5de47 100644
--- a/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
+++ b/src/WixBuildTools.TestSupport/WixBuildTools.TestSupport.csproj
@@ -19,7 +19,7 @@
19 19
20 <ItemGroup> 20 <ItemGroup>
21 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 21 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
22 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> 22 <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
23 </ItemGroup> 23 </ItemGroup>
24 24
25 <ItemGroup> 25 <ItemGroup>
diff --git a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
index bf9d957f..b8536e74 100644
--- a/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
+++ b/src/WixBuildTools.XsdGen/WixBuildTools.XsdGen.csproj
@@ -20,7 +20,7 @@
20 20
21 <ItemGroup> 21 <ItemGroup>
22 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" /> 22 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
23 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" /> 23 <PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="All" />
24 </ItemGroup> 24 </ItemGroup>
25 25
26</Project> 26</Project>