Skip to content

Commit c48fea3

Browse files
committed
Fix build breaks in the allConfigurations build from Linux
1 parent 66da3b0 commit c48fea3

File tree

6 files changed

+129
-39
lines changed

6 files changed

+129
-39
lines changed

src/libraries/Common/src/Internal/Cryptography/Helpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ namespace Internal.Cryptography
1111
internal static partial class Helpers
1212
{
1313
[UnsupportedOSPlatformGuard("browser")]
14-
internal static readonly bool HasSymmetricEncryption =
14+
internal static bool HasSymmetricEncryption { get; } =
1515
#if NET5_0_OR_GREATER
1616
!OperatingSystem.IsBrowser();
1717
#else
1818
true;
1919
#endif
2020

2121
[UnsupportedOSPlatformGuard("browser")]
22-
internal static readonly bool HasHMAC =
22+
internal static bool HasHMAC { get; } =
2323
#if NET5_0_OR_GREATER
2424
!OperatingSystem.IsBrowser();
2525
#else

src/libraries/System.DirectoryServices/src/System.DirectoryServices.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@ System.DirectoryServices.ActiveDirectory.DomainController</PackageDescription>
182182
<Reference Include="System.Threading" />
183183
<Reference Include="System.Threading.Thread" />
184184
</ItemGroup>
185+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
186+
<Reference Include="System.Security.Cryptography" />
187+
</ItemGroup>
185188
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">
186189
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="$(SystemIOFileSystemAccessControlVersion)" />
187190
<PackageReference Include="System.Security.AccessControl" Version="$(SystemSecurityAccessControlVersion)" />

src/libraries/System.Net.WebSockets/src/System.Net.WebSockets.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<Reference Include="System.Runtime.CompilerServices.Unsafe" />
5252
<Reference Include="System.Runtime.Extensions" />
5353
<Reference Include="System.Runtime.InteropServices" />
54-
<Reference Include="System.Security.Cryptography.Algorithms" />
54+
<Reference Include="System.Security.Cryptography" />
5555
<Reference Include="System.Security.Principal" />
5656
<Reference Include="System.Text.Encoding.Extensions" />
5757
<Reference Include="System.Threading" />

src/libraries/System.Security.Cryptography.Csp/src/Resources/Strings.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,9 @@
122122
<data name="Argument_InvalidValue" xml:space="preserve">
123123
<value>Value was invalid.</value>
124124
</data>
125+
<data name="Argument_InvalidOffLen" xml:space="preserve">
126+
<value>Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.</value>
127+
</data>
125128
<data name="ArgumentOutOfRange_NeedNonNegNum" xml:space="preserve">
126129
<value>Non-negative number required.</value>
127130
</data>

src/libraries/System.Security.Cryptography/src/System.Security.Cryptography.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -441,8 +441,8 @@
441441
Link="Common\Microsoft\Win32\SafeHandles\SafeEvpMdCtxHandle.Unix.cs" />
442442
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs"
443443
Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyCtxHandle.Unix.cs" />
444-
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPkeyHandle.Unix.cs"
445-
Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPkeyHandle.Unix.cs" />
444+
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs"
445+
Link="Common\Microsoft\Win32\SafeHandles\SafeEvpPKeyHandle.Unix.cs" />
446446
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs"
447447
Link="Common\Microsoft\Win32\SafeHandles\SafeHmacCtxHandle.Unix.cs" />
448448
<Compile Include="$(CommonPath)Microsoft\Win32\SafeHandles\SafeInteriorHandle.cs"

0 commit comments

Comments
 (0)