Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 1 addition & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
version: 2
registries:
dev.azure.com:
token: ${{secrets.DEPENDABOT_NPM_TOKEN}}
type: npm-registry
url: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-npm/npm/registry/

updates:
- package-ecosystem: NuGet
- package-ecosystem: nuget
directory: "/"
# Perform only security updates of our npm dependencies.
open-pull-requests-limit: 0
Expand Down
2 changes: 1 addition & 1 deletion eng/SourceBuildPrebuiltBaseline.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@

<!-- Transitive dependencies, suppressed as per https://github.com/dotnet/aspnetcore/pull/57887#issuecomment-2362241518-->
<Usages>
<Usage Id="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.7.24405.7"/>
<Usage Id="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24473.5"/>
<Usage Id="Newtonsoft.Json" Version="13.0.1" />
<Usage Id="System.Security.Cryptography.Xml" Version="6.0.0" />
</Usages>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
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
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.24560.6"
},
"tools": {
"dotnet": "10.0.100-alpha.1.24510.13",
"dotnet": "10.0.100-alpha.1.24560.6",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
Expand Down
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());
}

[ConditionalFact]
Expand Down
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
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
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
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