Skip to content

Commit 2ef5d0a

Browse files
author
John Luo
committed
Update to latest transport package
1 parent 6be840b commit 2ef5d0a

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ This package is an internal implementation of the .NET Core SDK and is not meant
5353
<!-- Platform manifest and package override metatdata -->
5454
<ReferencePackSharedFxVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</ReferencePackSharedFxVersion>
5555
<ReferencePackSharedFxVersion Condition="'$(VersionSuffix)' != ''">$(ReferencePackSharedFxVersion)-$(VersionSuffix)</ReferencePackSharedFxVersion>
56+
57+
<!-- Runtime extensions transport paths -->
58+
<RuntimeExtensionsReferenceDirectory>$(PkgMicrosoft_Extensions_Internal_Transport)\ref\$(TargetFramework)\</RuntimeExtensionsReferenceDirectory>
59+
5660
</PropertyGroup>
5761

5862
<ItemGroup>
@@ -109,7 +113,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
109113
BeforeTargets="_GetPackageFiles"
110114
DependsOnTargets="ResolveReferences;FindReferenceAssembliesForReferences">
111115
<ItemGroup>
112-
<_AvailableExtensionsRefAssemblies Include="$(PkgMicrsoft_Extensions_Internal_Transport)\ref\*.dll" />
116+
<_AvailableExtensionsRefAssemblies Include="$(RuntimeExtensionsReferenceDirectory)*.dll" />
113117
</ItemGroup>
114118

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

149153
<AspNetCoreReferenceAssemblyPath
150-
Include="@(_SelectedExtensionsRefAssemblies->'$(PkgMicrsoft_Extensions_Internal_Transport)\ref\%(FileName)%(Extension)')" />
154+
Include="@(_SelectedExtensionsRefAssemblies->'$(RuntimeExtensionsReferenceDirectory)%(FileName)%(Extension)')" />
151155

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

155159
<RefPackContent Include="@(AspNetCoreReferenceAssemblyPath)" PackagePath="$(RefAssemblyPackagePath)" />
156160
<RefPackContent Include="@(AspNetCoreReferenceDocXml)" PackagePath="$(RefAssemblyPackagePath)" />
@@ -165,7 +169,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
165169
Outputs="$(TargetDir)$(PackageConflictManifestFileName)">
166170
<ItemGroup>
167171
<!-- Use package version for non-Extensions references -->
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' " />
172+
<_AspNetCoreAppPackageOverrides Include="@(AspNetCoreReferenceAssemblyPath->'%(NuGetPackageId)|%(NuGetPackageVersion)')" Condition="!Exists('$(RuntimeExtensionsReferenceDirectory)%(AspNetCoreReferenceAssemblyPath.NuGetPackageId).dll') AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.NETCore.App' AND '%(AspNetCoreReferenceAssemblyPath.NuGetPackageId)' != 'Microsoft.Extensions.Internal.Transport' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />
169173

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

0 commit comments

Comments
 (0)