diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-10-18 22:38:42 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-10-24 20:17:06 -0500 |
commit | 02fa915bdabd6a25ef2e66ffdabd91e6c271211b (patch) | |
tree | 0ae12a84b24884a3135d59a3c7770b4c51073645 /src/balutil | |
parent | 1b6a4f9b4600079e829d5884f768563ed7dea5e5 (diff) | |
download | wix-02fa915bdabd6a25ef2e66ffdabd91e6c271211b.tar.gz wix-02fa915bdabd6a25ef2e66ffdabd91e6c271211b.tar.bz2 wix-02fa915bdabd6a25ef2e66ffdabd91e6c271211b.zip |
Upgrade Nerdbank.GitVersioning.
Diffstat (limited to 'src/balutil')
-rw-r--r-- | src/balutil/balutil.vcxproj | 4 | ||||
-rw-r--r-- | src/balutil/packages.config | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/balutil/balutil.vcxproj b/src/balutil/balutil.vcxproj index 7373040a..2d6d3c78 100644 --- a/src/balutil/balutil.vcxproj +++ b/src/balutil/balutil.vcxproj | |||
@@ -43,7 +43,7 @@ | |||
43 | 43 | ||
44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
46 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 46 | <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" /> |
47 | <Import Project="..\NativeMultiTargeting.Build.props" /> | 47 | <Import Project="..\NativeMultiTargeting.Build.props" /> |
48 | 48 | ||
49 | <ImportGroup Label="ExtensionSettings"> | 49 | <ImportGroup Label="ExtensionSettings"> |
@@ -100,6 +100,6 @@ | |||
100 | </PropertyGroup> | 100 | </PropertyGroup> |
101 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props'))" /> | 101 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.37\build\WixToolset.BootstrapperCore.Native.props'))" /> |
102 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props'))" /> | 102 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.55\build\WixToolset.DUtil.props'))" /> |
103 | <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'))" /> | 103 | <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" /> |
104 | </Target> | 104 | </Target> |
105 | </Project> | 105 | </Project> |
diff --git a/src/balutil/packages.config b/src/balutil/packages.config index be1bf8e2..8eafbc78 100644 --- a/src/balutil/packages.config +++ b/src/balutil/packages.config | |||
@@ -1,6 +1,6 @@ | |||
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.1.65" targetFramework="native" developmentDependency="true" /> | 3 | <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.37" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.37" targetFramework="native" /> |
5 | <package id="WixToolset.DUtil" version="4.0.55" targetFramework="native" /> | 5 | <package id="WixToolset.DUtil" version="4.0.55" targetFramework="native" /> |
6 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |