Skip to content

Commit 88cec08

Browse files
author
John Luo
committed
Ingest new runtime transport package
1 parent 0518cb5 commit 88cec08

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

eng/Dependencies.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ and are generated based on the last package release.
126126
<LatestPackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectPackageVersion)" />
127127
<LatestPackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" Version="$(MicrosoftIdentityModelProtocolsWsFederationPackageVersion)" />
128128
<LatestPackageReference Include="Microsoft.Internal.AspNetCore.H2Spec.All" Version="$(MicrosoftInternalAspNetCoreH2SpecAllPackageVersion)" />
129-
<LatestPackageReference Include="Microsoft.Internal.Extensions.Refs" Version="$(MicrosoftInternalExtensionsRefsPackageVersion)" />
129+
<LatestPackageReference Include="Microsoft.Extensions.Internal.Transport" Version="$(MicrosoftExtensionsInternalTransportPackageVersion)" />
130130
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="$(MicrosoftNETCoreWindowsApiSetsPackageVersion)" />
131131
<LatestPackageReference Include="Microsoft.Owin.Security.Cookies" Version="$(MicrosoftOwinSecurityCookiesPackageVersion)" />
132132
<LatestPackageReference Include="Microsoft.Owin.Testing" Version="$(MicrosoftOwinTestingPackageVersion)" />

eng/Version.Details.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@
213213
<Uri>https://github.com/dotnet/extensions</Uri>
214214
<Sha>03c40031d618f923aa88da125cb078aabde9ebb1</Sha>
215215
</Dependency>
216-
<Dependency Name="Microsoft.Internal.Extensions.Refs" Version="5.0.0-preview.4.20201.2" CoherentParentDependency="Microsoft.AspNetCore.Razor.Language">
217-
<Uri>https://github.com/dotnet/extensions</Uri>
218-
<Sha>03c40031d618f923aa88da125cb078aabde9ebb1</Sha>
216+
<Dependency Name="Microsoft.Extensions.Internal.Transport" Version="5.0.0-preview.4-runtime.20201.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
217+
<Uri>https://github.com/dotnet/runtime</Uri>
218+
<Sha>e1fa5d7648d46f067e265211fc2c695d409fe788</Sha>
219219
</Dependency>
220220
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0-preview.4.20201.1" CoherentParentDependency="Microsoft.NETCore.App.Runtime.win-x64">
221221
<Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
<MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsOptionsDataAnnotationsPackageVersion>
137137
<MicrosoftExtensionsOptionsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsOptionsPackageVersion>
138138
<MicrosoftExtensionsPrimitivesPackageVersion>5.0.0-preview.4.20201.2</MicrosoftExtensionsPrimitivesPackageVersion>
139-
<MicrosoftInternalExtensionsRefsPackageVersion>5.0.0-preview.4.20201.2</MicrosoftInternalExtensionsRefsPackageVersion>
139+
<MicrosoftExtensionsInternalTransportPackageVersion>5.0.0-preview.4-runtime.20201.2</MicrosoftExtensionsInternalTransportPackageVersion>
140140
<!-- Packages from dotnet/efcore -->
141141
<dotnetefPackageVersion>5.0.0-preview.4.20201.1</dotnetefPackageVersion>
142142
<MicrosoftEntityFrameworkCoreInMemoryPackageVersion>5.0.0-preview.4.20201.1</MicrosoftEntityFrameworkCoreInMemoryPackageVersion>

eng/targets/ResolveReferences.targets

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -216,15 +216,13 @@
216216
Condition=" '$(CompileUsingReferenceAssemblies)' != false AND '$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' ">true</_CompileTfmUsingReferenceAssemblies>
217217
</PropertyGroup>
218218
<!--
219-
If we have a ref/ assembly from Extensions for a package, use that when compiling. The build-only reference to
220-
Microsoft.Internal.Extensions.Refs ensures package is installed and $(MicrosoftInternalExtensionsRefsPath) is set.
219+
If we have a ref/ assembly from dotnet/runtime for an Extension package, use that when compiling.
221220
-->
222221
<ItemGroup
223222
Condition=" $(_CompileTfmUsingReferenceAssemblies) OR ('$(IsTargetingPackBuilding)' != 'false' AND '$(MSBuildProjectName)' == 'Microsoft.AspNetCore.App.Ref') ">
224-
<PackageReference Include="Microsoft.Internal.Extensions.Refs"
225-
Version="$(MicrosoftInternalExtensionsRefsPackageVersion)"
223+
<PackageReference Include="Microsoft.Extensions.Internal.Transport"
224+
Version="$(MicrosoftExtensionsInternalTransportPackageVersion)"
226225
IsImplicitlyDefined="true"
227-
IncludeAssets="Build"
228226
PrivateAssets="All" />
229227
</ItemGroup>
230228

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
116116
<Output TaskParameter="JoinResult" ItemName="_ReferencedExtensionsRefAssemblies" />
117117
</JoinItems>
118118

119-
<!-- _DuplicatedExtensionsRefAssemblies represents ref assemblies that are present in Microsoft.Internal.Extensions.Refs package and also are built in this repo. -->
119+
<!-- _DuplicatedExtensionsRefAssemblies represents ref assemblies that are present in Microsoft.Extensions.Internal.Transport package and also are built in this repo. -->
120120
<!-- This should be temporary while we migrate sources since there should be no duplication when sources are deleted from extensions. -->
121121
<JoinItems Left="@(_ReferencedExtensionsRefAssemblies)" Right="@(_ResolvedProjectReferencePaths)" LeftKey="Filename" RightKey="Filename" ItemSpecToUse="Left">
122122
<Output TaskParameter="JoinResult" ItemName="_DuplicatedExtensionsRefAssemblies" />
@@ -131,7 +131,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
131131
</JoinItems>
132132

133133
<ItemGroup>
134-
<!-- Do not exclude the ref assemblies that we built in this repo if it's also included in Microsoft.Internal.Extensions.Refs -->
134+
<!-- Do not exclude the ref assemblies that we built in this repo if it's also included in Microsoft.Extensions.Internal.Transport -->
135135
<_ReferencedExtensionsRefAssembliesToExclude Include="@(_ReferencedExtensionsRefAssemblies)" Exclude="@(_DuplicatedExtensionsRefAssemblies)" />
136136

137137
<!-- Exclude transitive external dependencies that are not directly referenced by projects in AspNetCore or Extensions -->
@@ -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.Internal.Extensions.Refs' AND '%(AspNetCoreReferenceAssemblyPath.NuGetSourceType)' == 'Package' " />
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' " />
169169

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

0 commit comments

Comments
 (0)