Skip to content

Include Pkcs (net10.0 & -windows) in aspnetcore transport pack #117173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
Merged

Include Pkcs (net10.0 & -windows) in aspnetcore transport pack #117173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions eng/packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,9 @@
<!-- Add ReferenceCopyLocalPaths for ProjectReferences which are flagged as Pack="true" into the package. -->
<_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" />
<TfmSpecificPackageFile Include="@(_projectReferenceCopyLocalPaths)"
PackagePath="$([MSBuild]::ValueOrDefault('%(ReferenceCopyLocalPaths.PackagePath)', '$(BuildOutputTargetFolder)\$(_referringTargetFramework)\'))" />
PackagePath="$([MSBuild]::ValueOrDefault('%(ReferenceCopyLocalPaths.PackagePath)', '$(BuildOutputTargetFolder)/$(_referringTargetFramework)/'))" />
<TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))"
TargetPath="/%(TfmSpecificPackageFile.PackagePath)/%(Filename)%(Extension)"
TargetPath="/%(TfmSpecificPackageFile.PackagePath)%(Filename)%(Extension)"
TargetFramework="$(_referringTargetFramework)"
Condition="'$(IncludeSymbols)' == 'true'" />
<!-- Remove symbol from the non symbol package. -->
Expand Down
20 changes: 20 additions & 0 deletions ...nal.Runtime.AspNetCore.Transport/src/Microsoft.Internal.Runtime.AspNetCore.Transport.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<NoWarn>$(NoWarn);NU5131</NoWarn>
<!-- Include the symbols in the non-symbols package so that they get redistributed into aspnetcore's shared framework. -->
<IncludeSymbolsInPackage>true</IncludeSymbolsInPackage>
<TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludePkcsWindowsProjectReference</TargetsForTfmSpecificContentInPackage>
</PropertyGroup>

<ItemGroup>
Expand All @@ -23,6 +24,7 @@
PrivateAssets="all"
Private="true"
IncludeReferenceAssemblyInPackage="true" />

<!-- These generators only provides an implementation targeting Roslyn 4.4 and upwards. -->
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Configuration.Binder\gen\Microsoft.Extensions.Configuration.Binder.SourceGeneration.csproj"
ReferenceOutputAssembly="false"
Expand All @@ -33,6 +35,24 @@
<ProjectReference Include="$(LibrariesProjectRoot)Microsoft.Extensions.Options\gen\Microsoft.Extensions.Options.SourceGeneration.csproj"
ReferenceOutputAssembly="false"
PackAsAnalyzer="true" />

<!-- Manually reference Pkcs to make sure that the $(NetCoreAppCurrent)-windows assembly gets included as well. -->
<ProjectReference Include="$(LibrariesProjectRoot)System.Security.Cryptography.Pkcs\src\System.Security.Cryptography.Pkcs.csproj"
PrivateAssets="all"
SetTargetFramework="TargetFramework=$(NetCoreAppCurrent)-windows"
OutputItemType="PkcsWindowsProjectReference" />
</ItemGroup>

<Target Name="IncludePkcsWindowsProjectReference" DependsOnTargets="BuildOnlySettings;ResolveReferences">
<ItemGroup>
<TfmSpecificPackageFile Include="@(PkcsWindowsProjectReference)"
PackagePath="/runtimes/win/lib/$(NetCoreAppCurrent)/" />
<_pkcsWindowsProjectReferenceAsPdb Include="$([System.IO.Path]::ChangeExtension('%(PkcsWindowsProjectReference.Identity)', '.pdb'))" />
<TfmSpecificDebugSymbolsFile Include="@(_pkcsWindowsProjectReferenceAsPdb)"
TargetPath="/runtimes/win/lib/$(NetCoreAppCurrent)/%(Filename)%(Extension)"
TargetFramework="$(NetCoreAppCurrent)" />
</ItemGroup>
</Target>


</Project>
1 change: 1 addition & 0 deletions src/libraries/NetCoreAppLibrary.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@
Microsoft.Extensions.Primitives;
System.Diagnostics.EventLog;
System.Formats.Cbor;
System.Security.Cryptography.Pkcs;
System.Security.Cryptography.Xml;
System.Threading.AccessControl;
System.Threading.RateLimiting;
Expand Down
Loading