Skip to content

Commit bcd20ab

Browse files
committed
Condition SharedFrameworkBundle correctly and remove an incorrect warnings
1 parent ee5313e commit bcd20ab

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

eng/targets/ResolveReferences.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,10 +227,6 @@
227227
Condition=" '@(PackageReference->HasMetadata('Private')->Count())' != '0' "
228228
Code="BUILD004"
229229
Text="%25(Private) metadata should not be applied to the %(Identity) package reference. Did you mean %25(PrivateAssets)?" />
230-
<Warning
231-
Condition=" '@(ProjectReference->HasMetadata('PrivateAssets')->Count())' != '0' "
232-
Code="BUILD005"
233-
Text="%25(PrivateAssets) metadata should not be applied to the %(Identity) project reference. Did you mean %25(Private)?" />
234230
<Warning
235231
Condition=" '@(Reference->HasMetadata('PrivateAssets')->Count())' != '0' "
236232
Code="BUILD006"

src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,17 @@
4646
</When>
4747
<Otherwise>
4848
<ItemGroup>
49-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=x86">
49+
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
50+
SetPlatform="Platform=x86"
51+
Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'Win32'">
5052
<Name>SharedFrameworkLib</Name>
5153
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
5254
<Private>True</Private>
5355
<DoNotHarvest>True</DoNotHarvest>
5456
</ProjectReference>
55-
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj" SetPlatform="Platform=x64">
57+
<ProjectReference Include="..\SharedFrameworkLib\SharedFrameworkLib.wixproj"
58+
SetPlatform="Platform=x64"
59+
Condition="'$(DotNetBuild)' != 'true' or '$(Platform)' == 'x64'">
5660
<Name>SharedFrameworkLib</Name>
5761
<Project>{5244BC49-2568-4701-80A6-EAB8950AB5FA}</Project>
5862
<Private>True</Private>

0 commit comments

Comments
 (0)