Make inbox P2Ps not reference their output assembly

Author: ViktorHofer

eng/references.targets

@@ -42,17 +42,20 @@
     </ItemGroup>
   </Target>
 
-  <!-- Make shared framework assemblies not app-local (non private). -->
+  <!-- Make shared framework assemblies not app-local (non private) and don't reference them. -->
   <Target Name="UpdateProjectReferencesWithPrivateAttribute"
           AfterTargets="AssignProjectConfiguration"
           BeforeTargets="PrepareProjectReferences"
           Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and
                      ('$(IsTestProject)' == 'true' or '$(IsTestSupportProject)' == 'true') and
                      '@(ProjectReferenceWithConfiguration)' != ''">
     <ItemGroup>
-      <ProjectReferenceWithConfiguration PrivateAssets="all"
-                                         Private="false"
-                                         Condition="$(NetCoreAppLibrary.Contains('%(Filename);'))" />
+      <ProjectReferenceWithConfiguration Condition="$(NetCoreAppLibrary.Contains('%(Filename);'))">
+        <PrivateAssets>all</PrivateAssets>
+        <Private>false</Private>
+        <ReferenceOutputAssembly Condition="!$(NetCoreAppLibraryNoReference.Contains('%(Filename);')) and
+                                            '%(ProjectReferenceWithConfiguration.SkipUseReferenceAssembly)' != 'true'">false</ReferenceOutputAssembly>
+      </ProjectReferenceWithConfiguration>
     </ItemGroup>
   </Target>
 

eng/targetingpacks.targets

@@ -29,11 +29,6 @@
     </Reference>
   </ItemGroup>
 
-  <ItemGroup Condition="'@(ProjectReference)' != '' and '$(IsTestProject)' == 'true'">
-    <ProjectReference Update="@(ProjectReference->WithMetadataValue('ReferenceOutputAssembly', 'false')->WithMetadataValue('OutputItemType', ''))"
-                      OutputItemType="_UnresolvedTargetingPackExclusion" />
-  </ItemGroup>
-
   <!-- .NETCoreApp > 2.x DisableImplicitAssemblyReferences support. -->
   <Target Name="RemoveFrameworkReferences"
           BeforeTargets="_HandlePackageFileConflicts"
@@ -100,7 +95,6 @@
       <_targetingPackReferenceExclusion Include="$(TargetName)" />
       <_targetingPackReferenceExclusion Include="@(_ResolvedProjectReferencePaths->'%(Filename)')" />
       <_targetingPackReferenceExclusion Include="@(DefaultReferenceExclusion)" />
-      <_targetingPackReferenceExclusion Include="@(_UnresolvedTargetingPackExclusion->'%(Filename)')" />
     </ItemGroup>
 
     <ItemGroup>

src/libraries/System.Diagnostics.Debug/tests/System.Diagnostics.Debug.Tests.csproj

@@ -23,8 +23,9 @@
     <ProjectReference Include="$(LibrariesProjectRoot)System.Runtime\src\System.Runtime.csproj;
                                $(LibrariesProjectRoot)System.Threading\src\System.Threading.csproj"
                       SkipUseReferenceAssembly="true" />
+    <ProjectReference Include="..\src\System.Diagnostics.Debug.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectRefence Include="..\src\System.Diagnostics.Debug.csproj" ReferenceOutputAssembly="false" />
+    <DefaultReferenceExclusion Include="System.Diagnostics.Debug" />
     <DefaultReferenceExclusion Include="System.Runtime.Extensions" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.Http.WinHttpHandler/tests/UnitTests/System.Net.Http.WinHttpHandler.Unit.Tests.csproj

@@ -112,7 +112,8 @@
     <Compile Include="XunitTestAssemblyAtrributes.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\System.Net.Http.WinHttpHandler.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectReference Include="..\..\src\System.Net.Http.WinHttpHandler.csproj" ReferenceOutputAssembly="false"/>
+    <DefaultReferenceExclusion Include="System.Net.Http.WinHttpHandler" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.Http/tests/UnitTests/System.Net.Http.Unit.Tests.csproj

@@ -403,9 +403,10 @@
     <Compile Include="..\..\..\System.Net.Http.WinHttpHandler\tests\UnitTests\TestServer.cs"
              Link="WinHttpHandler\UnitTests\TestServer.cs" />
   </ItemGroup>
-  <!-- Do not reference since we build part of the source code for tests. -->
   <ItemGroup>
-    <ProjectReference Include="..\..\src\System.Net.Http.csproj" ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\..\src\System.Net.Http.csproj" />
+    <!-- Do not reference since we build part of the source code for tests. -->
+    <DefaultReferenceExclusion Include="System.Net.Http" />	
     <DefaultReferenceExclusion Include="System.Net.Mail" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.Mail/tests/Unit/System.Net.Mail.Unit.Tests.csproj

@@ -274,7 +274,8 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(LibrariesProjectRoot)System.Security.Principal.Windows\src\System.Security.Principal.Windows.csproj" />
+    <ProjectReference Include="..\..\src\System.Net.Mail.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectReference Include="..\..\src\System.Net.Mail.csproj" ReferenceOutputAssembly="false"/>
+    <DefaultReferenceExclusion Include="System.Net.Mail" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.NameResolution/tests/PalTests/System.Net.NameResolution.Pal.Tests.csproj

@@ -106,7 +106,8 @@
              Link="Common\Interop\Unix\System.Native\Interop.SocketAddress.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\System.Net.NameResolution.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectReference Include="..\..\src\System.Net.NameResolution.csproj" ReferenceOutputAssembly="false"/>
+    <DefaultReferenceExclusion Include="System.Net.NameResolution" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.NameResolution/tests/UnitTests/System.Net.NameResolution.Unit.Tests.csproj

@@ -41,7 +41,8 @@
              Link="Common\Extensions\ValueStopwatch\ValueStopwatch.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\System.Net.NameResolution.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectReference Include="..\..\src\System.Net.NameResolution.csproj" ReferenceOutputAssembly="false" />
+    <DefaultReferenceExclusion Include="System.Net.NameResolution" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.Primitives/tests/PalTests/System.Net.Primitives.Pal.Tests.csproj

@@ -119,7 +119,8 @@
              Link="ProductionCode\Common\System\Net\NetworkInformation\InterfaceInfoPal.Browser.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\System.Net.Primitives.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectReference Include="..\..\src\System.Net.Primitives.csproj" ReferenceOutputAssembly="false" />
+    <DefaultReferenceExclusion Include="System.Net.Primitives" />
   </ItemGroup>
 </Project>

src/libraries/System.Net.Primitives/tests/UnitTests/System.Net.Primitives.UnitTests.Tests.csproj

@@ -107,7 +107,8 @@
              Link="ProductionCode\Common\Interop\Unix\System.Native\Interop.InterfaceNameToIndex.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\System.Net.Primitives.csproj" />
     <!-- Do not reference since we build part of the source code for tests. -->
-    <ProjectReference Include="..\..\src\System.Net.Primitives.csproj" ReferenceOutputAssembly="false" />
+    <DefaultReferenceExclusion Include="System.Net.Primitives" />
   </ItemGroup>
 </Project>