Skip to content

[main] Update dependencies from dotnet/runtime #47693

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 10 commits into from
Apr 13, 2023
Merged

[main] Update dependencies from dotnet/runtime #47693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c100774
Update dependencies from https://github.com/dotnet/runtime build 2023…
dotnet-maestro[bot] Apr 13, 2023
896bd02
Suppress warnings in DataProtection
eerhardt Apr 13, 2023
b0f0847
Update docker image used to bulid RPM installers
eerhardt Apr 13, 2023
4f38705
add util-linux for useradd
eerhardt Apr 13, 2023
6abe308
also add shadow-utils
eerhardt Apr 13, 2023
3ed637c
add awk
eerhardt Apr 13, 2023
84dbccc
Add more dependencies. Remove scl enable
eerhardt Apr 13, 2023
1789028
Add missing dependencies
agocke Apr 13, 2023
b19cbfe
Cleanup dependencies
agocke Apr 13, 2023
a7dd5fb
More cleanup
agocke Apr 13, 2023
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
248 changes: 124 additions & 124 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,69 +63,69 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23212.4</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23212.4</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.4.23212.4</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.4.23212.4</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.4.23212.4</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.4.23212.4</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.4.23212.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23212.4</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.4.23212.4</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23212.4</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23212.4</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>8.0.0-preview.4.23212.4</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>8.0.0-preview.4.23212.4</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.4.23212.4</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>8.0.0-preview.4.23212.4</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0-preview.4.23212.4</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23212.4</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23212.4</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23212.4</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23212.4</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23212.4</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.4.23212.4</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23212.4</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>8.0.0-preview.4.23212.4</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>8.0.0-preview.4.23212.4</SystemThreadingRateLimitingVersion>
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23213.5</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23213.5</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.4.23213.5</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.4.23213.5</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.4.23213.5</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.4.23213.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.4.23213.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23213.5</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.4.23213.5</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23213.5</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23213.5</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>8.0.0-preview.4.23213.5</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>8.0.0-preview.4.23213.5</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.4.23213.5</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>8.0.0-preview.4.23213.5</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>8.0.0-preview.4.23213.5</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23213.5</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23213.5</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23213.5</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23213.5</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23213.5</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>8.0.0-preview.4.23213.5</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23213.5</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>8.0.0-preview.4.23213.5</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>8.0.0-preview.4.23213.5</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.4.23212.4</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.4.23212.4</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.4.23213.5</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.4.23213.5</MicrosoftBclAsyncInterfacesVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>8.0.0-preview.4.23212.3</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreInMemoryVersion>
Expand Down
12 changes: 11 additions & 1 deletion eng/docker/rhel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Dockerfile that creates a container suitable to build dotnet-cli
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm

RUN tdnf update -y && \
tdnf install -y \
tar \
ca-certificates \
icu \
awk \
# Provides useradd, needed below
shadow-utils \
rpm-build

# Setup User to match Host User, and give superuser permissions
ARG USER
Expand Down
6 changes: 3 additions & 3 deletions ...Protection/DataProtection/src/Microsoft.AspNetCore.DataProtection.WarningSuppressions.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<linker>
<assembly fullname="Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<assembly fullname="Microsoft.AspNetCore.DataProtection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2026</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.DataProtection.Internal.DataProtectionHostedService.StartAsync(System.Threading.CancellationToken)</property>
<property name="Target">M:Microsoft.AspNetCore.DataProtection.XmlEncryption.CertificateXmlEncryptor.EncryptElement(System.Xml.Linq.XElement)</property>
</attribute>
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
<argument>ILLink</argument>
<argument>IL2026</argument>
<property name="Scope">member</property>
<property name="Target">M:Microsoft.AspNetCore.DataProtection.Internal.KeyManagementOptionsSetup.Configure(Microsoft.AspNetCore.DataProtection.KeyManagement.KeyManagementOptions)</property>
<property name="Target">M:Microsoft.AspNetCore.DataProtection.XmlEncryption.EncryptedXmlDecryptor.EncryptedXmlWithCertificateKeys.#ctor(Microsoft.AspNetCore.DataProtection.XmlEncryption.XmlKeyDecryptionOptions,System.Xml.XmlDocument)</property>
</attribute>
</assembly>
</linker>
2 changes: 2 additions & 0 deletions src/DataProtection/DataProtection/src/XmlEncryption/CertificateXmlEncryptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ private XElement EncryptElement(XElement plaintextElement)
var elementToEncrypt = (XmlElement)xmlDocument.DocumentElement!.FirstChild!;

// Perform the encryption and update the document in-place.
#pragma warning disable IL2026 // TODO: https://github.com/dotnet/aspnetcore/issues/47695
var encryptedXml = new EncryptedXml(xmlDocument);
#pragma warning restore IL2026
var encryptedData = _encryptor.PerformEncryption(encryptedXml, elementToEncrypt);
EncryptedXml.ReplaceElement(elementToEncrypt, encryptedData, content: false);

Expand Down
2 changes: 2 additions & 0 deletions src/DataProtection/DataProtection/src/XmlEncryption/EncryptedXmlDecryptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,9 @@ private sealed class EncryptedXmlWithCertificateKeys : EncryptedXml

[RequiresDynamicCode("XmlDsigXsltTransform uses XslCompiledTransform which requires dynamic code.")]
public EncryptedXmlWithCertificateKeys(XmlKeyDecryptionOptions? options, XmlDocument document)
#pragma warning disable IL2026 // TODO: https://github.com/dotnet/aspnetcore/issues/47695
: base(document)
#pragma warning restore IL2026
{
_options = options;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Installers/Rpm/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<FpmArgs Include="&quot;$(PackageContentRoot)=$(RpmPackageInstallRoot)&quot;" />
</ItemGroup>

<Exec Command="scl enable rh-ruby26 'fpm @(FpmArgs,' ')'" />
<Exec Command="fpm @(FpmArgs,' ')" />

<Copy SourceFiles="$(TargetPath)"
DestinationFiles="$(CblMariner1TargetPath)"
Expand Down