@joebigelow / wix / commits / 68022b35

Update to latest build infrastructure

Rob Mensching committed Mar 3, 2021 at 13:54 UTC 68022b358a6d4abecf63a831023f17bdfee472a8
15 files changed +132 -82
.gitignore
+32 -11
@@ -13,6 +13,9 @@
13 # User-specific files (MonoDevelop/Xamarin Studio)
14 *.userprefs
15
16 +# Mono auto generated files
17 +mono_crash.*
18 +
19 # Build results
20 [Dd]ebug/
21 [Dd]ebugPublic/
@@ -20,12 +23,14 @@
23 [Rr]eleases/
24 x64/
25 x86/
26 +[Ww][Ii][Nn]32/
27 [Aa][Rr][Mm]/
28 [Aa][Rr][Mm]64/
29 bld/
30 [Bb]in/
31 [Oo]bj/
32 [Ll]og/
33 +[Ll]ogs/
34
35 # Visual Studio 2015/2017 cache/options directory
36 .vs/
@@ -39,9 +44,10 @@ Generated\ Files/
44 [Tt]est[Rr]esult*/
45 [Bb]uild[Ll]og.*
46
42 -# NUNIT
47 +# NUnit
48 *.VisualState.xml
49 TestResult.xml
50 +nunit-*.xml
51
52 # Build Results of an ATL Project
53 [Dd]ebugPS/
@@ -56,6 +62,9 @@ project.lock.json
62 project.fragment.lock.json
63 artifacts/
64
65 +# ASP.NET Scaffolding
66 +ScaffoldingReadMe.txt
67 +
68 # StyleCop
69 StyleCopReport.xml
70
@@ -122,9 +131,6 @@ _ReSharper*/
131 *.[Rr]e[Ss]harper
132 *.DotSettings.user
133
125 -# JustCode is a .NET coding add-in
126 -.JustCode
127 -
134 # TeamCity is a build add-in
135 _TeamCity*
136
@@ -135,6 +141,11 @@ _TeamCity*
141 .axoCover/*
142 !.axoCover/settings.json
143
144 +# Coverlet is a free, cross platform Code Coverage Tool
145 +coverage*.json
146 +coverage*.xml
147 +coverage*.info
148 +
149 # Visual Studio code coverage results
150 *.coverage
151 *.coveragexml
@@ -182,6 +193,8 @@ PublishScripts/
193
194 # NuGet Packages
195 *.nupkg
196 +# NuGet Symbol Packages
197 +*.snupkg
198 # The packages folder can be ignored because of Package Restore
199 **/[Pp]ackages/*
200 # except build/, which is used as an MSBuild target.
@@ -206,6 +219,8 @@ BundleArtifacts/
219 Package.StoreAssociation.xml
220 _pkginfo.txt
221 *.appx
222 +*.appxbundle
223 +*.appxupload
224
225 # Visual Studio cache files
226 # files ending in .cache can be ignored
@@ -231,8 +246,6 @@ orleans.codegen.cs
246 # Since there are multiple workflows, uncomment next line to ignore bower_components
247 # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
248 #bower_components/
234 -# ASP.NET Core default setup: bower directory is configured as wwwroot/lib/ and bower restore is true
235 -**/wwwroot/lib/
249
250 # RIA/Silverlight projects
251 Generated_Code/
@@ -257,6 +270,9 @@ ServiceFabricBackup/
270 *.bim.layout
271 *.bim_*.settings
272 *.rptproj.rsuser
273 +*- [Bb]ackup.rdl
274 +*- [Bb]ackup ([0-9]).rdl
275 +*- [Bb]ackup ([0-9][0-9]).rdl
276
277 # Microsoft Fakes
278 FakesAssemblies/
@@ -292,10 +308,6 @@ paket-files/
308 # FAKE - F# Make
309 .fake/
310
295 -# JetBrains Rider
296 -.idea/
297 -*.sln.iml
298 -
311 # CodeRush personal settings
312 .cr/personal
313
@@ -337,5 +349,14 @@ ASALocalRun/
349 # Local History for Visual Studio
350 .localhistory/
351
340 -# BeatPulse healthcheck temp database
352 +# BeatPulse healthcheck temp database
353 healthchecksdb
354 +
355 +# Backup folder for Package Reference Convert tool in Visual Studio 2017
356 +MigrationBackup/
357 +
358 +# Ionide (cross platform F# VS Code tools) working folder
359 +.ionide/
360 +
361 +# Fody - auto-generated XML schema
362 +FodyWeavers.xsd
appveyor.cmd
+11 -5
@@ -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.Netfx\WixToolsetTest.Netfx.csproj || exit /b
11
8 -dotnet test -c Release --no-build src\test\WixToolsetTest.Netfx || exit /b
12 +:: Test
13 +dotnet test -c %_C% --no-build src\test\WixToolsetTest.Netfx || exit /b
14
10 -msbuild -p:Configuration=Release -p:NoBuild=true -t:Pack src\wixext\WixToolset.NetFx.wixext.csproj || exit /b
15 +:: Pack
16 +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Netfx.wixext.csproj || exit /b
17
18 @popd
13 -@endlocal
\ No newline at end of file
19 +@endlocal
appveyor.yml
+2
@@ -33,6 +33,8 @@ skip_tags: true
33 artifacts:
34 - path: build\Release\**\*.nupkg
35 name: nuget
36 +- path: build\Release\**\*.snupkg
37 + name: snupkg
38
39 notifications:
40 - provider: Slack
global.json
+1 -1
@@ -1,5 +1,5 @@
1 {
2 "msbuild-sdks": {
3 - "WixToolset.Sdk": "4.0.0-build-0193"
3 + "WixToolset.Sdk": "4.0.0-build-0194"
4 }
5 }
src/Directory.Build.props
+1 -3
@@ -22,8 +22,6 @@
22 <Product>WiX Toolset</Product>
23 </PropertyGroup>
24
25 - <Import Project="CSharp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.csproj' and Exists('CSharp.Build.props') " />
26 - <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />
27 - <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />
25 + <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
26 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />
27 </Project>
src/Directory.Build.targets
+2 -7
@@ -9,11 +9,6 @@
9 See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284
10 -->
11 <Project>
12 - <PropertyGroup>
13 - <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
14 - <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
15 - </PropertyGroup>
16 -
12 <PropertyGroup>
13 <ReplacePackageReferences>true</ReplacePackageReferences>
14 <TheSolutionPath Condition=" '$(NCrunch)'=='' ">$(SolutionPath)</TheSolutionPath>
@@ -45,12 +40,12 @@
40 <ProjectReference Include="@(PackageInSolution->'$(SmartSolutionDir)\%(SmartPath)' )"/>
41
42 <!-- Remove the package references that are now referenced as projects -->
48 - <PackageReference Remove="@(PackageInSolution->'%(PackageName)' )"/>
43 + <PackageReference Remove="@(PackageInSolution->'%(PackageName)')"/>
44 </ItemGroup>
45
46 </When>
47 </Choose>
48
54 - <Import Project="Wix.Build.targets" Condition=" Exists('Wix.Build.targets') And '$(MSBuildProjectExtension)'=='.wixproj' " />
49 + <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
50 <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
51 </Project>
src/Directory.csproj.props renamed
src/Directory.csproj.targets new
+26
@@ -0,0 +1,26 @@
1 +<!-- 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 +<!--
3 + Do NOT modify this file. Update the canonical version in Home\repo-template\src\Directory.csproj.targets
4 + then update all of the repos.
5 +-->
6 +<Project>
7 + <PropertyGroup>
8 + <CreateDocumentation Condition=" '$(CreateDocumentationFile)'!='true' ">false</CreateDocumentation>
9 + <DocumentationFile Condition=" '$(CreateDocumentationFile)'=='true' ">$(OutputPath)\$(AssemblyName).xml</DocumentationFile>
10 + </PropertyGroup>
11 +
12 + <Target Name="SetNuspecProperties" DependsOnTargets="InitializeSourceControlInformation" AfterTargets="GetBuildVersion"
13 + Condition=" Exists('$(MSBuildProjectName).nuspec') ">
14 + <PropertyGroup>
15 + <ProjectUrl Condition=" '$(ProjectUrl)'=='' and '$(PrivateRepositoryUrl)'!='' ">$(PrivateRepositoryUrl.Replace('.git',''))</ProjectUrl>
16 +
17 + <NuspecFile>$(MSBuildProjectName).nuspec</NuspecFile>
18 + <NuspecBasePath Condition=" '$(NuspecBasePath)'=='' ">$(OutputPath)..\</NuspecBasePath>
19 + <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
20 + <NuspecProperties>$(NuspecProperties);Version=$(PackageVersion);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildProjectDirectory)\;ProjectUrl=$(ProjectUrl)</NuspecProperties>
21 + <PublishRepositoryUrl>true</PublishRepositoryUrl>
22 + <SymbolPackageFormat>snupkg</SymbolPackageFormat>
23 + </PropertyGroup>
24 + </Target>
25 +
26 +</Project>
src/Directory.vcxproj.props renamed
+21
@@ -10,6 +10,9 @@
10 <!-- NBGV properties -->
11 <AssemblyCompany>$(Company)</AssemblyCompany>
12 <AssemblyCopyright>$(Copyright)</AssemblyCopyright>
13 +
14 + <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
15 + <NuGetTargetMoniker>native,Version=v0.0</NuGetTargetMoniker>
16 </PropertyGroup>
17
18 <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">
@@ -78,6 +81,12 @@
81 <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
82 </ClCompile>
83 </ItemDefinitionGroup>
84 + <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
85 + <ClCompile>
86 + <BasicRuntimeChecks></BasicRuntimeChecks>
87 + <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
88 + </ClCompile>
89 + </ItemDefinitionGroup>
90 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' ">
91 <ClCompile>
92 <Optimization>MinSpace</Optimization>
@@ -91,4 +100,16 @@
100 <OptimizeReferences>true</OptimizeReferences>
101 </Link>
102 </ItemDefinitionGroup>
103 + <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
104 + <ClCompile>
105 + <BasicRuntimeChecks></BasicRuntimeChecks>
106 + <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
107 + </ClCompile>
108 + </ItemDefinitionGroup>
109 + <ItemDefinitionGroup Condition=" '$(CLRSupport)'=='true' ">
110 + <Link>
111 + <KeyFile>$(LinkKeyFile)</KeyFile>
112 + <DelaySign>$(LinkDelaySign)</DelaySign>
113 + </Link>
114 + </ItemDefinitionGroup>
115 </Project>
src/ca/netfxca.vcxproj
+17 -12
@@ -1,8 +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\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
5 - <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.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|Win32">
7 <Configuration>Debug</Configuration>
@@ -29,6 +28,7 @@
28 <Platform>ARM64</Platform>
29 </ProjectConfiguration>
30 </ItemGroup>
31 +
32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,31 +38,36 @@
38 <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile>
39 <Description>WiX Toolset .NET Framework CustomAction</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="dllmain.cpp">
51 <PrecompiledHeader>Create</PrecompiledHeader>
52 </ClCompile>
53 <ClCompile Include="netfxca.cpp" />
54 </ItemGroup>
55 +
56 <ItemGroup>
57 <ClInclude Include="cost.h" />
58 <ClInclude Include="precomp.h" />
59 </ItemGroup>
60 +
61 <ItemGroup>
62 <None Include="netfxca.def" />
58 - <None Include="packages.config" />
63 </ItemGroup>
64 +
65 + <ItemGroup>
66 + <PackageReference Include="WixToolset.Dutil" Version="4.0.64" />
67 + <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
68 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
69 + <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
70 + </ItemGroup>
71 +
72 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
61 - <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
62 - <PropertyGroup>
63 - <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>
64 - </PropertyGroup>
65 - <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'))" />
66 - <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'))" />
67 - </Target>
68 -</Project>
\ No newline at end of file
73 +</Project>
src/ca/packages.config deleted
-5
@@ -1,5 +0,0 @@
1 -<?xml version="1.0" encoding="utf-8"?>
2 -<packages>
3 - <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
4 - <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
5 -</packages>
\ No newline at end of file
src/test/WixToolsetTest.Netfx/WixToolsetTest.Netfx.csproj
+6 -10
@@ -4,22 +4,14 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 + <DebugType>embedded</DebugType>
8 <IsPackable>false</IsPackable>
9 </PropertyGroup>
10
11 <ItemGroup>
11 - <Content Include="TestData\UsingDotNetCorePackages\BundleLatest.wxs" CopyToOutputDirectory="PreserveNewest" />
12 - <Content Include="TestData\UsingDotNetCorePackages\BundleLatest_x64.wxs" CopyToOutputDirectory="PreserveNewest" />
13 - <Content Include="TestData\UsingNativeImage\example.txt" CopyToOutputDirectory="PreserveNewest" />
14 - <Content Include="TestData\UsingNativeImage\Package.en-us.wxl" CopyToOutputDirectory="PreserveNewest" />
15 - <Content Include="TestData\UsingNativeImage\Package.wxs" CopyToOutputDirectory="PreserveNewest" />
16 - <Content Include="TestData\UsingNativeImage\PackageComponents.wxs" CopyToOutputDirectory="PreserveNewest" />
12 + <Content Include="TestData\**" CopyToOutputDirectory="PreserveNewest" />
13 </ItemGroup>
14
19 - <Target Name="CopyExtensions" AfterTargets="Build">
20 - <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
21 - </Target>
22 -
15 <ItemGroup>
16 <ProjectReference Include="..\..\wixext\WixToolset.Netfx.wixext.csproj" />
17 </ItemGroup>
@@ -41,4 +33,8 @@
33 <PackageReference Include="xunit" Version="2.4.1" />
34 <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
35 </ItemGroup>
36 +
37 + <Target Name="CopyExtensions" AfterTargets="Build">
38 + <Copy DestinationFolder="$(OutputPath)" SourceFiles="@(WixExtension)" />
39 + </Target>
40 </Project>
src/wixext/WixToolset.Netfx.wixext.csproj
+5 -15
@@ -4,38 +4,28 @@
4 <Project Sdk="Microsoft.NET.Sdk">
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 + <DebugType>embedded</DebugType>
8 <RootNamespace>WixToolset.Netfx</RootNamespace>
9 <Description>WiX Toolset .NET Framework Extension</Description>
10 <Title>WiX Toolset .NET Framework 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)..\netfx.wixlib" />
16 </ItemGroup>
17
18 <ItemGroup>
22 - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
23 - <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
24 - <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
19 + <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
20 </ItemGroup>
21
22 <ItemGroup>
28 - <ProjectReference Include="..\wixlib\netfx.wixproj" ReferenceOutputAssembly="false" Condition=" '$(NCrunch)'=='' " />
23 + <PackageReference Include="WixToolset.Data" Version="4.0.*" PrivateAssets="all" />
24 + <PackageReference Include="WixToolset.Extensibility" Version="4.0.*" PrivateAssets="all" />
25 </ItemGroup>
26
27 <ItemGroup>
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.Netfx.wixext.nuspec
+3 -4
@@ -3,14 +3,13 @@
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 + <title>$title$</title>
7 + <description>$description$</description>
8 <authors>$authors$</authors>
7 - <owners>$authors$</owners>
9 <license type="expression">MS-RL</license>
9 - <projectUrl>https://github.com/wixtoolset/Netfx.wixext</projectUrl>
10 <requireLicenseAcceptance>false</requireLicenseAcceptance>
11 - <title>$title$</title>
12 - <description>$description$</description>
11 <copyright>$copyright$</copyright>
12 + <projectUrl>$projectUrl$</projectUrl>
13 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
14 </metadata>
15
src/wixlib/netfx.wixproj
+5 -9
@@ -1,4 +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 +
4 <Project Sdk="WixToolset.Sdk">
5
6 <PropertyGroup>
@@ -13,9 +15,9 @@
15 </ItemGroup>
16
17 <ItemGroup>
16 - <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />
17 - <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />
18 - <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />
18 + <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
19 + <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
20 + <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
21 </ItemGroup>
22
23 <ItemGroup>
@@ -27,10 +29,4 @@
29 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" />
30 </ItemGroup>
31
30 - <!-- Workaround for bug in ProjectReferenceDefineConstants, they're not needed for this project anyway -->
31 - <Target Name="ClearProjectReferenceDefineConstants" AfterTargets="CalculateDefineConstants">
32 - <PropertyGroup>
33 - <ProjectReferenceDefineConstants></ProjectReferenceDefineConstants>
34 - </PropertyGroup>
35 - </Target>
32 </Project>