Update to latest Core changes plus other minor fixes
Rob Mensching committed
May 9, 2019 at 08:43 UTC
14fdc9113bdc7270fb33e06990081988eb099ba9
13 files changed
+29
-27
src/Directory.Build.props
+2
-2
@@ -22,7 +22,7 @@
22
<Product>WiX Toolset</Product>
23
</PropertyGroup>
24
25
- <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />
26
- <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " />
25
+ <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
26
+ <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
27
<Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
28
</Project>
src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+1
-1
@@ -43,7 +43,7 @@
43
</ItemGroup>
44
45
<ItemGroup>
46
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All" />
46
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
47
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
48
</ItemGroup>
49
</Project>
src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
+1
-1
@@ -15,7 +15,7 @@
15
</ItemGroup>
16
17
<ItemGroup>
18
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
18
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
19
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
20
</ItemGroup>
21
</Project>
src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+7
-14
@@ -13,13 +13,6 @@ namespace WixToolsetTest.BuildTasks
13
{
14
private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets");
15
16
- public MsbuildFixture()
17
- {
18
- this.MsbuildRunner = new MsbuildRunner();
19
- }
20
-
21
- private MsbuildRunner MsbuildRunner { get; }
22
-
16
[Fact]
17
public void CanBuildSimpleMsiPackage()
18
{
@@ -31,7 +24,7 @@ namespace WixToolsetTest.BuildTasks
24
var binFolder = Path.Combine(baseFolder, @"bin\");
25
var intermediateFolder = Path.Combine(baseFolder, @"obj\");
26
34
- var result = this.MsbuildRunner.Execute(projectPath, new[]
27
+ var result = MsbuildRunner.Execute(projectPath, new[]
28
{
29
$"-p:WixTargetsPath={WixTargetsPath}",
30
$"-p:IntermediateOutputPath={intermediateFolder}",
@@ -69,7 +62,7 @@ namespace WixToolsetTest.BuildTasks
62
var binFolder = Path.Combine(baseFolder, @"bin\");
63
var intermediateFolder = Path.Combine(baseFolder, @"obj\");
64
72
- var result = this.MsbuildRunner.Execute(projectPath, new[]
65
+ var result = MsbuildRunner.Execute(projectPath, new[]
66
{
67
$"-p:WixTargetsPath={WixTargetsPath}",
68
$"-p:IntermediateOutputPath={intermediateFolder}",
@@ -94,7 +87,7 @@ namespace WixToolsetTest.BuildTasks
87
var binFolder = Path.Combine(baseFolder, @"bin\");
88
var intermediateFolder = Path.Combine(baseFolder, @"obj\");
89
97
- var result = this.MsbuildRunner.Execute(projectPath, new[]
90
+ var result = MsbuildRunner.Execute(projectPath, new[]
91
{
92
$"-p:WixTargetsPath={WixTargetsPath}",
93
$"-p:IntermediateOutputPath={intermediateFolder}",
@@ -116,7 +109,7 @@ namespace WixToolsetTest.BuildTasks
109
var binFolder = Path.Combine(baseFolder, @"bin\");
110
var intermediateFolder = Path.Combine(baseFolder, @"obj\");
111
119
- var result = this.MsbuildRunner.Execute(projectPath, new[]
112
+ var result = MsbuildRunner.Execute(projectPath, new[]
113
{
114
$"-p:WixTargetsPath={WixTargetsPath}",
115
$"-p:IntermediateOutputPath={intermediateFolder}",
@@ -141,7 +134,7 @@ namespace WixToolsetTest.BuildTasks
134
var binFolder = Path.Combine(baseFolder, @"bin\");
135
var intermediateFolder = Path.Combine(baseFolder, @"obj\");
136
144
- var result = this.MsbuildRunner.Execute(projectPath, new[]
137
+ var result = MsbuildRunner.Execute(projectPath, new[]
138
{
139
$"-p:WixTargetsPath={WixTargetsPath}",
140
$"-p:IntermediateOutputPath={intermediateFolder}",
@@ -169,7 +162,7 @@ namespace WixToolsetTest.BuildTasks
162
var intermediateFolder = Path.Combine(baseFolder, @"obj\");
163
164
// Build
172
- var result = this.MsbuildRunner.Execute(projectPath, new[]
165
+ var result = MsbuildRunner.Execute(projectPath, new[]
166
{
167
$"-p:WixTargetsPath={WixTargetsPath}",
168
$"-p:IntermediateOutputPath={intermediateFolder}",
@@ -187,7 +180,7 @@ namespace WixToolsetTest.BuildTasks
180
Assert.NotEmpty(createdPaths);
181
182
// Clean
190
- result = this.MsbuildRunner.Execute(projectPath, new[]
183
+ result = MsbuildRunner.Execute(projectPath, new[]
184
{
185
$"-p:WixTargetsPath={WixTargetsPath}",
186
$"-p:IntermediateOutputPath={intermediateFolder}",
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+2
-2
@@ -27,7 +27,7 @@
27
28
<ItemGroup>
29
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
30
- <PackageReference Include="xunit" Version="2.4.0" />
31
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
30
+ <PackageReference Include="xunit" Version="2.4.1" />
31
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
32
</ItemGroup>
33
</Project>
src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
-1
@@ -1,6 +1,5 @@
1
<ProjectConfiguration>
2
<Settings>
3
- <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
3
<HiddenComponentWarnings />
4
</Settings>
5
</ProjectConfiguration>
\ No newline at end of file
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+2
-2
@@ -38,7 +38,7 @@
38
39
<ItemGroup>
40
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
41
- <PackageReference Include="xunit" Version="2.4.0" />
42
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
41
+ <PackageReference Include="xunit" Version="2.4.1" />
42
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
43
</ItemGroup>
44
</Project>
src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject
+1
@@ -1,5 +1,6 @@
1
<ProjectConfiguration>
2
<Settings>
3
+ <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4
<HiddenComponentWarnings />
5
</Settings>
6
</ProjectConfiguration>
\ No newline at end of file
src/thmviewer/thmviewer.cpp
+1
-1
@@ -98,7 +98,7 @@ int WINAPI wWinMain(
98
ofn.hwndOwner = hWnd;
99
ofn.lpstrFile = wzFile;
100
ofn.nMaxFile = countof(wzFile);
101
- ofn.lpstrFilter = L"Theme Files\0*.thm\0XML Files\0*.xml\0All Files\0*.*\0";
101
+ ofn.lpstrFilter = L"Theme Files (*.thm)\0*.thm\0XML Files (*.xml)\0*.xml\0All Files (*.*)\0*.*\0";
102
ofn.nFilterIndex = 1;
103
ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
104
ofn.lpstrTitle = vpTheme->sczCaption;
src/thmviewer/thmviewer.v3.ncrunchproject
new
+7
@@ -0,0 +1,7 @@
1
+<ProjectConfiguration>
2
+ <Settings>
3
+ <AdditionalFilesToIncludeForProject>
4
+ <Value>thmviewer.manifest</Value>
5
+ </AdditionalFilesToIncludeForProject>
6
+ </Settings>
7
+</ProjectConfiguration>
\ No newline at end of file
src/thmviewer/thmviewer.vcxproj.filters
+3
-1
@@ -24,9 +24,11 @@
24
<ClCompile Include="load.cpp">
25
<Filter>Source Files</Filter>
26
</ClCompile>
27
+ <ClCompile Include="precomp.cpp">
28
+ <Filter>Source Files</Filter>
29
+ </ClCompile>
30
</ItemGroup>
31
<ItemGroup>
29
- <None Include="thmviewer.build" />
32
<None Include="Resources\thm.xml">
33
<Filter>Resource Files</Filter>
34
</None>
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-beta-63102-01" 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>
src/wixcop/WixCop.csproj
+1
-1
@@ -25,7 +25,7 @@
25
</ItemGroup>
26
27
<ItemGroup>
28
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta-63102-01" PrivateAssets="All"/>
28
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
29
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
30
</ItemGroup>
31
</Project>