aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2017-09-17 15:20:50 -0700
committerRob Mensching <rob@firegiant.com>2017-09-17 15:20:50 -0700
commitf35f0d078762a48687b29ac224278a7defd5325a (patch)
tree30573e5e749bef624b00d75c08696199f21ec649
parent420ce71170489840376c8236da268a7747bb607b (diff)
downloadwix-f35f0d078762a48687b29ac224278a7defd5325a.tar.gz
wix-f35f0d078762a48687b29ac224278a7defd5325a.tar.bz2
wix-f35f0d078762a48687b29ac224278a7defd5325a.zip
Update to latest GitVersioning
-rw-r--r--src/dutil/dutil.vcxproj4
-rw-r--r--src/dutil/packages.config2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/dutil/dutil.vcxproj b/src/dutil/dutil.vcxproj
index 38608953..46002b82 100644
--- a/src/dutil/dutil.vcxproj
+++ b/src/dutil/dutil.vcxproj
@@ -53,7 +53,7 @@
53 </ImportGroup> 53 </ImportGroup>
54 54
55 <ImportGroup Label="Shared"> 55 <ImportGroup Label="Shared">
56 <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')" /> 56 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.41\build\Nerdbank.GitVersioning.targets')" />
57 </ImportGroup> 57 </ImportGroup>
58 58
59 <Import Project="..\NativeMultiTargeting.Build.props" /> 59 <Import Project="..\NativeMultiTargeting.Build.props" />
@@ -296,6 +296,6 @@
296 <PropertyGroup> 296 <PropertyGroup>
297 <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> 297 <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>
298 </PropertyGroup> 298 </PropertyGroup>
299 <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'))" /> 299 <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'))" />
300 </Target> 300 </Target>
301</Project> \ No newline at end of file 301</Project> \ No newline at end of file
diff --git a/src/dutil/packages.config b/src/dutil/packages.config
index 191b1dee..764eba29 100644
--- a/src/dutil/packages.config
+++ b/src/dutil/packages.config
@@ -1,4 +1,4 @@
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</packages> \ No newline at end of file 4</packages> \ No newline at end of file