diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 09:46:31 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 20:55:41 +1000 |
| commit | 431ac2dcd9823fa0abbbcb16b833a83e3bd4faf9 (patch) | |
| tree | 2b1c7c46ce0b1ce563a418f2396385e90a19e808 /src | |
| parent | 4a30b5af2909452db7995b75406c45429c85f4ef (diff) | |
| download | wix-431ac2dcd9823fa0abbbcb16b833a83e3bd4faf9.tar.gz wix-431ac2dcd9823fa0abbbcb16b833a83e3bd4faf9.tar.bz2 wix-431ac2dcd9823fa0abbbcb16b833a83e3bd4faf9.zip | |
Add SourceLink to C++ projects.
Diffstat (limited to 'src')
| -rw-r--r-- | src/thmviewer/packages.config | 3 | ||||
| -rw-r--r-- | src/thmviewer/thmviewer.vcxproj | 15 | ||||
| -rw-r--r-- | src/thmviewer/thmviewer.vcxproj.filters | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/src/thmviewer/packages.config b/src/thmviewer/packages.config index 38ce9597..f3abcd35 100644 --- a/src/thmviewer/packages.config +++ b/src/thmviewer/packages.config | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 4 | <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 5 | <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" /> | ||
| 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> | 6 | <package id="Nerdbank.GitVersioning" version="2.1.65" targetFramework="native" developmentDependency="true" /> |
| 4 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> | 7 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> |
| 5 | </packages> \ No newline at end of file | 8 | </packages> \ No newline at end of file |
diff --git a/src/thmviewer/thmviewer.vcxproj b/src/thmviewer/thmviewer.vcxproj index 47b72f78..fb9908e6 100644 --- a/src/thmviewer/thmviewer.vcxproj +++ b/src/thmviewer/thmviewer.vcxproj | |||
| @@ -2,6 +2,9 @@ | |||
| 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 | 3 | ||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" /> | ||
| 6 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" /> | ||
| 7 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" /> | ||
| 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | 8 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
| 6 | 9 | ||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 10 | <ItemGroup Label="ProjectConfigurations"> |
| @@ -50,6 +53,7 @@ | |||
| 50 | <ClInclude Include="resource.h" /> | 53 | <ClInclude Include="resource.h" /> |
| 51 | </ItemGroup> | 54 | </ItemGroup> |
| 52 | <ItemGroup> | 55 | <ItemGroup> |
| 56 | <None Include="packages.config" /> | ||
| 53 | <None Include="Resources\LoremIpsum.rtf" /> | 57 | <None Include="Resources\LoremIpsum.rtf" /> |
| 54 | <None Include="Resources\thm.xml" /> | 58 | <None Include="Resources\thm.xml" /> |
| 55 | </ItemGroup> | 59 | </ItemGroup> |
| @@ -62,6 +66,9 @@ | |||
| 62 | 66 | ||
| 63 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 67 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 64 | <ImportGroup Label="ExtensionTargets"> | 68 | <ImportGroup Label="ExtensionTargets"> |
| 69 | <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" /> | ||
| 70 | <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" /> | ||
| 71 | <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" /> | ||
| 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')" /> | 72 | <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> | 73 | </ImportGroup> |
| 67 | 74 | ||
| @@ -69,7 +76,13 @@ | |||
| 69 | <PropertyGroup> | 76 | <PropertyGroup> |
| 70 | <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> | 77 | <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> |
| 71 | </PropertyGroup> | 78 | </PropertyGroup> |
| 79 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" /> | ||
| 80 | <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" /> | ||
| 81 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" /> | ||
| 82 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" /> | ||
| 83 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" /> | ||
| 84 | <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" /> | ||
| 72 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> | 85 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" /> |
| 73 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> | 86 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> |
| 74 | </Target> | 87 | </Target> |
| 75 | </Project> | 88 | </Project> \ No newline at end of file |
diff --git a/src/thmviewer/thmviewer.vcxproj.filters b/src/thmviewer/thmviewer.vcxproj.filters index 9a1eff3f..488d5510 100644 --- a/src/thmviewer/thmviewer.vcxproj.filters +++ b/src/thmviewer/thmviewer.vcxproj.filters | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | <None Include="Resources\LoremIpsum.rtf"> | 35 | <None Include="Resources\LoremIpsum.rtf"> |
| 36 | <Filter>Resource Files</Filter> | 36 | <Filter>Resource Files</Filter> |
| 37 | </None> | 37 | </None> |
| 38 | <None Include="packages.config" /> | ||
| 38 | </ItemGroup> | 39 | </ItemGroup> |
| 39 | <ItemGroup> | 40 | <ItemGroup> |
| 40 | <ClInclude Include="precomp.h"> | 41 | <ClInclude Include="precomp.h"> |
