Skip to content

Commit b0815aa

Browse files
author
dabeku
committed
update wix
1 parent b79071a commit b0815aa

File tree

5 files changed

+16
-4
lines changed

5 files changed

+16
-4
lines changed

Installer/Loginator/Loginator.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<OutputType>Package</OutputType>
1111
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
1212
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
13-
<WixToolPath>$(MSBuildProjectDirectory)\..\..\packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\</WixToolPath>
13+
<WixToolPath>$(MSBuildProjectDirectory)\..\..\packages\WiX.3.11.2\tools\</WixToolPath>
1414
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
1515
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
1616
<RunWixToolsOutOfProc>true</RunWixToolsOutOfProc>
@@ -59,7 +59,7 @@
5959
</WixExtension>
6060
</ItemGroup>
6161
<PropertyGroup>
62-
<WixToolPath>$(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\</WixToolPath>
62+
<WixToolPath>$(SolutionDir)packages\WiX.3.11.2\tools\</WixToolPath>
6363
<WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
6464
<WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
6565
</PropertyGroup>

Loginator/Loginator.csproj

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\WiX.3.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -14,6 +15,8 @@
1415
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1516
<WarningLevel>4</WarningLevel>
1617
<TargetFrameworkProfile />
18+
<NuGetPackageImportStamp>
19+
</NuGetPackageImportStamp>
1720
</PropertyGroup>
1821
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1922
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -149,7 +152,9 @@
149152
<SubType>Designer</SubType>
150153
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
151154
</None>
152-
<None Include="packages.config" />
155+
<None Include="packages.config">
156+
<SubType>Designer</SubType>
157+
</None>
153158
<None Include="Properties\Settings.settings">
154159
<Generator>SettingsSingleFileGenerator</Generator>
155160
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -178,6 +183,12 @@
178183
<Resource Include="icon.ico" />
179184
</ItemGroup>
180185
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
186+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
187+
<PropertyGroup>
188+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
189+
</PropertyGroup>
190+
<Error Condition="!Exists('..\packages\WiX.3.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
191+
</Target>
181192
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
182193
Other similar extension points exist, see Microsoft.Common.targets.
183194
<Target Name="BeforeBuild">

Loginator/Version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
versionCode=7
1+
versionCode=8
22
versionName=1.6.0

Loginator/packages.config

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@
66
<package id="MvvmLightLibs" version="5.2.0.0" targetFramework="net45" />
77
<package id="NLog" version="4.1.0" targetFramework="net45" />
88
<package id="structuremap" version="3.1.6.186" targetFramework="net45" />
9+
<package id="WiX" version="3.11.2" targetFramework="net46" />
910
</packages>
Binary file not shown.

0 commit comments

Comments
 (0)