Browse Source

Fix ref pack after merge

John Luo 6 years ago
parent
commit
b27670c72d
1 changed files with 10 additions and 1 deletions
  1. 10 1
      src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

+ 10 - 1
src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

@@ -117,6 +117,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
       <Output TaskParameter="JoinResult" ItemName="_ReferencedExtensionsRefAssemblies" />
       <Output TaskParameter="JoinResult" ItemName="_ReferencedExtensionsRefAssemblies" />
     </JoinItems>
     </JoinItems>
 
 
+    <!-- _DuplicatedExtensionsRefAssemblies represents ref assemblies that are present in Microsoft.Internal.Extensions.Refs package and also are built in this repo. -->
+    <!-- This should be temporary while we migrate sources since there should be no duplication when sources are deleted from extensions. -->
+    <JoinItems Left="@(_ReferencedExtensionsRefAssemblies)" Right="@(_ResolvedProjectReferencePaths)" LeftKey="Filename" RightKey="Filename" ItemSpecToUse="Left">
+      <Output TaskParameter="JoinResult" ItemName="_DuplicatedExtensionsRefAssemblies" />
+    </JoinItems>
+
     <JoinItems Left="@(_ReferencedExtensionsRefAssemblies)" Right="@(ExternalAspNetCoreAppReference)" LeftKey="Filename" RightKey="Identity" ItemSpecToUse="Left">
     <JoinItems Left="@(_ReferencedExtensionsRefAssemblies)" Right="@(ExternalAspNetCoreAppReference)" LeftKey="Filename" RightKey="Identity" ItemSpecToUse="Left">
       <Output TaskParameter="JoinResult" ItemName="_SelectedExtensionsRefs" />
       <Output TaskParameter="JoinResult" ItemName="_SelectedExtensionsRefs" />
     </JoinItems>
     </JoinItems>
@@ -126,12 +132,15 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     </JoinItems>
     </JoinItems>
 
 
     <ItemGroup>
     <ItemGroup>
+      <!-- Do not exclude the ref assemblies that we built in this repo if it's also included in Microsoft.Internal.Extensions.Refs -->
+      <_ReferencedExtensionsRefAssembliesToExclude Include="@(_ReferencedExtensionsRefAssemblies)" Exclude="@(_DuplicatedExtensionsRefAssemblies)" />
+
       <!-- Exclude transitive external dependencies that are not directly referenced by projects in AspNetCore or Extensions -->
       <!-- Exclude transitive external dependencies that are not directly referenced by projects in AspNetCore or Extensions -->
       <AspNetCoreReferenceAssemblyPath
       <AspNetCoreReferenceAssemblyPath
           Include="@(ReferencePathWithRefAssemblies)"
           Include="@(ReferencePathWithRefAssemblies)"
           Condition="'%(ReferencePathWithRefAssemblies.IsReferenceAssembly)' == 'true'"
           Condition="'%(ReferencePathWithRefAssemblies.IsReferenceAssembly)' == 'true'"
           Exclude="
           Exclude="
-            @(_ReferencedExtensionsRefAssemblies);
+            @(_ReferencedExtensionsRefAssembliesToExclude);
             @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
             @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
             @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'System.Security.Cryptography.Pkcs'));
             @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'System.Security.Cryptography.Pkcs'));
             @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'System.Drawing.Common'));
             @(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'System.Drawing.Common'));