Skip to content

Commit 865508e

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime (#47693)
[main] Update dependencies from dotnet/runtime - Suppress warnings in DataProtection Tracked with #47695 - Update docker image used to bulid RPM installers - add util-linux for useradd - also add shadow-utils - add awk - Add more dependencies. Remove scl enable - Add missing dependencies - Cleanup dependencies - More cleanup
1 parent af93992 commit 865508e

File tree

7 files changed

+205
-191
lines changed

7 files changed

+205
-191
lines changed

‎eng/Version.Details.xml‎

Lines changed: 124 additions & 124 deletions
Large diffs are not rendered by default.

‎eng/Versions.props‎

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -63,69 +63,69 @@
6363
-->
6464
<PropertyGroup Label="Automated">
6565
<!-- Packages from dotnet/runtime -->
66-
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsDependencyModelVersion>
67-
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23212.4</MicrosoftNETCoreAppRefVersion>
68-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23212.4</MicrosoftNETCoreAppRuntimewinx64Version>
69-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.4.23212.4</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
70-
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.4.23212.4</MicrosoftNETRuntimeWebAssemblySdkVersion>
71-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.4.23212.4</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
72-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.4.23212.4</MicrosoftNETCoreBrowserDebugHostTransportVersion>
73-
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsCachingAbstractionsVersion>
74-
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsCachingMemoryVersion>
75-
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationAbstractionsVersion>
76-
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationBinderVersion>
77-
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationCommandLineVersion>
78-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
79-
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationFileExtensionsVersion>
80-
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationIniVersion>
81-
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationJsonVersion>
82-
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationVersion>
83-
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationUserSecretsVersion>
84-
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsConfigurationXmlVersion>
85-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
86-
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsDependencyInjectionVersion>
87-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileProvidersAbstractionsVersion>
88-
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileProvidersCompositeVersion>
89-
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileProvidersPhysicalVersion>
90-
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsFileSystemGlobbingVersion>
91-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
92-
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHostingAbstractionsVersion>
93-
<MicrosoftExtensionsHostingVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHostingVersion>
94-
<MicrosoftExtensionsHttpVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsHttpVersion>
95-
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingAbstractionsVersion>
96-
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingConfigurationVersion>
97-
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingConsoleVersion>
98-
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingDebugVersion>
99-
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingEventSourceVersion>
100-
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingEventLogVersion>
101-
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingVersion>
102-
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsLoggingTraceSourceVersion>
103-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
104-
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsOptionsDataAnnotationsVersion>
105-
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsOptionsVersion>
106-
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.4.23212.4</MicrosoftExtensionsPrimitivesVersion>
107-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.4.23212.4</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
108-
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23212.4</SystemConfigurationConfigurationManagerVersion>
109-
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.4.23212.4</SystemDiagnosticsDiagnosticSourceVersion>
110-
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23212.4</SystemDiagnosticsEventLogVersion>
111-
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23212.4</SystemDirectoryServicesProtocolsVersion>
112-
<SystemIOPipelinesVersion>8.0.0-preview.4.23212.4</SystemIOPipelinesVersion>
113-
<SystemNetHttpJsonVersion>8.0.0-preview.4.23212.4</SystemNetHttpJsonVersion>
114-
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.4.23212.4</SystemNetHttpWinHttpHandlerVersion>
115-
<SystemReflectionMetadataVersion>8.0.0-preview.4.23212.4</SystemReflectionMetadataVersion>
116-
<SystemResourcesExtensionsVersion>8.0.0-preview.4.23212.4</SystemResourcesExtensionsVersion>
117-
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23212.4</SystemSecurityCryptographyPkcsVersion>
118-
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23212.4</SystemSecurityCryptographyXmlVersion>
119-
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23212.4</SystemSecurityPermissionsVersion>
120-
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23212.4</SystemServiceProcessServiceControllerVersion>
121-
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23212.4</SystemTextEncodingsWebVersion>
122-
<SystemTextJsonVersion>8.0.0-preview.4.23212.4</SystemTextJsonVersion>
123-
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23212.4</SystemThreadingAccessControlVersion>
124-
<SystemThreadingChannelsVersion>8.0.0-preview.4.23212.4</SystemThreadingChannelsVersion>
125-
<SystemThreadingRateLimitingVersion>8.0.0-preview.4.23212.4</SystemThreadingRateLimitingVersion>
66+
<MicrosoftExtensionsDependencyModelVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsDependencyModelVersion>
67+
<MicrosoftNETCoreAppRefVersion>8.0.0-preview.4.23213.5</MicrosoftNETCoreAppRefVersion>
68+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.4.23213.5</MicrosoftNETCoreAppRuntimewinx64Version>
69+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.0-preview.4.23213.5</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
70+
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.0-preview.4.23213.5</MicrosoftNETRuntimeWebAssemblySdkVersion>
71+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.0-preview.4.23213.5</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
72+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.0-preview.4.23213.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
73+
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsCachingAbstractionsVersion>
74+
<MicrosoftExtensionsCachingMemoryVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsCachingMemoryVersion>
75+
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
76+
<MicrosoftExtensionsConfigurationBinderVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationBinderVersion>
77+
<MicrosoftExtensionsConfigurationCommandLineVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationCommandLineVersion>
78+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
79+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationFileExtensionsVersion>
80+
<MicrosoftExtensionsConfigurationIniVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationIniVersion>
81+
<MicrosoftExtensionsConfigurationJsonVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationJsonVersion>
82+
<MicrosoftExtensionsConfigurationVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationVersion>
83+
<MicrosoftExtensionsConfigurationUserSecretsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationUserSecretsVersion>
84+
<MicrosoftExtensionsConfigurationXmlVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsConfigurationXmlVersion>
85+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
86+
<MicrosoftExtensionsDependencyInjectionVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsDependencyInjectionVersion>
87+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileProvidersAbstractionsVersion>
88+
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileProvidersCompositeVersion>
89+
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileProvidersPhysicalVersion>
90+
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsFileSystemGlobbingVersion>
91+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
92+
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHostingAbstractionsVersion>
93+
<MicrosoftExtensionsHostingVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHostingVersion>
94+
<MicrosoftExtensionsHttpVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsHttpVersion>
95+
<MicrosoftExtensionsLoggingAbstractionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingAbstractionsVersion>
96+
<MicrosoftExtensionsLoggingConfigurationVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingConfigurationVersion>
97+
<MicrosoftExtensionsLoggingConsoleVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingConsoleVersion>
98+
<MicrosoftExtensionsLoggingDebugVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingDebugVersion>
99+
<MicrosoftExtensionsLoggingEventSourceVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingEventSourceVersion>
100+
<MicrosoftExtensionsLoggingEventLogVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingEventLogVersion>
101+
<MicrosoftExtensionsLoggingVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingVersion>
102+
<MicrosoftExtensionsLoggingTraceSourceVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsLoggingTraceSourceVersion>
103+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
104+
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsOptionsDataAnnotationsVersion>
105+
<MicrosoftExtensionsOptionsVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsOptionsVersion>
106+
<MicrosoftExtensionsPrimitivesVersion>8.0.0-preview.4.23213.5</MicrosoftExtensionsPrimitivesVersion>
107+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.0-preview.4.23213.5</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
108+
<SystemConfigurationConfigurationManagerVersion>8.0.0-preview.4.23213.5</SystemConfigurationConfigurationManagerVersion>
109+
<SystemDiagnosticsDiagnosticSourceVersion>8.0.0-preview.4.23213.5</SystemDiagnosticsDiagnosticSourceVersion>
110+
<SystemDiagnosticsEventLogVersion>8.0.0-preview.4.23213.5</SystemDiagnosticsEventLogVersion>
111+
<SystemDirectoryServicesProtocolsVersion>8.0.0-preview.4.23213.5</SystemDirectoryServicesProtocolsVersion>
112+
<SystemIOPipelinesVersion>8.0.0-preview.4.23213.5</SystemIOPipelinesVersion>
113+
<SystemNetHttpJsonVersion>8.0.0-preview.4.23213.5</SystemNetHttpJsonVersion>
114+
<SystemNetHttpWinHttpHandlerVersion>8.0.0-preview.4.23213.5</SystemNetHttpWinHttpHandlerVersion>
115+
<SystemReflectionMetadataVersion>8.0.0-preview.4.23213.5</SystemReflectionMetadataVersion>
116+
<SystemResourcesExtensionsVersion>8.0.0-preview.4.23213.5</SystemResourcesExtensionsVersion>
117+
<SystemSecurityCryptographyPkcsVersion>8.0.0-preview.4.23213.5</SystemSecurityCryptographyPkcsVersion>
118+
<SystemSecurityCryptographyXmlVersion>8.0.0-preview.4.23213.5</SystemSecurityCryptographyXmlVersion>
119+
<SystemSecurityPermissionsVersion>8.0.0-preview.4.23213.5</SystemSecurityPermissionsVersion>
120+
<SystemServiceProcessServiceControllerVersion>8.0.0-preview.4.23213.5</SystemServiceProcessServiceControllerVersion>
121+
<SystemTextEncodingsWebVersion>8.0.0-preview.4.23213.5</SystemTextEncodingsWebVersion>
122+
<SystemTextJsonVersion>8.0.0-preview.4.23213.5</SystemTextJsonVersion>
123+
<SystemThreadingAccessControlVersion>8.0.0-preview.4.23213.5</SystemThreadingAccessControlVersion>
124+
<SystemThreadingChannelsVersion>8.0.0-preview.4.23213.5</SystemThreadingChannelsVersion>
125+
<SystemThreadingRateLimitingVersion>8.0.0-preview.4.23213.5</SystemThreadingRateLimitingVersion>
126126
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
127-
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.4.23212.4</MicrosoftNETCorePlatformsVersion>
128-
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.4.23212.4</MicrosoftBclAsyncInterfacesVersion>
127+
<MicrosoftNETCorePlatformsVersion>8.0.0-preview.4.23213.5</MicrosoftNETCorePlatformsVersion>
128+
<MicrosoftBclAsyncInterfacesVersion>8.0.0-preview.4.23213.5</MicrosoftBclAsyncInterfacesVersion>
129129
<!-- Packages from dotnet/efcore -->
130130
<dotnetefVersion>8.0.0-preview.4.23212.3</dotnetefVersion>
131131
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.0-preview.4.23212.3</MicrosoftEntityFrameworkCoreInMemoryVersion>

‎eng/docker/rhel.Dockerfile‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Dockerfile that creates a container suitable to build dotnet-cli
2-
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg
2+
FROM mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
3+
4+
RUN tdnf update -y && \
5+
tdnf install -y \
6+
tar \
7+
ca-certificates \
8+
icu \
9+
awk \
10+
# Provides useradd, needed below
11+
shadow-utils \
12+
rpm-build
313

414
# Setup User to match Host User, and give superuser permissions
515
ARG USER

‎src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.WarningSuppressions.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<linker>
3-
<assembly fullname="Microsoft.AspNetCore.DataProtection, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
3+
<assembly fullname="Microsoft.AspNetCore.DataProtection, Version=8.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
44
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
55
<argument>ILLink</argument>
66
<argument>IL2026</argument>
77
<property name="Scope">member</property>
8-
<property name="Target">M:Microsoft.AspNetCore.DataProtection.Internal.DataProtectionHostedService.StartAsync(System.Threading.CancellationToken)</property>
8+
<property name="Target">M:Microsoft.AspNetCore.DataProtection.XmlEncryption.CertificateXmlEncryptor.EncryptElement(System.Xml.Linq.XElement)</property>
99
</attribute>
1010
<attribute fullname="System.Diagnostics.CodeAnalysis.UnconditionalSuppressMessageAttribute">
1111
<argument>ILLink</argument>
1212
<argument>IL2026</argument>
1313
<property name="Scope">member</property>
14-
<property name="Target">M:Microsoft.AspNetCore.DataProtection.Internal.KeyManagementOptionsSetup.Configure(Microsoft.AspNetCore.DataProtection.KeyManagement.KeyManagementOptions)</property>
14+
<property name="Target">M:Microsoft.AspNetCore.DataProtection.XmlEncryption.EncryptedXmlDecryptor.EncryptedXmlWithCertificateKeys.#ctor(Microsoft.AspNetCore.DataProtection.XmlEncryption.XmlKeyDecryptionOptions,System.Xml.XmlDocument)</property>
1515
</attribute>
1616
</assembly>
1717
</linker>

‎src/DataProtection/DataProtection/src/XmlEncryption/CertificateXmlEncryptor.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,9 @@ private XElement EncryptElement(XElement plaintextElement)
8888
var elementToEncrypt = (XmlElement)xmlDocument.DocumentElement!.FirstChild!;
8989

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

‎src/DataProtection/DataProtection/src/XmlEncryption/EncryptedXmlDecryptor.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,9 @@ private sealed class EncryptedXmlWithCertificateKeys : EncryptedXml
8484

8585
[RequiresDynamicCode("XmlDsigXsltTransform uses XslCompiledTransform which requires dynamic code.")]
8686
public EncryptedXmlWithCertificateKeys(XmlKeyDecryptionOptions? options, XmlDocument document)
87+
#pragma warning disable IL2026 // TODO: https://github.com/dotnet/aspnetcore/issues/47695
8788
: base(document)
89+
#pragma warning restore IL2026
8890
{
8991
_options = options;
9092
}

‎src/Installers/Rpm/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<FpmArgs Include="&quot;$(PackageContentRoot)=$(RpmPackageInstallRoot)&quot;" />
8686
</ItemGroup>
8787

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

9090
<Copy SourceFiles="$(TargetPath)"
9191
DestinationFiles="$(CblMariner1TargetPath)"

0 commit comments

Comments
 (0)