Skip to content
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

Update .NET SDK to 10.0.100-alpha.1.24553.6 #58776

Closed
wants to merge 11 commits into from
Closed

Update .NET SDK to 10.0.100-alpha.1.24553.6 #58776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
14eee79
Update .NET SDK
github-actions[bot] Nov 4, 2024
f30edff
Fix build errors
sebastienros Nov 4, 2024
3007125
Revert changes
sebastienros Nov 4, 2024
1f9529c
Update XUnit package
sebastienros Nov 4, 2024
b647ece
Fix build errors
sebastienros Nov 4, 2024
9962cc5
Fix arrays
sebastienros Nov 4, 2024
d66e6c5
Fix Http tests
sebastienros Nov 4, 2024
e52323e
Fix more errors
sebastienros Nov 4, 2024
540cf1a
Fix MVC
sebastienros Nov 4, 2024
0f9d339
Flip around where AsSpan is called with string comparisons in tests.
eerhardt Nov 6, 2024
0af0f15
Include package path prefix on Identity UI packages
javiercn Nov 8, 2024
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
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@
<VerifyXunitVersion>19.14.0</VerifyXunitVersion>
<XunitAbstractionsVersion>2.0.3</XunitAbstractionsVersion>
<XunitAnalyzersVersion>1.15.0</XunitAnalyzersVersion>
<XunitVersion>2.9.0</XunitVersion>
<XunitVersion>2.9.2</XunitVersion>
<XunitAssertVersion>$(XunitVersion)</XunitAssertVersion>
<XunitExtensibilityCoreVersion>$(XunitVersion)</XunitExtensibilityCoreVersion>
<XunitExtensibilityExecutionVersion>$(XunitVersion)</XunitExtensibilityExecutionVersion>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"sdk": {
"version": "10.0.100-alpha.1.24510.13"
"version": "10.0.100-alpha.1.24553.6"
},
"tools": {
"dotnet": "10.0.100-alpha.1.24510.13",
"dotnet": "10.0.100-alpha.1.24553.6",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
Expand Down
2 changes: 1 addition & 1 deletion ...tion/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/CbcAuthenticatedEncryptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void Encrypt_Decrypt_RoundTrips()
byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);

// Assert
Assert.Equal(plaintext, decipheredtext);
Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sebastienros - why is this change necessary now? Both expected and actual are byte[]. Why do they need to be cast to span?

}

[ConditionalFact]
Expand Down
2 changes: 1 addition & 1 deletion ...tion/test/Microsoft.AspNetCore.DataProtection.Tests/Cng/GcmAuthenticatedEncryptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void Encrypt_Decrypt_RoundTrips()
byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);

// Assert
Assert.Equal(plaintext, decipheredtext);
Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
}

[ConditionalFact]
Expand Down
24 changes: 12 additions & 12 deletions ...Microsoft.AspNetCore.DataProtection.Tests/KeyManagement/KeyRingBasedDataProtectorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ public void Protect_EncryptsToDefaultProtector_MultiplePurposes()
.Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
{
Assert.Equal(expectedPlaintext, actualPlaintext);
Assert.Equal(expectedAad, actualAad);
Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
Assert.Equal(expectedAad, actualAad.AsSpan());
return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
});

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

Expand Down Expand Up @@ -423,8 +423,8 @@ public void Unprotect_KeyRevoked_RevocationAllowed_ReturnsOriginalData_SetsRevok
.Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
{
Assert.Equal(expectedCiphertext, actualCiphertext);
Assert.Equal(expectedAad, actualAad);
Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
Assert.Equal(expectedAad, actualAad.AsSpan());
return expectedPlaintext;
});
var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
Expand Down Expand Up @@ -470,8 +470,8 @@ public void Unprotect_IsAlsoDefaultKey_Success_NoMigrationRequired()
.Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
{
Assert.Equal(expectedCiphertext, actualCiphertext);
Assert.Equal(expectedAad, actualAad);
Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
Assert.Equal(expectedAad, actualAad.AsSpan());
return expectedPlaintext;
});
var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
Expand Down Expand Up @@ -519,8 +519,8 @@ public void Unprotect_IsNotDefaultKey_Success_RequiresMigration()
.Setup(o => o.Decrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualCiphertext, actualAad) =>
{
Assert.Equal(expectedCiphertext, actualCiphertext);
Assert.Equal(expectedAad, actualAad);
Assert.Equal(expectedCiphertext, actualCiphertext.AsSpan());
Assert.Equal(expectedAad, actualAad.AsSpan());
return expectedPlaintext;
});
var mockDescriptor = new Mock<IAuthenticatedEncryptorDescriptor>();
Expand Down Expand Up @@ -594,8 +594,8 @@ public void CreateProtector_ChainsPurposes()
.Setup(o => o.Encrypt(It.IsAny<ArraySegment<byte>>(), It.IsAny<ArraySegment<byte>>()))
.Returns<ArraySegment<byte>, ArraySegment<byte>>((actualPlaintext, actualAad) =>
{
Assert.Equal(expectedPlaintext, actualPlaintext);
Assert.Equal(expectedAad, actualAad);
Assert.Equal(expectedPlaintext, actualPlaintext.AsSpan());
Assert.Equal(expectedAad, actualAad.AsSpan());
return new byte[] { 0x23, 0x29, 0x31, 0x37 }; // ciphertext + tag
});

Expand Down
2 changes: 1 addition & 1 deletion ...t/Microsoft.AspNetCore.DataProtection.Tests/Managed/ManagedAuthenticatedEncryptorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void Encrypt_Decrypt_RoundTrips()
byte[] decipheredtext = encryptor.Decrypt(new ArraySegment<byte>(ciphertext), aad);

// Assert
Assert.Equal(plaintext, decipheredtext);
Assert.Equal(plaintext.AsSpan(), decipheredtext.AsSpan());
}

[Fact]
Expand Down
4 changes: 2 additions & 2 deletions src/Http/Headers/test/CacheControlHeaderValueTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ public void Properties_SetAndGetAllProperties_SetValueReturnedInGetter()
Assert.Throws<FormatException>(() => cacheControl.NoCacheHeaders.Add("invalid PLACEHOLDER"));
cacheControl.NoCacheHeaders.Add("PLACEHOLDER");
Assert.Single(cacheControl.NoCacheHeaders);
Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First());
Assert.Equal("PLACEHOLDER", cacheControl.NoCacheHeaders.First().AsSpan());

Assert.NotNull(cacheControl.PrivateHeaders);
Assert.Throws<ArgumentException>(() => cacheControl.PrivateHeaders.Add(null));
Assert.Throws<FormatException>(() => cacheControl.PrivateHeaders.Add("invalid PLACEHOLDER"));
cacheControl.PrivateHeaders.Add("PLACEHOLDER");
Assert.Single(cacheControl.PrivateHeaders);
Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First());
Assert.Equal("PLACEHOLDER", cacheControl.PrivateHeaders.First().AsSpan());

// NameValueHeaderValue collection property
Assert.NotNull(cacheControl.Extensions);
Expand Down
Loading
Loading