@joebigelow / wix / commits / 6435d26c

Set each native library dependency version to the build version.

Sean Hall committed Apr 19, 2022 at 16:03 UTC 6435d26c7e2ce54ec38d0cc9eb4d2cb10e9614e0
22 files changed +5 -36
src/api/burn/balutil/balutil.nuspec
+2 -2
@@ -12,8 +12,8 @@
12 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies>
15 - <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
16 - <dependency id="WixToolset.DUtil" version="[4,5)" />
15 + <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />
16 + <dependency id="WixToolset.DUtil" version="[$version$,5)" />
17 </dependencies>
18 </metadata>
19
src/api/burn/bextutil/bextutil.nuspec
+2 -2
@@ -12,8 +12,8 @@
12 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies>
15 - <dependency id="WixToolset.BootstrapperCore.Native" version="[4,5)" />
16 - <dependency id="WixToolset.DUtil" version="[4,5)" />
15 + <dependency id="WixToolset.BootstrapperCore.Native" version="[$version$,5)" />
16 + <dependency id="WixToolset.DUtil" version="[$version$,5)" />
17 </dependencies>
18 </metadata>
19
src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj
-2
@@ -60,9 +60,7 @@
60 </ItemGroup>
61
62 <ItemGroup>
63 - <PackageReference Include="WixToolset.Dutil" />
63 <PackageReference Include="WixToolset.BalUtil" />
65 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
64
65 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
66 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Bal/dnchost/dnchost.vcxproj
-2
@@ -89,9 +89,7 @@
89 </ItemGroup>
90
91 <ItemGroup>
92 - <PackageReference Include="WixToolset.Dutil" />
92 <PackageReference Include="WixToolset.BalUtil" />
94 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
93
94 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
95 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Bal/mbahost/mbahost.vcxproj
-2
@@ -67,9 +67,7 @@
67 </ItemGroup>
68
69 <ItemGroup>
70 - <PackageReference Include="WixToolset.Dutil" />
70 <PackageReference Include="WixToolset.BalUtil" />
72 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
71
72 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
73 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
-2
@@ -61,9 +61,7 @@
61 </ItemGroup>
62
63 <ItemGroup>
64 - <PackageReference Include="WixToolset.Dutil" />
64 <PackageReference Include="WixToolset.BalUtil" />
66 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
65
66 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
67 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Bal/wixstdba/wixstdba.vcxproj
-2
@@ -71,9 +71,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
71 </ItemGroup>
72
73 <ItemGroup>
74 - <PackageReference Include="WixToolset.Dutil" />
74 <PackageReference Include="WixToolset.BalUtil" />
76 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
75
76 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
77 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/ComPlus/ca/complusca.vcxproj
-1
@@ -91,7 +91,6 @@
91 </ItemGroup>
92
93 <ItemGroup>
94 - <PackageReference Include="WixToolset.Dutil" />
94 <PackageReference Include="WixToolset.WcaUtil" />
95 <PackageReference Include="Microsoft.SourceLink.GitHub" />
96 <PackageReference Include="GitInfo" />
src/ext/Dependency/ca/dependencyca.vcxproj
-1
@@ -61,7 +61,6 @@
61 </ItemGroup>
62
63 <ItemGroup>
64 - <PackageReference Include="WixToolset.Dutil" />
64 <PackageReference Include="WixToolset.WcaUtil" />
65 <PackageReference Include="Microsoft.SourceLink.GitHub" />
66 <PackageReference Include="GitInfo" />
src/ext/DirectX/ca/directxca.vcxproj
-1
@@ -56,7 +56,6 @@
56 </ItemGroup>
57
58 <ItemGroup>
59 - <PackageReference Include="WixToolset.Dutil" />
59 <PackageReference Include="WixToolset.WcaUtil" />
60 <PackageReference Include="Microsoft.SourceLink.GitHub" />
61 <PackageReference Include="GitInfo" />
src/ext/Firewall/ca/fwca.vcxproj
-1
@@ -65,7 +65,6 @@
65 </ItemGroup>
66
67 <ItemGroup>
68 - <PackageReference Include="WixToolset.Dutil" />
68 <PackageReference Include="WixToolset.WcaUtil" />
69 <PackageReference Include="Microsoft.SourceLink.GitHub" />
70 <PackageReference Include="GitInfo" />
src/ext/Http/ca/httpca.vcxproj
-1
@@ -63,7 +63,6 @@
63 </ItemGroup>
64
65 <ItemGroup>
66 - <PackageReference Include="WixToolset.Dutil" />
66 <PackageReference Include="WixToolset.WcaUtil" />
67 <PackageReference Include="Microsoft.SourceLink.GitHub" />
68 <PackageReference Include="GitInfo" />
src/ext/Iis/ca/iisca.vcxproj
-4
@@ -1,9 +1,6 @@
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. -->
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 -
4 <ItemGroup Label="ProjectConfigurations">
5 <ProjectConfiguration Include="Debug|Win32">
6 <Configuration>Debug</Configuration>
@@ -140,7 +137,6 @@
137 </ItemGroup>
138
139 <ItemGroup>
143 - <PackageReference Include="WixToolset.Dutil" />
140 <PackageReference Include="WixToolset.WcaUtil" />
141 <PackageReference Include="Microsoft.SourceLink.GitHub" />
142 <PackageReference Include="GitInfo" />
src/ext/Msmq/ca/msmqca.vcxproj
-3
@@ -1,8 +1,6 @@
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. -->
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')" />
4 <ItemGroup Label="ProjectConfigurations">
5 <ProjectConfiguration Include="Debug|Win32">
6 <Configuration>Debug</Configuration>
@@ -63,7 +61,6 @@
61 <None Include="msmqca.def" />
62 </ItemGroup>
63 <ItemGroup>
66 - <PackageReference Include="WixToolset.Dutil" />
64 <PackageReference Include="WixToolset.WcaUtil" />
65 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
66 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/NetFx/ca/netfxca.vcxproj
-1
@@ -62,7 +62,6 @@
62 </ItemGroup>
63
64 <ItemGroup>
65 - <PackageReference Include="WixToolset.Dutil" />
65 <PackageReference Include="WixToolset.WcaUtil" />
66 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
67 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Sql/ca/sqlca.vcxproj
-1
@@ -72,7 +72,6 @@
72 </ItemGroup>
73
74 <ItemGroup>
75 - <PackageReference Include="WixToolset.Dutil" />
75 <PackageReference Include="WixToolset.WcaUtil" />
76 <PackageReference Include="Microsoft.SourceLink.GitHub" />
77 <PackageReference Include="GitInfo" />
src/ext/UI/ca/uica.vcxproj
-1
@@ -63,7 +63,6 @@
63 </ItemGroup>
64
65 <ItemGroup>
66 - <PackageReference Include="WixToolset.Dutil" />
66 <PackageReference Include="WixToolset.WcaUtil" />
67 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
68 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Util/be/utilbe.vcxproj
-2
@@ -68,9 +68,7 @@
68 </ItemGroup>
69
70 <ItemGroup>
71 - <PackageReference Include="WixToolset.DUtil" />
71 <PackageReference Include="WixToolset.BextUtil" />
73 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
72
73 <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
74 <PackageReference Include="GitInfo" PrivateAssets="All" />
src/ext/Util/ca/utilca.vcxproj
-1
@@ -95,7 +95,6 @@
95 </ItemGroup>
96
97 <ItemGroup>
98 - <PackageReference Include="WixToolset.Dutil" />
98 <PackageReference Include="WixToolset.WcaUtil" />
99 <PackageReference Include="Microsoft.SourceLink.GitHub" />
100 <PackageReference Include="GitInfo" />
src/ext/VisualStudio/ca/vsca.vcxproj
-1
@@ -54,7 +54,6 @@
54
55 <ItemGroup>
56 <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Native" />
57 - <PackageReference Include="WixToolset.Dutil" />
57 <PackageReference Include="WixToolset.WcaUtil" />
58 <PackageReference Include="Microsoft.SourceLink.GitHub" />
59 <PackageReference Include="GitInfo" />
src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+1 -1
@@ -12,7 +12,7 @@
12 <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 <dependencies>
15 - <dependency id="WixToolset.DUtil" version="[4,5)" />
15 + <dependency id="WixToolset.DUtil" version="[$version$,5)" />
16 </dependencies>
17 </metadata>
18
src/test/burn/TestData/Manual/BafThmutilTesting/BafThmUtilTesting.vcxproj
-2
@@ -62,9 +62,7 @@
62 </ItemGroup>
63
64 <ItemGroup>
65 - <PackageReference Include="WixToolset.Dutil" />
65 <PackageReference Include="WixToolset.BalUtil" />
67 - <PackageReference Include="WixToolset.BootstrapperCore.Native" />
66 </ItemGroup>
67
68 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />