diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-04-19 16:03:02 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-04-19 18:35:15 -0500 |
| commit | 6435d26c7e2ce54ec38d0cc9eb4d2cb10e9614e0 (patch) | |
| tree | cfe3ac420978e599acd801d31edc3657c5cca613 | |
| parent | a4e1d547d22d8226a7911605439d5abb15c61465 (diff) | |
| download | wix-6435d26c7e2ce54ec38d0cc9eb4d2cb10e9614e0.tar.gz wix-6435d26c7e2ce54ec38d0cc9eb4d2cb10e9614e0.tar.bz2 wix-6435d26c7e2ce54ec38d0cc9eb4d2cb10e9614e0.zip | |
Set each native library dependency version to the build version.
22 files changed, 5 insertions, 36 deletions
diff --git a/src/api/burn/balutil/balutil.nuspec b/src/api/burn/balutil/balutil.nuspec index 19c160cf..666e47d0 100644 --- a/src/api/burn/balutil/balutil.nuspec +++ b/src/api/burn/balutil/balutil.nuspec | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | <projectUrl>$projectUrl$</projectUrl> | 12 | <projectUrl>$projectUrl$</projectUrl> |
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> |
| 14 | <dependencies> | 14 | <dependencies> |
| 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> | 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" /> |
| 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 16 | <dependency id="WixToolset.DUtil" version="[$version$,5)" /> |
| 17 | </dependencies> | 17 | </dependencies> |
| 18 | </metadata> | 18 | </metadata> |
| 19 | 19 | ||
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec index 137c39e1..1ce2c7fb 100644 --- a/src/api/burn/bextutil/bextutil.nuspec +++ b/src/api/burn/bextutil/bextutil.nuspec | |||
| @@ -12,8 +12,8 @@ | |||
| 12 | <projectUrl>$projectUrl$</projectUrl> | 12 | <projectUrl>$projectUrl$</projectUrl> |
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> |
| 14 | <dependencies> | 14 | <dependencies> |
| 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" /> | 15 | <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" /> |
| 16 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 16 | <dependency id="WixToolset.DUtil" version="[$version$,5)" /> |
| 17 | </dependencies> | 17 | </dependencies> |
| 18 | </metadata> | 18 | </metadata> |
| 19 | 19 | ||
diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj index 9ed8eb2b..a294a608 100644 --- a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj | |||
| @@ -60,9 +60,7 @@ | |||
| 60 | </ItemGroup> | 60 | </ItemGroup> |
| 61 | 61 | ||
| 62 | <ItemGroup> | 62 | <ItemGroup> |
| 63 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 64 | <PackageReference Include="WixToolset.BalUtil" /> | 63 | <PackageReference Include="WixToolset.BalUtil" /> |
| 65 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 66 | 64 | ||
| 67 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 65 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 68 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 66 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj index 5cec50af..66e52c6f 100644 --- a/src/ext/Bal/dnchost/dnchost.vcxproj +++ b/src/ext/Bal/dnchost/dnchost.vcxproj | |||
| @@ -89,9 +89,7 @@ | |||
| 89 | </ItemGroup> | 89 | </ItemGroup> |
| 90 | 90 | ||
| 91 | <ItemGroup> | 91 | <ItemGroup> |
| 92 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 93 | <PackageReference Include="WixToolset.BalUtil" /> | 92 | <PackageReference Include="WixToolset.BalUtil" /> |
| 94 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 95 | 93 | ||
| 96 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 94 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 97 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 95 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj index ababf19c..cd90776b 100644 --- a/src/ext/Bal/mbahost/mbahost.vcxproj +++ b/src/ext/Bal/mbahost/mbahost.vcxproj | |||
| @@ -67,9 +67,7 @@ | |||
| 67 | </ItemGroup> | 67 | </ItemGroup> |
| 68 | 68 | ||
| 69 | <ItemGroup> | 69 | <ItemGroup> |
| 70 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 71 | <PackageReference Include="WixToolset.BalUtil" /> | 70 | <PackageReference Include="WixToolset.BalUtil" /> |
| 72 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 73 | 71 | ||
| 74 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 72 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 75 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 73 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj index 68e66741..1ce5737c 100644 --- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj | |||
| @@ -61,9 +61,7 @@ | |||
| 61 | </ItemGroup> | 61 | </ItemGroup> |
| 62 | 62 | ||
| 63 | <ItemGroup> | 63 | <ItemGroup> |
| 64 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 65 | <PackageReference Include="WixToolset.BalUtil" /> | 64 | <PackageReference Include="WixToolset.BalUtil" /> |
| 66 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 67 | 65 | ||
| 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 66 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 69 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 67 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj index 85d90e77..a43cc345 100644 --- a/src/ext/Bal/wixstdba/wixstdba.vcxproj +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj | |||
| @@ -71,9 +71,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command> | |||
| 71 | </ItemGroup> | 71 | </ItemGroup> |
| 72 | 72 | ||
| 73 | <ItemGroup> | 73 | <ItemGroup> |
| 74 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 75 | <PackageReference Include="WixToolset.BalUtil" /> | 74 | <PackageReference Include="WixToolset.BalUtil" /> |
| 76 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 77 | 75 | ||
| 78 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 76 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 79 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 77 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/ComPlus/ca/complusca.vcxproj b/src/ext/ComPlus/ca/complusca.vcxproj index 696f7dd8..39264f98 100644 --- a/src/ext/ComPlus/ca/complusca.vcxproj +++ b/src/ext/ComPlus/ca/complusca.vcxproj | |||
| @@ -91,7 +91,6 @@ | |||
| 91 | </ItemGroup> | 91 | </ItemGroup> |
| 92 | 92 | ||
| 93 | <ItemGroup> | 93 | <ItemGroup> |
| 94 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 95 | <PackageReference Include="WixToolset.WcaUtil" /> | 94 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 96 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 95 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 97 | <PackageReference Include="GitInfo" /> | 96 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/Dependency/ca/dependencyca.vcxproj b/src/ext/Dependency/ca/dependencyca.vcxproj index b84321df..0913d899 100644 --- a/src/ext/Dependency/ca/dependencyca.vcxproj +++ b/src/ext/Dependency/ca/dependencyca.vcxproj | |||
| @@ -61,7 +61,6 @@ | |||
| 61 | </ItemGroup> | 61 | </ItemGroup> |
| 62 | 62 | ||
| 63 | <ItemGroup> | 63 | <ItemGroup> |
| 64 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 65 | <PackageReference Include="WixToolset.WcaUtil" /> | 64 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 66 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 65 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 67 | <PackageReference Include="GitInfo" /> | 66 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/DirectX/ca/directxca.vcxproj b/src/ext/DirectX/ca/directxca.vcxproj index 54837271..e9faff16 100644 --- a/src/ext/DirectX/ca/directxca.vcxproj +++ b/src/ext/DirectX/ca/directxca.vcxproj | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | </ItemGroup> | 56 | </ItemGroup> |
| 57 | 57 | ||
| 58 | <ItemGroup> | 58 | <ItemGroup> |
| 59 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 60 | <PackageReference Include="WixToolset.WcaUtil" /> | 59 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 61 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 60 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 62 | <PackageReference Include="GitInfo" /> | 61 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/Firewall/ca/fwca.vcxproj b/src/ext/Firewall/ca/fwca.vcxproj index 11170675..dd98574a 100644 --- a/src/ext/Firewall/ca/fwca.vcxproj +++ b/src/ext/Firewall/ca/fwca.vcxproj | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | </ItemGroup> | 65 | </ItemGroup> |
| 66 | 66 | ||
| 67 | <ItemGroup> | 67 | <ItemGroup> |
| 68 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 69 | <PackageReference Include="WixToolset.WcaUtil" /> | 68 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 70 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 69 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 71 | <PackageReference Include="GitInfo" /> | 70 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/Http/ca/httpca.vcxproj b/src/ext/Http/ca/httpca.vcxproj index 2614275f..31f781f6 100644 --- a/src/ext/Http/ca/httpca.vcxproj +++ b/src/ext/Http/ca/httpca.vcxproj | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | </ItemGroup> | 63 | </ItemGroup> |
| 64 | 64 | ||
| 65 | <ItemGroup> | 65 | <ItemGroup> |
| 66 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 67 | <PackageReference Include="WixToolset.WcaUtil" /> | 66 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 67 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 69 | <PackageReference Include="GitInfo" /> | 68 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/Iis/ca/iisca.vcxproj b/src/ext/Iis/ca/iisca.vcxproj index de3ef83e..7e4a1a3e 100644 --- a/src/ext/Iis/ca/iisca.vcxproj +++ b/src/ext/Iis/ca/iisca.vcxproj | |||
| @@ -1,9 +1,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" /> | ||
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> | ||
| 6 | |||
| 7 | <ItemGroup Label="ProjectConfigurations"> | 4 | <ItemGroup Label="ProjectConfigurations"> |
| 8 | <ProjectConfiguration Include="Debug|Win32"> | 5 | <ProjectConfiguration Include="Debug|Win32"> |
| 9 | <Configuration>Debug</Configuration> | 6 | <Configuration>Debug</Configuration> |
| @@ -140,7 +137,6 @@ | |||
| 140 | </ItemGroup> | 137 | </ItemGroup> |
| 141 | 138 | ||
| 142 | <ItemGroup> | 139 | <ItemGroup> |
| 143 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 144 | <PackageReference Include="WixToolset.WcaUtil" /> | 140 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 145 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 141 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 146 | <PackageReference Include="GitInfo" /> | 142 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/Msmq/ca/msmqca.vcxproj b/src/ext/Msmq/ca/msmqca.vcxproj index 0e712f63..8460179d 100644 --- a/src/ext/Msmq/ca/msmqca.vcxproj +++ b/src/ext/Msmq/ca/msmqca.vcxproj | |||
| @@ -1,8 +1,6 @@ | |||
| 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 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.0-preview.0-build.1\build\WixToolset.DUtil.props')" /> | ||
| 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" /> | ||
| 6 | <ItemGroup Label="ProjectConfigurations"> | 4 | <ItemGroup Label="ProjectConfigurations"> |
| 7 | <ProjectConfiguration Include="Debug|Win32"> | 5 | <ProjectConfiguration Include="Debug|Win32"> |
| 8 | <Configuration>Debug</Configuration> | 6 | <Configuration>Debug</Configuration> |
| @@ -63,7 +61,6 @@ | |||
| 63 | <None Include="msmqca.def" /> | 61 | <None Include="msmqca.def" /> |
| 64 | </ItemGroup> | 62 | </ItemGroup> |
| 65 | <ItemGroup> | 63 | <ItemGroup> |
| 66 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 67 | <PackageReference Include="WixToolset.WcaUtil" /> | 64 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 65 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 69 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 66 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/NetFx/ca/netfxca.vcxproj b/src/ext/NetFx/ca/netfxca.vcxproj index 7b0f731a..93276ea1 100644 --- a/src/ext/NetFx/ca/netfxca.vcxproj +++ b/src/ext/NetFx/ca/netfxca.vcxproj | |||
| @@ -62,7 +62,6 @@ | |||
| 62 | </ItemGroup> | 62 | </ItemGroup> |
| 63 | 63 | ||
| 64 | <ItemGroup> | 64 | <ItemGroup> |
| 65 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 66 | <PackageReference Include="WixToolset.WcaUtil" /> | 65 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 67 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 66 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 68 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 67 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Sql/ca/sqlca.vcxproj b/src/ext/Sql/ca/sqlca.vcxproj index 9a5df8cf..dee6e8fb 100644 --- a/src/ext/Sql/ca/sqlca.vcxproj +++ b/src/ext/Sql/ca/sqlca.vcxproj | |||
| @@ -72,7 +72,6 @@ | |||
| 72 | </ItemGroup> | 72 | </ItemGroup> |
| 73 | 73 | ||
| 74 | <ItemGroup> | 74 | <ItemGroup> |
| 75 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 76 | <PackageReference Include="WixToolset.WcaUtil" /> | 75 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 77 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 76 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 78 | <PackageReference Include="GitInfo" /> | 77 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/UI/ca/uica.vcxproj b/src/ext/UI/ca/uica.vcxproj index 27f0faa7..17e39046 100644 --- a/src/ext/UI/ca/uica.vcxproj +++ b/src/ext/UI/ca/uica.vcxproj | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | </ItemGroup> | 63 | </ItemGroup> |
| 64 | 64 | ||
| 65 | <ItemGroup> | 65 | <ItemGroup> |
| 66 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 67 | <PackageReference Include="WixToolset.WcaUtil" /> | 66 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 68 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 67 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 69 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 68 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Util/be/utilbe.vcxproj b/src/ext/Util/be/utilbe.vcxproj index 8e139812..4e4f80d9 100644 --- a/src/ext/Util/be/utilbe.vcxproj +++ b/src/ext/Util/be/utilbe.vcxproj | |||
| @@ -68,9 +68,7 @@ | |||
| 68 | </ItemGroup> | 68 | </ItemGroup> |
| 69 | 69 | ||
| 70 | <ItemGroup> | 70 | <ItemGroup> |
| 71 | <PackageReference Include="WixToolset.DUtil" /> | ||
| 72 | <PackageReference Include="WixToolset.BextUtil" /> | 71 | <PackageReference Include="WixToolset.BextUtil" /> |
| 73 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 74 | 72 | ||
| 75 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> | 73 | <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" /> |
| 76 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | 74 | <PackageReference Include="GitInfo" PrivateAssets="All" /> |
diff --git a/src/ext/Util/ca/utilca.vcxproj b/src/ext/Util/ca/utilca.vcxproj index b3998b6e..d8f086b5 100644 --- a/src/ext/Util/ca/utilca.vcxproj +++ b/src/ext/Util/ca/utilca.vcxproj | |||
| @@ -95,7 +95,6 @@ | |||
| 95 | </ItemGroup> | 95 | </ItemGroup> |
| 96 | 96 | ||
| 97 | <ItemGroup> | 97 | <ItemGroup> |
| 98 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 99 | <PackageReference Include="WixToolset.WcaUtil" /> | 98 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 100 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 99 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 101 | <PackageReference Include="GitInfo" /> | 100 | <PackageReference Include="GitInfo" /> |
diff --git a/src/ext/VisualStudio/ca/vsca.vcxproj b/src/ext/VisualStudio/ca/vsca.vcxproj index 4636204f..2ddff8d3 100644 --- a/src/ext/VisualStudio/ca/vsca.vcxproj +++ b/src/ext/VisualStudio/ca/vsca.vcxproj | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | 54 | ||
| 55 | <ItemGroup> | 55 | <ItemGroup> |
| 56 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" /> | 56 | <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" /> |
| 57 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 58 | <PackageReference Include="WixToolset.WcaUtil" /> | 57 | <PackageReference Include="WixToolset.WcaUtil" /> |
| 59 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> | 58 | <PackageReference Include="Microsoft.SourceLink.GitHub" /> |
| 60 | <PackageReference Include="GitInfo" /> | 59 | <PackageReference Include="GitInfo" /> |
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec index 8aa9827e..ad724e63 100644 --- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec +++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <projectUrl>$projectUrl$</projectUrl> | 12 | <projectUrl>$projectUrl$</projectUrl> |
| 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> | 13 | <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" /> |
| 14 | <dependencies> | 14 | <dependencies> |
| 15 | <dependency id="WixToolset.DUtil" version="[4,5)" /> | 15 | <dependency id="WixToolset.DUtil" version="[$version$,5)" /> |
| 16 | </dependencies> | 16 | </dependencies> |
| 17 | </metadata> | 17 | </metadata> |
| 18 | 18 | ||
diff --git a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj index cb3e14e7..88bb083b 100644 --- a/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj +++ b/src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj | |||
| @@ -62,9 +62,7 @@ | |||
| 62 | </ItemGroup> | 62 | </ItemGroup> |
| 63 | 63 | ||
| 64 | <ItemGroup> | 64 | <ItemGroup> |
| 65 | <PackageReference Include="WixToolset.Dutil" /> | ||
| 66 | <PackageReference Include="WixToolset.BalUtil" /> | 65 | <PackageReference Include="WixToolset.BalUtil" /> |
| 67 | <PackageReference Include="WixToolset.BootstrapperCore.Native" /> | ||
| 68 | </ItemGroup> | 66 | </ItemGroup> |
| 69 | 67 | ||
| 70 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 68 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |