Skip to content

Commit b27670c

Browse files
author
John Luo
committed
Fix ref pack after merge
1 parent 2f6cdcf commit b27670c

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,12 @@ This package is an internal implementation of the .NET Core SDK and is not meant
117117
<Output TaskParameter="JoinResult" ItemName="_ReferencedExtensionsRefAssemblies" />
118118
</JoinItems>
119119

120+
<!-- _DuplicatedExtensionsRefAssemblies represents ref assemblies that are present in Microsoft.Internal.Extensions.Refs package and also are built in this repo. -->
121+
<!-- This should be temporary while we migrate sources since there should be no duplication when sources are deleted from extensions. -->
122+
<JoinItems Left="@(_ReferencedExtensionsRefAssemblies)" Right="@(_ResolvedProjectReferencePaths)" LeftKey="Filename" RightKey="Filename" ItemSpecToUse="Left">
123+
<Output TaskParameter="JoinResult" ItemName="_DuplicatedExtensionsRefAssemblies" />
124+
</JoinItems>
125+
120126
<JoinItems Left="@(_ReferencedExtensionsRefAssemblies)" Right="@(ExternalAspNetCoreAppReference)" LeftKey="Filename" RightKey="Identity" ItemSpecToUse="Left">
121127
<Output TaskParameter="JoinResult" ItemName="_SelectedExtensionsRefs" />
122128
</JoinItems>
@@ -126,12 +132,15 @@ This package is an internal implementation of the .NET Core SDK and is not meant
126132
</JoinItems>
127133

128134
<ItemGroup>
135+
<!-- Do not exclude the ref assemblies that we built in this repo if it's also included in Microsoft.Internal.Extensions.Refs -->
136+
<_ReferencedExtensionsRefAssembliesToExclude Include="@(_ReferencedExtensionsRefAssemblies)" Exclude="@(_DuplicatedExtensionsRefAssemblies)" />
137+
129138
<!-- Exclude transitive external dependencies that are not directly referenced by projects in AspNetCore or Extensions -->
130139
<AspNetCoreReferenceAssemblyPath
131140
Include="@(ReferencePathWithRefAssemblies)"
132141
Condition="'%(ReferencePathWithRefAssemblies.IsReferenceAssembly)' == 'true'"
133142
Exclude="
134-
@(_ReferencedExtensionsRefAssemblies);
143+
@(_ReferencedExtensionsRefAssembliesToExclude);
135144
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'Microsoft.NETCore.App.Ref'));
136145
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'System.Security.Cryptography.Pkcs'));
137146
@(ReferencePathWithRefAssemblies->WithMetadataValue('NuGetPackageId', 'System.Drawing.Common'));

0 commit comments

Comments
 (0)