aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2019-05-09 08:43:08 -0700
committerRob Mensching <rob@firegiant.com>2019-05-09 08:43:08 -0700
commit14fdc9113bdc7270fb33e06990081988eb099ba9 (patch)
tree850c49df50301878737c51c7ae246d594e4f8f9c
parente8d9c70934d8cae0d2769ab6ca5ad40d5f506968 (diff)
downloadwix-14fdc9113bdc7270fb33e06990081988eb099ba9.tar.gz
wix-14fdc9113bdc7270fb33e06990081988eb099ba9.tar.bz2
wix-14fdc9113bdc7270fb33e06990081988eb099ba9.zip
Update to latest Core changes plus other minor fixes
Diffstat
-rw-r--r--src/Directory.Build.props4
-rw-r--r--src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj2
-rw-r--r--src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj2
-rw-r--r--src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs21
-rw-r--r--src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj4
-rw-r--r--src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject1
-rw-r--r--src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj4
-rw-r--r--src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject1
-rw-r--r--src/thmviewer/thmviewer.cpp2
-rw-r--r--src/thmviewer/thmviewer.v3.ncrunchproject7
-rw-r--r--src/thmviewer/thmviewer.vcxproj.filters4
-rw-r--r--src/wix/wix.csproj2
-rw-r--r--src/wixcop/WixCop.csproj2
13 files changed, 29 insertions, 27 deletions
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 30ce4e48..a22f4470 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,7 +22,7 @@
22 <Product>WiX Toolset</Product> 22 <Product>WiX Toolset</Product>
23 </PropertyGroup> 23 </PropertyGroup>
24 24
25 <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " /> 25 <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
26 <Import Project="Wix.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.wixproj' " /> 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') " /> 27 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
28</Project> 28</Project>
diff --git a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
index 8713709e..c5b609c6 100644
--- a/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
+++ b/src/WixToolset.BuildTasks/WixToolset.BuildTasks.csproj
@@ -43,7 +43,7 @@
43 </ItemGroup> 43 </ItemGroup>
44 44
45 <ItemGroup> 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" /> 47 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
48 </ItemGroup> 48 </ItemGroup>
49</Project> 49</Project>
diff --git a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
index 92111c61..0f67db73 100644
--- a/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
+++ b/src/WixToolset.Tools.Core/WixToolset.Tools.Core.csproj
@@ -15,7 +15,7 @@
15 </ItemGroup> 15 </ItemGroup>
16 16
17 <ItemGroup> 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" /> 19 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
20 </ItemGroup> 20 </ItemGroup>
21</Project> 21</Project>
diff --git a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
index 74978322..9f761c32 100644
--- a/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/MsbuildFixture.cs
@@ -13,13 +13,6 @@ namespace WixToolsetTest.BuildTasks
13 { 13 {
14 private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets"); 14 private static readonly string WixTargetsPath = Path.Combine(Path.GetDirectoryName(new Uri(typeof(DoIt).Assembly.CodeBase).AbsolutePath), "wix.targets");
15 15
16 public MsbuildFixture()
17 {
18 this.MsbuildRunner = new MsbuildRunner();
19 }
20
21 private MsbuildRunner MsbuildRunner { get; }
22
23 [Fact] 16 [Fact]
24 public void CanBuildSimpleMsiPackage() 17 public void CanBuildSimpleMsiPackage()
25 { 18 {
@@ -31,7 +24,7 @@ namespace WixToolsetTest.BuildTasks
31 var binFolder = Path.Combine(baseFolder, @"bin\"); 24 var binFolder = Path.Combine(baseFolder, @"bin\");
32 var intermediateFolder = Path.Combine(baseFolder, @"obj\"); 25 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
33 26
34 var result = this.MsbuildRunner.Execute(projectPath, new[] 27 var result = MsbuildRunner.Execute(projectPath, new[]
35 { 28 {
36 $"-p:WixTargetsPath={WixTargetsPath}", 29 $"-p:WixTargetsPath={WixTargetsPath}",
37 $"-p:IntermediateOutputPath={intermediateFolder}", 30 $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -69,7 +62,7 @@ namespace WixToolsetTest.BuildTasks
69 var binFolder = Path.Combine(baseFolder, @"bin\"); 62 var binFolder = Path.Combine(baseFolder, @"bin\");
70 var intermediateFolder = Path.Combine(baseFolder, @"obj\"); 63 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
71 64
72 var result = this.MsbuildRunner.Execute(projectPath, new[] 65 var result = MsbuildRunner.Execute(projectPath, new[]
73 { 66 {
74 $"-p:WixTargetsPath={WixTargetsPath}", 67 $"-p:WixTargetsPath={WixTargetsPath}",
75 $"-p:IntermediateOutputPath={intermediateFolder}", 68 $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -94,7 +87,7 @@ namespace WixToolsetTest.BuildTasks
94 var binFolder = Path.Combine(baseFolder, @"bin\"); 87 var binFolder = Path.Combine(baseFolder, @"bin\");
95 var intermediateFolder = Path.Combine(baseFolder, @"obj\"); 88 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
96 89
97 var result = this.MsbuildRunner.Execute(projectPath, new[] 90 var result = MsbuildRunner.Execute(projectPath, new[]
98 { 91 {
99 $"-p:WixTargetsPath={WixTargetsPath}", 92 $"-p:WixTargetsPath={WixTargetsPath}",
100 $"-p:IntermediateOutputPath={intermediateFolder}", 93 $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -116,7 +109,7 @@ namespace WixToolsetTest.BuildTasks
116 var binFolder = Path.Combine(baseFolder, @"bin\"); 109 var binFolder = Path.Combine(baseFolder, @"bin\");
117 var intermediateFolder = Path.Combine(baseFolder, @"obj\"); 110 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
118 111
119 var result = this.MsbuildRunner.Execute(projectPath, new[] 112 var result = MsbuildRunner.Execute(projectPath, new[]
120 { 113 {
121 $"-p:WixTargetsPath={WixTargetsPath}", 114 $"-p:WixTargetsPath={WixTargetsPath}",
122 $"-p:IntermediateOutputPath={intermediateFolder}", 115 $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -141,7 +134,7 @@ namespace WixToolsetTest.BuildTasks
141 var binFolder = Path.Combine(baseFolder, @"bin\"); 134 var binFolder = Path.Combine(baseFolder, @"bin\");
142 var intermediateFolder = Path.Combine(baseFolder, @"obj\"); 135 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
143 136
144 var result = this.MsbuildRunner.Execute(projectPath, new[] 137 var result = MsbuildRunner.Execute(projectPath, new[]
145 { 138 {
146 $"-p:WixTargetsPath={WixTargetsPath}", 139 $"-p:WixTargetsPath={WixTargetsPath}",
147 $"-p:IntermediateOutputPath={intermediateFolder}", 140 $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -169,7 +162,7 @@ namespace WixToolsetTest.BuildTasks
169 var intermediateFolder = Path.Combine(baseFolder, @"obj\"); 162 var intermediateFolder = Path.Combine(baseFolder, @"obj\");
170 163
171 // Build 164 // Build
172 var result = this.MsbuildRunner.Execute(projectPath, new[] 165 var result = MsbuildRunner.Execute(projectPath, new[]
173 { 166 {
174 $"-p:WixTargetsPath={WixTargetsPath}", 167 $"-p:WixTargetsPath={WixTargetsPath}",
175 $"-p:IntermediateOutputPath={intermediateFolder}", 168 $"-p:IntermediateOutputPath={intermediateFolder}",
@@ -187,7 +180,7 @@ namespace WixToolsetTest.BuildTasks
187 Assert.NotEmpty(createdPaths); 180 Assert.NotEmpty(createdPaths);
188 181
189 // Clean 182 // Clean
190 result = this.MsbuildRunner.Execute(projectPath, new[] 183 result = MsbuildRunner.Execute(projectPath, new[]
191 { 184 {
192 $"-p:WixTargetsPath={WixTargetsPath}", 185 $"-p:WixTargetsPath={WixTargetsPath}",
193 $"-p:IntermediateOutputPath={intermediateFolder}", 186 $"-p:IntermediateOutputPath={intermediateFolder}",
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
index edab8a67..c5498de4 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.csproj
@@ -27,7 +27,7 @@
27 27
28 <ItemGroup> 28 <ItemGroup>
29 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> 29 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
30 <PackageReference Include="xunit" Version="2.4.0" /> 30 <PackageReference Include="xunit" Version="2.4.1" />
31 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" /> 31 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
32 </ItemGroup> 32 </ItemGroup>
33</Project> 33</Project>
diff --git a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
index 8f3624cb..cf22dfa9 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
+++ b/src/test/WixToolsetTest.BuildTasks/WixToolsetTest.BuildTasks.v3.ncrunchproject
@@ -1,6 +1,5 @@
1<ProjectConfiguration> 1<ProjectConfiguration>
2 <Settings> 2 <Settings>
3 <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
4 <HiddenComponentWarnings /> 3 <HiddenComponentWarnings />
5 </Settings> 4 </Settings>
6</ProjectConfiguration> \ No newline at end of file 5</ProjectConfiguration> \ No newline at end of file
diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
index f399760f..45f8c57d 100644
--- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
+++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.csproj
@@ -38,7 +38,7 @@
38 38
39 <ItemGroup> 39 <ItemGroup>
40 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> 40 <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
41 <PackageReference Include="xunit" Version="2.4.0" /> 41 <PackageReference Include="xunit" Version="2.4.1" />
42 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" /> 42 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
43 </ItemGroup> 43 </ItemGroup>
44</Project> 44</Project>
diff --git a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject
index cf22dfa9..8f3624cb 100644
--- a/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject
+++ b/src/test/WixToolsetTest.WixCop/WixToolsetTest.WixCop.v3.ncrunchproject
@@ -1,5 +1,6 @@
1<ProjectConfiguration> 1<ProjectConfiguration>
2 <Settings> 2 <Settings>
3 <CopyReferencedAssembliesToWorkspace>True</CopyReferencedAssembliesToWorkspace>
3 <HiddenComponentWarnings /> 4 <HiddenComponentWarnings />
4 </Settings> 5 </Settings>
5</ProjectConfiguration> \ No newline at end of file 6</ProjectConfiguration> \ No newline at end of file
diff --git a/src/thmviewer/thmviewer.cpp b/src/thmviewer/thmviewer.cpp
index 511272a9..425cdf43 100644
--- a/src/thmviewer/thmviewer.cpp
+++ b/src/thmviewer/thmviewer.cpp
@@ -98,7 +98,7 @@ int WINAPI wWinMain(
98 ofn.hwndOwner = hWnd; 98 ofn.hwndOwner = hWnd;
99 ofn.lpstrFile = wzFile; 99 ofn.lpstrFile = wzFile;
100 ofn.nMaxFile = countof(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; 102 ofn.nFilterIndex = 1;
103 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; 103 ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
104 ofn.lpstrTitle = vpTheme->sczCaption; 104 ofn.lpstrTitle = vpTheme->sczCaption;
diff --git a/src/thmviewer/thmviewer.v3.ncrunchproject b/src/thmviewer/thmviewer.v3.ncrunchproject
new file mode 100644
index 00000000..3cffd6ce
--- /dev/null
+++ b/src/thmviewer/thmviewer.v3.ncrunchproject
@@ -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
diff --git a/src/thmviewer/thmviewer.vcxproj.filters b/src/thmviewer/thmviewer.vcxproj.filters
index 79e08275..9a1eff3f 100644
--- a/src/thmviewer/thmviewer.vcxproj.filters
+++ b/src/thmviewer/thmviewer.vcxproj.filters
@@ -24,9 +24,11 @@
24 <ClCompile Include="load.cpp"> 24 <ClCompile Include="load.cpp">
25 <Filter>Source Files</Filter> 25 <Filter>Source Files</Filter>
26 </ClCompile> 26 </ClCompile>
27 <ClCompile Include="precomp.cpp">
28 <Filter>Source Files</Filter>
29 </ClCompile>
27 </ItemGroup> 30 </ItemGroup>
28 <ItemGroup> 31 <ItemGroup>
29 <None Include="thmviewer.build" />
30 <None Include="Resources\thm.xml"> 32 <None Include="Resources\thm.xml">
31 <Filter>Resource Files</Filter> 33 <Filter>Resource Files</Filter>
32 </None> 34 </None>
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 9cb5658f..398952af 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -26,7 +26,7 @@
26 </ItemGroup> 26 </ItemGroup>
27 27
28 <ItemGroup> 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" /> 30 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
31 </ItemGroup> 31 </ItemGroup>
32</Project> 32</Project>
diff --git a/src/wixcop/WixCop.csproj b/src/wixcop/WixCop.csproj
index be10524d..7a17caf1 100644
--- a/src/wixcop/WixCop.csproj
+++ b/src/wixcop/WixCop.csproj
@@ -25,7 +25,7 @@
25 </ItemGroup> 25 </ItemGroup>
26 26
27 <ItemGroup> 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" /> 29 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
30 </ItemGroup> 30 </ItemGroup>
31</Project> 31</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-03 20:21:52 +0000