diff options
author | Rob Mensching <rob@firegiant.com> | 2017-12-29 04:55:28 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2017-12-29 04:56:13 -0800 |
commit | cba9d16b54cd4ba5b8750ee97ed5aa36cf1fc382 (patch) | |
tree | 682423fc77e7f80cf727a91e9e6f3be7118be503 /src/wixlib | |
parent | e2d15ce225cbd9cd3e815cb9999f8896f8c610bf (diff) | |
download | wix-cba9d16b54cd4ba5b8750ee97ed5aa36cf1fc382.tar.gz wix-cba9d16b54cd4ba5b8750ee97ed5aa36cf1fc382.tar.bz2 wix-cba9d16b54cd4ba5b8750ee97ed5aa36cf1fc382.zip |
Update to latest changes from Core and send build notifications to Slack
Diffstat (limited to 'src/wixlib')
-rw-r--r-- | src/wixlib/packages.config | 4 | ||||
-rw-r--r-- | src/wixlib/vs.wixproj | 18 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 7120dc24..09c3a290 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config | |||
@@ -1,5 +1,5 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="Nerdbank.GitVersioning" version="2.0.41" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.7" developmentDependency="true" targetFramework="net40" /> |
4 | <package id="WixToolset.Core.InternalPackage" version="4.0.15" targetFramework="net40" developmentDependency="true" /> | 4 | <package id="WixToolset.Core.InternalPackage" version="4.0.57" targetFramework="net40" developmentDependency="true" /> |
5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
diff --git a/src/wixlib/vs.wixproj b/src/wixlib/vs.wixproj index 15dd5092..c5613bb4 100644 --- a/src/wixlib/vs.wixproj +++ b/src/wixlib/vs.wixproj | |||
@@ -1,10 +1,8 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
3 | |||
4 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> | 3 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> |
5 | <Import Project="..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props" Condition="Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.Core.InternalPackage.4.0.57\build\WixToolset.Core.InternalPackage.props" Condition="Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.57\build\WixToolset.Core.InternalPackage.props')" /> |
6 | <Import Project="..\FindLocalWix.props" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
7 | |||
8 | <PropertyGroup> | 6 | <PropertyGroup> |
9 | <ProjectGuid>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid> | 7 | <ProjectGuid>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid> |
10 | <OutputName>vs</OutputName> | 8 | <OutputName>vs</OutputName> |
@@ -13,7 +11,6 @@ | |||
13 | <Pedantic>true</Pedantic> | 11 | <Pedantic>true</Pedantic> |
14 | <Cultures>en-us</Cultures> | 12 | <Cultures>en-us</Cultures> |
15 | </PropertyGroup> | 13 | </PropertyGroup> |
16 | |||
17 | <ItemGroup> | 14 | <ItemGroup> |
18 | <Compile Include="HTML_Help_Registration__RTL_X86.wxs" /> | 15 | <Compile Include="HTML_Help_Registration__RTL_X86.wxs" /> |
19 | <Compile Include="Vs2003.wxs" /> | 16 | <Compile Include="Vs2003.wxs" /> |
@@ -31,35 +28,30 @@ | |||
31 | <Compile Include="vs2005\vs2005_VSIPCC_Collection_Files_RTL.wxs" /> | 28 | <Compile Include="vs2005\vs2005_VSIPCC_Collection_Files_RTL.wxs" /> |
32 | <Compile Include="vs2008\vs2008_VSIPCC_Collection_Files_RTL.wxs" /> | 29 | <Compile Include="vs2008\vs2008_VSIPCC_Collection_Files_RTL.wxs" /> |
33 | </ItemGroup> | 30 | </ItemGroup> |
34 | |||
35 | <ItemGroup> | 31 | <ItemGroup> |
36 | <Folder Include="vs2005\" /> | 32 | <Folder Include="vs2005\" /> |
37 | <Folder Include="vs2008\" /> | 33 | <Folder Include="vs2008\" /> |
38 | </ItemGroup> | 34 | </ItemGroup> |
39 | |||
40 | <ItemGroup> | 35 | <ItemGroup> |
41 | <None Include="packages.config" /> | 36 | <None Include="packages.config" /> |
42 | </ItemGroup> | 37 | </ItemGroup> |
43 | |||
44 | <ItemGroup> | 38 | <ItemGroup> |
45 | <ProjectReference Include="..\ca\vsca.vcxproj"> | 39 | <ProjectReference Include="..\ca\vsca.vcxproj"> |
46 | <Name>vsca</Name> | 40 | <Name>vsca</Name> |
47 | <Project>{45308b85-0628-4978-8fc8-6ad9e1ad5949}</Project> | 41 | <Project>{45308b85-0628-4978-8fc8-6ad9e1ad5949}</Project> |
48 | </ProjectReference> | 42 | </ProjectReference> |
49 | </ItemGroup> | 43 | </ItemGroup> |
50 | |||
51 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " /> | 44 | <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " /> |
52 | <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " /> | 45 | <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " /> |
53 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> | 46 | <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' "> |
54 | <Error Text="FG-WiX or WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download FG-WiX, go to https://www.firegiant.com/downloads/. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> | 47 | <Error Text="FG-WiX or WiX Toolset build tools (v3.11 or later) must be installed to build this project. To download FG-WiX, go to https://www.firegiant.com/downloads/. To download the WiX Toolset, go to http://wixtoolset.org/releases/." /> |
55 | </Target> | 48 | </Target> |
56 | |||
57 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 49 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
58 | <PropertyGroup> | 50 | <PropertyGroup> |
59 | <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> | 51 | <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> |
60 | </PropertyGroup> | 52 | </PropertyGroup> |
61 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets'))" /> | 53 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets'))" /> |
62 | <Error Condition="!Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Core.InternalPackage.4.0.15\build\WixToolset.Core.InternalPackage.props'))" /> | 54 | <Error Condition="!Exists('..\..\packages\WixToolset.Core.InternalPackage.4.0.57\build\WixToolset.Core.InternalPackage.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Core.InternalPackage.4.0.57\build\WixToolset.Core.InternalPackage.props'))" /> |
63 | </Target> | 55 | </Target> |
64 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" /> | 56 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.7\build\Nerdbank.GitVersioning.targets')" /> |
65 | </Project> | 57 | </Project> \ No newline at end of file |