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
1 change: 0 additions & 1 deletion eng/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ may be turned into `<PackageReference>` items in projects.
<LatestPackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
<LatestPackageReference Include="Microsoft.IdentityModel.Protocols.WsFederation" />
<LatestPackageReference Include="Microsoft.Internal.AspNetCore.H2Spec.All" />
<LatestPackageReference Include="Microsoft.NETCore.Windows.ApiSets" />
<LatestPackageReference Include="Microsoft.NETCore.BrowserDebugHost.Transport" />
<LatestPackageReference Include="Microsoft.Owin.Security.Cookies" />
<LatestPackageReference Include="Microsoft.Owin.Testing" />
Expand Down
184 changes: 92 additions & 92 deletions eng/Version.Details.props

Large diffs are not rendered by default.

370 changes: 185 additions & 185 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
<MicrosoftIdentityModelProtocolsOpenIdConnectVersion>$(IdentityModelVersion)</MicrosoftIdentityModelProtocolsOpenIdConnectVersion>
<MicrosoftIdentityModelProtocolsWsFederationVersion>$(IdentityModelVersion)</MicrosoftIdentityModelProtocolsWsFederationVersion>
<MicrosoftInternalAspNetCoreH2SpecAllVersion>2.2.1</MicrosoftInternalAspNetCoreH2SpecAllVersion>
<MicrosoftNETCoreWindowsApiSetsVersion>1.0.1</MicrosoftNETCoreWindowsApiSetsVersion>
<MicrosoftOwinSecurityCookiesVersion>3.0.1</MicrosoftOwinSecurityCookiesVersion>
<MicrosoftOwinTestingVersion>3.0.1</MicrosoftOwinTestingVersion>
<MicrosoftWebAdministrationVersion>11.1.0</MicrosoftWebAdministrationVersion>
Expand Down
26 changes: 26 additions & 0 deletions eng/common/native/NativeAotSupported.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<Project>
<PropertyGroup>

<!-- Reject unsupported OS via RID prefix match -->
<_NativeAotSupportedOS Condition="
'$(TargetOS)' != 'browser' and
'$(TargetOS)' != 'haiku' and
'$(TargetOS)' != 'illumos' and
'$(TargetOS)' != 'netbsd' and
'$(TargetOS)' != 'solaris'
">true</_NativeAotSupportedOS>

<!-- Reject unsupported architectures via RID suffix match -->
<_NativeAotSupportedArch Condition="
'$(TargetArchitecture)' != 'wasm' and
('$(TargetArchitecture)' != 'x86' or '$(TargetOS)' == 'windows')
">true</_NativeAotSupportedArch>

<NativeAotSupported Condition="
'$(NativeAotSupported)' == '' and
'$(_NativeAotSupportedOS)' == 'true' and
'$(_NativeAotSupportedArch)' == 'true'
">true</NativeAotSupported>

</PropertyGroup>
</Project>
1 change: 0 additions & 1 deletion eng/targets/CSharp.Common.props
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<ItemGroup Condition=" $(IsTestProject) ">
<Reference Include="Microsoft.AspNetCore.InternalTesting" />
<Reference Include="Moq" />
<Reference Include="NETStandard.Library" />
<Compile Include="$(SharedSourceRoot)test\SuccessfulTests.cs" LinkBase="SharedTests" Visible="false" />
</ItemGroup>

Expand Down
10 changes: 5 additions & 5 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"sdk": {
"version": "11.0.100-preview.6.26304.106",
"version": "11.0.100-preview.6.26318.108",
"paths": [
".dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first."
},
"tools": {
"dotnet": "11.0.100-preview.6.26304.106",
"dotnet": "11.0.100-preview.6.26318.108",
"runtimes": {
"dotnet/x86": [
"$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
Expand All @@ -22,9 +22,9 @@
"jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26317.104",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26317.104",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26317.104",
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26319.103",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26319.103",
"Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26319.103",
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.WixToolset.Sdk": "6.0.3-dotnet.4"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
<ItemGroup>
<!-- This analyzer is supported in VS 2019 and must use a compatible Microsoft.CodeAnalysis version -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="All" IsImplicitlyDefined="true" Version="$(Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion)" />
<PackageReference Update="NETStandard.Library" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
<Reference Include="Microsoft.Extensions.FileProviders.Embedded" />
<Reference Include="Microsoft.Extensions.Logging" />
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.NETCore.Windows.ApiSets" />
<Reference Include="Serilog.Extensions.Logging" />
<Reference Include="Serilog.Sinks.File" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
SkipGetTargetFrameworkProperties="true" />
<ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />

<Reference Include="Microsoft.NETCore.Windows.ApiSets" />
<Reference Include="Microsoft.Web.Administration" />
<Reference Include="System.ServiceProcess.ServiceController" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1360,8 +1360,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
using (var connection = server.CreateConnection())
{
var stream = OpenSslStreamWithCert(connection.Stream);
await stream.AuthenticateAsClientAsync("localhost");
await AssertConnectionResult(stream, false);
await AssertConnectionRejected(stream);
}
}
}
Expand All @@ -1385,8 +1384,7 @@ void ConfigureListenOptions(ListenOptions listenOptions)
using (var connection = server.CreateConnection())
{
var stream = OpenSslStreamWithCert(connection.Stream);
await stream.AuthenticateAsClientAsync("localhost");
await AssertConnectionResult(stream, false);
await AssertConnectionRejected(stream);
}
}
}
Expand Down Expand Up @@ -1665,6 +1663,24 @@ private static SslStream OpenSslStreamWithCert(Stream rawStream, X509Certificate
(sender, host, certificates, certificate, issuers) => clientCertificate ?? _x509Certificate2);
}

private static async Task AssertConnectionRejected(SslStream stream)
{
// The server is expected to reject the connection because of the client certificate.
// Depending on the platform and runtime, this surfaces in one of two ways: either the TLS
// handshake fails directly (the peer sends a fatal certificate alert, e.g. macOS since
// https://github.com/dotnet/runtime/pull/128316), or the handshake completes and the server
// closes the connection immediately afterward. Both outcomes are valid rejections.
try
{
await stream.AuthenticateAsClientAsync("localhost");
}
catch (AuthenticationException)
{
return;
}
await AssertConnectionResult(stream, false);
}

private static async Task AssertConnectionResult(SslStream stream, bool success, string body = null)
{
var request = body == null ? Encoding.UTF8.GetBytes("GET / HTTP/1.0\r\n\r\n")
Expand Down
Binary file modified src/Shared/TestCertificates/testCert.pfx
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<ItemGroup>
<!-- This analyzer is supported in VS 2019 and must use a compatible Microsoft.CodeAnalysis version -->
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" PrivateAssets="All" IsImplicitlyDefined="true" Version="$(Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion)" />
<PackageReference Update="NETStandard.Library" PrivateAssets="all" />

<InternalsVisibleTo Include="Microsoft.AspNetCore.Components.SdkAnalyzers.Tests" />
</ItemGroup>
Expand Down
Loading