Skip to content

Commit 6be840b

Browse files
author
John Luo
committed
Wip
1 parent 88cec08 commit 6be840b

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

eng/targets/ResolveReferences.targets

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,14 +216,16 @@
216216
Condition=" '$(CompileUsingReferenceAssemblies)' != false AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">true</_CompileTfmUsingReferenceAssemblies>
217217
</PropertyGroup>
218218
<!--
219-
If we have a ref/ assembly from dotnet/runtime for an Extension package, use that when compiling.
219+
If we have a ref/ assembly from dotnet/runtime for an Extension package, use that when compiling but do not reference its assemblies.
220220
-->
221221
<ItemGroup
222222
Condition=" $(_CompileTfmUsingReferenceAssemblies) OR ('$(IsTargetingPackBuilding)' != 'false' AND '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref') ">
223223
<PackageReference Include="Microsoft.Extensions.Internal.Transport"
224224
Version="$(MicrosoftExtensionsInternalTransportPackageVersion)"
225225
IsImplicitlyDefined="true"
226-
PrivateAssets="All" />
226+
ExcludeAssets="runtime"
227+
PrivateAssets="all"
228+
GeneratePathProperty="true" />
227229
</ItemGroup>
228230

229231
<!-- These targets are used to generate the map of assembly name to project files. See also the /t:GenerateProjectList target in build/repo.targets. -->

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
109109
BeforeTargets="_GetPackageFiles"
110110
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
111111
<ItemGroup>
112-
<_AvailableExtensionsRefAssemblies Include="$(MicrosoftInternalExtensionsRefsPath)\*.dll" />
112+
<_AvailableExtensionsRefAssemblies Include="$(PkgMicrsoft_Extensions_Internal_Transport)\ref\*.dll" />
113113
</ItemGroup>
114114

115115
<JoinItems Left="@(ReferencePathWithRefAssemblies)" Right="@(_AvailableExtensionsRefAssemblies)" LeftKey="Filename" RightKey="Filename" ItemSpecToUse="Left">
@@ -147,10 +147,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
147147
@(ReferencePathWithRefAssemblies->WithMetadataValue('ReferenceGrouping', 'Microsoft.NETCore.App'));" />
148148

149149
<AspNetCoreReferenceAssemblyPath
150-
Include="@(_SelectedExtensionsRefAssemblies->'$(MicrosoftInternalExtensionsRefsPath)%(FileName)%(Extension)')" />
150+
Include="@(_SelectedExtensionsRefAssemblies->'$(PkgMicrsoft_Extensions_Internal_Transport)\ref\%(FileName)%(Extension)')" />
151151

152152
<AspNetCoreReferenceDocXml Include="@(_ResolvedProjectReferencePaths->WithMetadataValue('IsReferenceAssembly', 'false')->'%(RootDir)%(Directory)%(FileName).xml')" />
153-
<AspNetCoreReferenceDocXml Include="@(_SelectedExtensionsRefAssemblies->'$(MicrosoftInternalExtensionsRefsPath)%(FileName).xml')" />
153+
<AspNetCoreReferenceDocXml Include="@(_SelectedExtensionsRefAssemblies->'$(PkgMicrsoft_Extensions_Internal_Transport)\ref\%(FileName).xml')" />
154154

155155
<RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
156156
<RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
@@ -165,7 +165,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
165165
Outputs="$(TargetDir)$(PackageConflictManifestFileName)">
166166
<ItemGroup>
167167
<!-- Use package version for non-Extensions references -->
168-
<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(MicrosoftInternalExtensionsRefsPath)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Extensions.Internal.Transport' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />
168+
<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(PkgMicrsoft_Extensions_Internal_Transport)\ref\%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Extensions.Internal.Transport' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />
169169

170170
<!-- Pin version for extensions references -->
171171
<_AspNetCoreAppPackageOverrides Include="@(_SelectedExtensionsRefAssemblies->'%(FileName)|$(MicrosoftInternalExtensionsRefsPackageOverrideVersion)')" />

0 commit comments

Comments
 (0)