diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-03 13:54:13 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-03 13:56:40 -0800 |
| commit | 68022b358a6d4abecf63a831023f17bdfee472a8 (patch) | |
| tree | 1996a512de4a8c9d26f7c5233add0a2c72d14174 /src/wixlib | |
| parent | a5fe70f726e8f428306ccba54037ce2ba055b1f8 (diff) | |
| download | wix-68022b358a6d4abecf63a831023f17bdfee472a8.tar.gz wix-68022b358a6d4abecf63a831023f17bdfee472a8.tar.bz2 wix-68022b358a6d4abecf63a831023f17bdfee472a8.zip | |
Update to latest build infrastructure
Diffstat (limited to 'src/wixlib')
| -rw-r--r-- | src/wixlib/netfx.wixproj | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj index efe66e8e..937ed0d4 100644 --- a/src/wixlib/netfx.wixproj +++ b/src/wixlib/netfx.wixproj | |||
| @@ -1,4 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 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 | <!-- 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 | |||
| 2 | <Project Sdk="WixToolset.Sdk"> | 4 | <Project Sdk="WixToolset.Sdk"> |
| 3 | 5 | ||
| 4 | <PropertyGroup> | 6 | <PropertyGroup> |
| @@ -13,9 +15,9 @@ | |||
| 13 | </ItemGroup> | 15 | </ItemGroup> |
| 14 | 16 | ||
| 15 | <ItemGroup> | 17 | <ItemGroup> |
| 16 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" /> | 18 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" /> |
| 17 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" /> | 19 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> |
| 18 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" /> | 20 | <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> |
| 19 | </ItemGroup> | 21 | </ItemGroup> |
| 20 | 22 | ||
| 21 | <ItemGroup> | 23 | <ItemGroup> |
| @@ -27,10 +29,4 @@ | |||
| 27 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> | 29 | <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" PrivateAssets="All" /> |
| 28 | </ItemGroup> | 30 | </ItemGroup> |
| 29 | 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> | ||
| 36 | </Project> | 32 | </Project> |