Update to latest build infrastructure
Rob Mensching committed
Mar 3, 2021 at 13:14 UTC
f7268b6ba1fbcc25ba321205d2fdea6bd0d39b2b
10 files changed
+45
-103
appveyor.cmd
+10
-4
@@ -1,13 +1,19 @@
1
@setlocal
2
@pushd %~dp0
3
+@set _C=Release
4
+@if /i "%1"=="debug" set _C=Debug
5
4
-nuget restore || exit /b
6
+:: Restore
7
+msbuild -p:Configuration=%_C% -t:Restore || exit /b
8
6
-msbuild -p:Configuration=Release -Restore || exit /b
9
+:: Build
10
+msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
11
8
-dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b
12
+:: Test
13
+dotnet test -c %_C% --no-build src\test\WixToolsetTest.Util || exit /b
14
10
-msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
15
+:: Pack
16
+msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
17
18
@popd
19
@endlocal
global.json
+1
-1
@@ -1,6 +1,6 @@
1
{
2
"msbuild-sdks": {
3
- "WixToolset.Sdk": "4.0.0-build-0193"
3
+ "WixToolset.Sdk": "4.0.0-build-0194"
4
},
5
"sdk": {
6
"allowPrerelease": false
src/be/packages.config
deleted
-10
@@ -1,10 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
4
- <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
- <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
- <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.BextUtil" version="4.0.50" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />
9
- <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
10
-</packages>
\ No newline at end of file
src/be/utilbe.vcxproj
+18
-28
@@ -1,12 +1,7 @@
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\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
5
- <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
6
- <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
7
- <Import Project="..\..\packages\WixToolset.BextUtil.4.0.50\build\WixToolset.BextUtil.props" Condition="Exists('..\..\packages\WixToolset.BextUtil.4.0.50\build\WixToolset.BextUtil.props')" />
8
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />
9
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
3
+
4
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<ItemGroup Label="ProjectConfigurations">
6
<ProjectConfiguration Include="Debug|ARM64">
7
<Configuration>Debug</Configuration>
@@ -33,6 +28,7 @@
28
<Platform>Win32</Platform>
29
</ProjectConfiguration>
30
</ItemGroup>
31
+
32
<PropertyGroup Label="Globals">
33
<ProjectGuid>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</ProjectGuid>
34
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -42,11 +38,14 @@
38
<ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile>
39
<Description>WiX Toolset Util BundleExtension</Description>
40
</PropertyGroup>
41
+
42
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
43
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44
+
45
<PropertyGroup>
46
<ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
47
</PropertyGroup>
48
+
49
<ItemGroup>
50
<ClCompile Include="detectsha2support.cpp" />
51
<ClCompile Include="precomp.cpp">
@@ -56,6 +55,7 @@
55
<ClCompile Include="UtilBundleExtension.cpp" />
56
<ClCompile Include="utilsearch.cpp" />
57
</ItemGroup>
58
+
59
<ItemGroup>
60
<ClInclude Include="beDecor.h" />
61
<ClInclude Include="detectsha2support.h" />
@@ -63,28 +63,18 @@
63
<ClInclude Include="UtilBundleExtension.h" />
64
<ClInclude Include="utilsearch.h" />
65
</ItemGroup>
66
+
67
<ItemGroup>
67
- <None Include="packages.config" />
68
<None Include="utilbe.def" />
69
</ItemGroup>
70
+
71
+ <ItemGroup>
72
+ <PackageReference Include="WixToolset.BextUtil" Version="4.0.50" />
73
+ <PackageReference Include="WixToolset.BootstrapperCore.Native" Version="4.0.94" />
74
+ <PackageReference Include="WixToolset.DUtil" Version="4.0.64" />
75
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
76
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
77
+ </ItemGroup>
78
+
79
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
71
- <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
72
- <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
73
- <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
74
- <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
75
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
76
- <PropertyGroup>
77
- <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>
78
- </PropertyGroup>
79
- <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
80
- <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
81
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
82
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
83
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
84
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
85
- <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'))" />
86
- <Error Condition="!Exists('..\..\packages\WixToolset.BextUtil.4.0.50\build\WixToolset.BextUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BextUtil.4.0.50\build\WixToolset.BextUtil.props'))" />
87
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props'))" />
88
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
89
- </Target>
90
-</Project>
\ No newline at end of file
80
+</Project>
src/ca/packages.config
deleted
-9
@@ -1,9 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
4
- <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
5
- <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
6
- <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
7
- <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
8
- <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
9
-</packages>
\ No newline at end of file
src/ca/utilca.vcxproj
+9
-27
@@ -1,13 +1,7 @@
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
4
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />
6
- <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />
7
- <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />
8
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
9
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" />
10
-
4
+<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
<ItemGroup Label="ProjectConfigurations">
6
<ProjectConfiguration Include="Debug|ARM64">
7
<Configuration>Debug</Configuration>
@@ -97,27 +91,15 @@
91
</ItemGroup>
92
93
<ItemGroup>
100
- <None Include="packages.config" />
94
<None Include="utilca.def" />
95
</ItemGroup>
96
97
+ <ItemGroup>
98
+ <PackageReference Include="WixToolset.Dutil" Version="4.0.64" />
99
+ <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
100
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
101
+ <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
102
+ </ItemGroup>
103
+
104
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
105
- <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" />
106
- <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" />
107
- <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" />
108
- <Import Project="..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" />
109
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
110
- <PropertyGroup>
111
- <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>
112
- </PropertyGroup>
113
- <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props'))" />
114
- <Error Condition="!Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.targets'))" />
115
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props'))" />
116
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.targets'))" />
117
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />
118
- <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />
119
- <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'))" />
120
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
121
- <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props'))" />
122
- </Target>
123
-</Project>
\ No newline at end of file
105
+</Project>
src/test/WixToolsetTest.Util/UtilExtensionFixture.cs
+1
@@ -268,6 +268,7 @@ namespace WixToolsetTest.Util
268
var newArgs = args.ToList();
269
newArgs.Add("-platform");
270
newArgs.Add("x64");
271
+ newArgs.Add("-sw1072");
272
273
var result = WixRunner.Execute(newArgs.ToArray());
274
result.AssertSuccess();
src/wixext/WixToolset.Util.wixext.csproj
-10
@@ -8,13 +8,10 @@
8
<Description>WiX Toolset Utility Extension</Description>
9
<Title>WiX Toolset Util Extension</Title>
10
<DebugType>embedded</DebugType>
11
- <NuspecFile>$(MSBuildThisFileName).nuspec</NuspecFile>
11
<IncludeSymbols>true</IncludeSymbols>
13
- <NuspecProperties>Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
12
</PropertyGroup>
13
14
<ItemGroup>
17
- <Content Include="$(MSBuildThisFileName).targets" />
15
<EmbeddedResource Include="$(OutputPath)..\util.wixlib" />
16
</ItemGroup>
17
@@ -31,11 +28,4 @@
28
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
29
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
30
</ItemGroup>
34
-
35
- <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion">
36
- <PropertyGroup>
37
- <NuspecBasePath>$(OutputPath)..\</NuspecBasePath>
38
- <NuspecProperties>$(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory)</NuspecProperties>
39
- </PropertyGroup>
40
- </Target>
31
</Project>
src/wixext/WixToolset.Util.wixext.nuspec
-1
@@ -19,7 +19,6 @@
19
<file src="netstandard2.0\$id$.dll" target="tools" />
20
21
<file src="ARM64\*.pdb" target="pdbs\ARM64" />
22
- <file src="Win32\*.pdb" target="pdbs\Win32" />
22
<file src="x86\*.pdb" target="pdbs\x86" />
23
<file src="x64\*.pdb" target="pdbs\x64" />
24
</files>
src/wixlib/util.wixproj
+6
-13
@@ -13,22 +13,15 @@
13
</ItemGroup>
14
15
<ItemGroup>
16
- <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" />
17
- <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" />
18
- <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" />
19
- <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />
20
- <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />
21
- <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />
16
+ <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
17
+ <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
18
+ <ProjectReference Include="..\be\utilbe.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
19
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
20
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
21
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
22
</ItemGroup>
23
24
<ItemGroup>
25
<PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
26
</ItemGroup>
27
-
28
- <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
29
- <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
30
- <PropertyGroup>
31
- <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
32
- </PropertyGroup>
33
- </Target>
27
</Project>