aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-09-17 15:22:33 -0700
committerRob Mensching <rob@firegiant.com>2017-09-17 15:22:33 -0700
commit40d64f03447d8fa187e1d23addee931025bb6f93 (patch)
treef041f5bdede0a0643d821ab2723bcf6209c9f63f /src
parent088dc648a3478e2cacdbdab1cb1782556642ee69 (diff)
downloadwix-40d64f03447d8fa187e1d23addee931025bb6f93.tar.gz
wix-40d64f03447d8fa187e1d23addee931025bb6f93.tar.bz2
wix-40d64f03447d8fa187e1d23addee931025bb6f93.zip
Update to latest GitVersioning
Diffstat (limited to 'src')
-rw-r--r--src/WixToolset.Core.Native/WixToolset.Core.Native.csproj2
-rw-r--r--src/winterop/packages.config2
-rw-r--r--src/winterop/winterop.vcxproj4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
index 858b9be2..3e66d84e 100644
--- a/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
+++ b/src/WixToolset.Core.Native/WixToolset.Core.Native.csproj
@@ -7,7 +7,7 @@
7 </PropertyGroup> 7 </PropertyGroup>
8 8
9 <ItemGroup> 9 <ItemGroup>
10 <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.37-beta" PrivateAssets="all" /> 10 <PackageReference Include="Nerdbank.GitVersioning" Version="2.0.41" PrivateAssets="all" />
11 </ItemGroup> 11 </ItemGroup>
12 12
13 <!-- <ItemGroup> 13 <!-- <ItemGroup>
diff --git a/src/winterop/packages.config b/src/winterop/packages.config
index b11fe210..02ee2250 100644
--- a/src/winterop/packages.config
+++ b/src/winterop/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.37-beta" targetFramework="native" developmentDependency="true" /> 3 <package id="Nerdbank.GitVersioning" version="2.0.41" targetFramework="native" developmentDependency="true" />
4 <package id="WixToolset.DUtil" version="4.0.3" targetFramework="native" /> 4 <package id="WixToolset.DUtil" version="4.0.3" targetFramework="native" />
5</packages> \ No newline at end of file 5</packages> \ No newline at end of file
diff --git a/src/winterop/winterop.vcxproj b/src/winterop/winterop.vcxproj
index 6274a063..4c606656 100644
--- a/src/winterop/winterop.vcxproj
+++ b/src/winterop/winterop.vcxproj
@@ -68,12 +68,12 @@
68 </Target> 68 </Target>
69 69
70 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 70 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
71 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" /> 71 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" />
72 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 72 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
73 <PropertyGroup> 73 <PropertyGroup>
74 <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> 74 <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>
75 </PropertyGroup> 75 </PropertyGroup>
76 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props'))" /> 76 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.3\build\WixToolset.DUtil.props'))" />
77 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets'))" /> 77 <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'))" />
78 </Target> 78 </Target>
79</Project> 79</Project>