Skip to content

Commit 3ed133d

Browse files
github-actions[bot]sebastienroseerhardtjaviercnjkoritzinsky
authored
Update .NET SDK to 10.0.100-alpha.1.24560.6 (#58862)
* Update .NET SDK Update .NET SDK to version 10.0.100-alpha.1.24553.6. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> * Fix build errors * Revert changes * Update XUnit package * Fix build errors * Fix arrays * Fix Http tests * Fix more errors * Fix MVC * Flip around where AsSpan is called with string comparisons in tests. * Update .net SDK * add path prefixes back * Update 9.0 prebuilt baseline * Fix package definition * Fix package * Skip broken test * Update dependabot.yml * Update dependabot.yml --------- Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Sebastien Ros <[email protected]> Co-authored-by: Eric Erhardt <[email protected]> Co-authored-by: Javier Calvarro Nelson <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]> Co-authored-by: William Godbe <[email protected]>
1 parent bda4229 commit 3ed133d

File tree

40 files changed

+246
-226
lines changed

40 files changed

+246
-226
lines changed

‎.github/dependabot.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
version: 2
2-
registries:
3-
dev.azure.com:
4-
token: ${{secrets.DEPENDABOT_NPM_TOKEN}}
5-
type: npm-registry
6-
url: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/
72

83
updates:
9-
- package-ecosystem: NuGet
4+
- package-ecosystem: nuget
105
directory: "/"
116
# Perform only security updates of our npm dependencies.
127
open-pull-requests-limit: 0

‎eng/SourceBuildPrebuiltBaseline.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050

5151
<!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->
5252
<Usages>
53-
<Usage Id="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24405.7"/>
53+
<Usage Id="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24473.5"/>
5454
<Usage Id="Newtonsoft.Json" Version="13.0.1" />
5555
<Usage Id="System.Security.Cryptography.Xml" Version="6.0.0" />
5656
</Usages>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322
<VerifyXunitVersion>19.14.0</VerifyXunitVersion>
323323
<XunitAbstractionsVersion>2.0.3</XunitAbstractionsVersion>
324324
<XunitAnalyzersVersion>1.15.0</XunitAnalyzersVersion>
325-
<XunitVersion>2.9.0</XunitVersion>
325+
<XunitVersion>2.9.2</XunitVersion>
326326
<XunitAssertVersion>$(XunitVersion)</XunitAssertVersion>
327327
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
328328
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-alpha.1.24510.13"
3+
"version": "10.0.100-alpha.1.24560.6"
44
},
55
"tools": {
6-
"dotnet": "10.0.100-alpha.1.24510.13",
6+
"dotnet": "10.0.100-alpha.1.24560.6",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"

‎src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Encrypt_Decrypt_RoundTrips()
2929
byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
3030

3131
// Assert
32-
Assert.Equal(plaintext, decipheredtext);
32+
Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
3333
}
3434

3535
[ConditionalFact]

‎src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public void Encrypt_Decrypt_RoundTrips()
2626
byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
2727

2828
// Assert
29-
Assert.Equal(plaintext, decipheredtext);
29+
Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
3030
}
3131

3232
[ConditionalFact]

‎src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public void Protect_EncryptsToDefaultProtector_MultiplePurposes()
4545
.Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
4646
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
4747
{
48-
Assert.Equal(expectedPlaintext, actualPlaintext);
49-
Assert.Equal(expectedAad, actualAad);
48+
Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
49+
Assert.Equal(expectedAad, actualAad.AsSpan());
5050
return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
5151
});
5252

@@ -83,8 +83,8 @@ public void Protect_EncryptsToDefaultProtector_SinglePurpose()
8383
.Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
8484
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
8585
{
86-
Assert.Equal(expectedPlaintext, actualPlaintext);
87-
Assert.Equal(expectedAad, actualAad);
86+
Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
87+
Assert.Equal(expectedAad, actualAad.AsSpan());
8888
return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
8989
});
9090

@@ -423,8 +423,8 @@ public void Unprotect_KeyRevoked_RevocationAllowed_ReturnsOriginalData_SetsRevok
423423
.Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
424424
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
425425
{
426-
Assert.Equal(expectedCiphertext, actualCiphertext);
427-
Assert.Equal(expectedAad, actualAad);
426+
Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
427+
Assert.Equal(expectedAad, actualAad.AsSpan());
428428
return expectedPlaintext;
429429
});
430430
var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -470,8 +470,8 @@ public void Unprotect_IsAlsoDefaultKey_Success_NoMigrationRequired()
470470
.Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
471471
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
472472
{
473-
Assert.Equal(expectedCiphertext, actualCiphertext);
474-
Assert.Equal(expectedAad, actualAad);
473+
Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
474+
Assert.Equal(expectedAad, actualAad.AsSpan());
475475
return expectedPlaintext;
476476
});
477477
var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -519,8 +519,8 @@ public void Unprotect_IsNotDefaultKey_Success_RequiresMigration()
519519
.Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
520520
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
521521
{
522-
Assert.Equal(expectedCiphertext, actualCiphertext);
523-
Assert.Equal(expectedAad, actualAad);
522+
Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
523+
Assert.Equal(expectedAad, actualAad.AsSpan());
524524
return expectedPlaintext;
525525
});
526526
var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
@@ -594,8 +594,8 @@ public void CreateProtector_ChainsPurposes()
594594
.Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
595595
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
596596
{
597-
Assert.Equal(expectedPlaintext, actualPlaintext);
598-
Assert.Equal(expectedAad, actualAad);
597+
Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
598+
Assert.Equal(expectedAad, actualAad.AsSpan());
599599
return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
600600
});
601601

‎src/DataProtection/DataProtection/test/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public void Encrypt_Decrypt_RoundTrips()
2525
byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);
2626

2727
// Assert
28-
Assert.Equal(plaintext, decipheredtext);
28+
Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
2929
}
3030

3131
[Fact]

‎src/Http/Headers/test/CacheControlHeaderValueTest.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ public void Properties_SetAndGetAllProperties_SetValueReturnedInGetter()
4747
Assert.Throws<FormatException>(() => cacheControl.NoCacheHeaders.Add("invalid PLACEHOLDER"));
4848
cacheControl.NoCacheHeaders.Add("PLACEHOLDER");
4949
Assert.Single(cacheControl.NoCacheHeaders);
50-
Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First());
50+
Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First().AsSpan());
5151

5252
Assert.NotNull(cacheControl.PrivateHeaders);
5353
Assert.Throws<ArgumentException>(() => cacheControl.PrivateHeaders.Add(null));
5454
Assert.Throws<FormatException>(() => cacheControl.PrivateHeaders.Add("invalid PLACEHOLDER"));
5555
cacheControl.PrivateHeaders.Add("PLACEHOLDER");
5656
Assert.Single(cacheControl.PrivateHeaders);
57-
Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First());
57+
Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First().AsSpan());
5858

5959
// NameValueHeaderValue collection property
6060
Assert.NotNull(cacheControl.Extensions);

0 commit comments

Comments
 (0)