Fix versioning of thmviewer and include MSI package in build
Rob Mensching committed
May 23, 2019 at 22:52 UTC
c8c22de1957f8eeb2c9fc03df12db6af41613ca9
6 files changed
+10
-8
appveyor.cmd
+1
-2
@@ -18,8 +18,7 @@ dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreap
18
dotnet pack -c Release src\dotnet-wix
19
dotnet pack -c Release src\WixToolset.MSBuild
20
21
-@rem Enable this build when WixToolset.Core is fixed to build the setup code correctly.
22
-@rem msbuild -p:Configuration=Release .\src\ThmViewerPackage\ThmViewerPackage.wixproj
21
+msbuild -p:Configuration=Release .\src\ThmViewerPackage\ThmViewerPackage.wixproj
22
23
@popd
24
@endlocal
nuget.config
+1
@@ -7,6 +7,7 @@
7
<add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
8
<add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
9
<add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
10
+ <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
11
<add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
12
<add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
13
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
src/ThmViewerPackage/Package.wxs
+1
-1
@@ -6,7 +6,7 @@
6
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
7
8
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
9
- <MediaTemplate />
9
+ <MediaTemplate EmbedCab="yes" />
10
11
<Feature Id="Main">
12
<ComponentGroupRef Id="Components" />
src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+3
-3
@@ -55,9 +55,9 @@ namespace WixToolsetTest.BuildTasks
55
var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
56
var section = intermediate.Sections.Single();
57
58
- var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
59
- Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
60
- Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
58
+ var fileTuple = section.Tuples.OfType<FileTuple>().Single();
59
+ Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
60
+ Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
61
}
62
}
63
}
src/thmviewer/thmviewer.vcxproj
+3
-1
@@ -31,7 +31,6 @@
31
</ImportGroup>
32
33
<ImportGroup Label="Shared">
34
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
34
</ImportGroup>
35
36
<PropertyGroup>
@@ -62,6 +61,9 @@
61
</ItemGroup>
62
63
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
64
+ <ImportGroup Label="ExtensionTargets">
65
+ <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
66
+ </ImportGroup>
67
68
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
69
<PropertyGroup>
src/wix/wix.csproj
+1
-1
@@ -26,7 +26,7 @@
26
</ItemGroup>
27
28
<ItemGroup>
29
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
29
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
30
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
31
</ItemGroup>
32
</Project>