diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fd4d4384c0ba..da8a169cf953 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -5,123 +5,123 @@ This file should be imported by eng/Versions.props --> - - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-beta.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 3.3.0-preview.3.26153.117 - 7.5.0-rc.15417 - 7.5.0-rc.15417 - 7.5.0-rc.15417 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - 11.0.0-preview.3.26153.117 - - 4.13.0-3.24613.7 - 4.13.0-3.24613.7 - 4.13.0-3.24613.7 - 4.13.0-3.24613.7 - + + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-beta.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 3.3.0-preview.3.26162.108 + 7.5.0-rc.16308 + 7.5.0-rc.16308 + 7.5.0-rc.16308 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 11.0.0-preview.3.26162.108 + 10.4.0-preview.1.26127.4 10.4.0-preview.1.26127.4 10.4.0-preview.1.26127.4 - + + 17.12.50 + 17.12.50 + 17.12.50 + 17.12.50 + 1.0.0-prerelease.26153.1 1.0.0-prerelease.26153.1 1.0.0-prerelease.26153.1 1.0.0-prerelease.26153.1 1.0.0-prerelease.26153.1 - - 17.12.50 - 17.12.50 - 17.12.50 - 17.12.50 + + 4.13.0-3.24613.7 + 4.13.0-3.24613.7 + 4.13.0-3.24613.7 + 4.13.0-3.24613.7 - + $(dotnetefPackageVersion) $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBclTimeProviderPackageVersion) @@ -214,25 +214,25 @@ This file should be imported by eng/Versions.props $(SystemThreadingAccessControlPackageVersion) $(SystemThreadingChannelsPackageVersion) $(SystemThreadingRateLimitingPackageVersion) - - $(MicrosoftCodeAnalysisCommonPackageVersion) - $(MicrosoftCodeAnalysisCSharpPackageVersion) - $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) - $(MicrosoftCodeAnalysisExternalAccessAspNetCorePackageVersion) - + $(MicrosoftExtensionsCachingHybridPackageVersion) $(MicrosoftExtensionsDiagnosticsTestingPackageVersion) $(MicrosoftExtensionsTimeProviderTestingPackageVersion) - + + $(MicrosoftBuildPackageVersion) + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildTasksCorePackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) + $(optimizationlinuxarm64MIBCRuntimePackageVersion) $(optimizationlinuxx64MIBCRuntimePackageVersion) $(optimizationwindows_ntarm64MIBCRuntimePackageVersion) $(optimizationwindows_ntx64MIBCRuntimePackageVersion) $(optimizationwindows_ntx86MIBCRuntimePackageVersion) - - $(MicrosoftBuildPackageVersion) - $(MicrosoftBuildFrameworkPackageVersion) - $(MicrosoftBuildTasksCorePackageVersion) - $(MicrosoftBuildUtilitiesCorePackageVersion) + + $(MicrosoftCodeAnalysisCommonPackageVersion) + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessAspNetCorePackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5da436072d87..b5355a30de80 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -8,333 +8,333 @@ See https://github.com/dotnet/arcade/blob/master/Documentation/Darc.md for instructions on using darc. --> - + - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 @@ -358,37 +358,37 @@ - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 https://github.com/dotnet/extensions @@ -440,17 +440,17 @@ https://github.com/dotnet/msbuild d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 - + https://github.com/dotnet/dotnet - 15ac4103422d47f7c8f14fa98e813f315432d03b + e9593819ed84a62923fe87c8d0958025726934c3 diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 9438429ca378..88806f1e508e 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -206,7 +206,7 @@ stages: displayName: Validate inputs: filePath: eng\common\sdk-task.ps1 - arguments: -task SigningValidation -restore -msbuildEngine vs + arguments: -task SigningValidation -restore /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 5a927b4c7bcb..a9ea99ba6aaa 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -31,7 +31,6 @@ steps: -runtimeSourceFeed https://ci.dot.net/internal -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' - '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' '$(akams-client-id)' '$(microsoft-symbol-server-pat)' diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index ef97671fe6cb..abbb85141544 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -9,6 +9,7 @@ usage() echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine" echo " for alpine can be specified with version: alpineX.YY or alpineedge" echo " for FreeBSD can be: freebsd13, freebsd14" + echo " for OpenBSD can be: openbsd" echo " for illumos can be: illumos" echo " for Haiku can be: haiku." echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD" @@ -27,6 +28,8 @@ __BuildArch=arm __AlpineArch=armv7 __FreeBSDArch=arm __FreeBSDMachineArch=armv7 +__OpenBSDArch=arm +__OpenBSDMachineArch=armv7 __IllumosArch=arm7 __HaikuArch=arm __QEMUArch=arm @@ -82,6 +85,12 @@ __FreeBSDPackages+=" openssl" __FreeBSDPackages+=" krb5" __FreeBSDPackages+=" terminfo-db" +__OpenBSDVersion="7.8" +__OpenBSDPackages+=" icu4c" +__OpenBSDPackages+=" inotify-tools" +__OpenBSDPackages+=" openssl" +__OpenBSDPackages+=" heimdal-libs" + __IllumosPackages="icu" __IllumosPackages+=" mit-krb5" __IllumosPackages+=" openssl" @@ -160,6 +169,8 @@ while :; do __QEMUArch=aarch64 __FreeBSDArch=arm64 __FreeBSDMachineArch=aarch64 + __OpenBSDArch=arm64 + __OpenBSDMachineArch=aarch64 ;; armel) __BuildArch=armel @@ -235,6 +246,8 @@ while :; do __UbuntuArch=amd64 __FreeBSDArch=amd64 __FreeBSDMachineArch=amd64 + __OpenBSDArch=amd64 + __OpenBSDMachineArch=amd64 __illumosArch=x86_64 __HaikuArch=x86_64 __UbuntuRepo="http://archive.ubuntu.com/ubuntu/" @@ -385,6 +398,10 @@ while :; do __FreeBSDABI="14" __SkipUnmount=1 ;; + openbsd) + __CodeName=openbsd + __SkipUnmount=1 + ;; illumos) __CodeName=illumos __SkipUnmount=1 @@ -593,6 +610,41 @@ elif [[ "$__CodeName" == "freebsd" ]]; then INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf update # shellcheck disable=SC2086 INSTALL_AS_USER=$(whoami) "$__RootfsDir"/host/sbin/pkg -r "$__RootfsDir" -C "$__RootfsDir"/usr/local/etc/pkg.conf install --yes $__FreeBSDPackages +elif [[ "$__CodeName" == "openbsd" ]]; then + # determine mirrors + OPENBSD_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/$__OpenBSDVersion/$__OpenBSDMachineArch" + + # download base system sets + ensureDownloadTool + + BASE_SETS=(base comp) + for set in "${BASE_SETS[@]}"; do + FILE="${set}${__OpenBSDVersion//./}.tgz" + echo "Downloading $FILE..." + if [[ "$__hasWget" == 1 ]]; then + wget -O- "$OPENBSD_MIRROR/$FILE" | tar -C "$__RootfsDir" -xzpf - + else + curl -SL "$OPENBSD_MIRROR/$FILE" | tar -C "$__RootfsDir" -xzpf - + fi + done + + PKG_MIRROR="https://cdn.openbsd.org/pub/OpenBSD/${__OpenBSDVersion}/packages/${__OpenBSDMachineArch}" + + echo "Installing packages into sysroot..." + + for pkg in $__OpenBSDPackages; do + echo "Resolving package filename for $pkg..." + + if [[ "$__hasWget" == 1 ]]; then + PKG_FILE=$(wget -qO- "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1) + [[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; } + wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf - + else + PKG_FILE=$(curl -s "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1) + [[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; } + curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf - + fi + done elif [[ "$__CodeName" == "illumos" ]]; then mkdir "$__RootfsDir/tmp" pushd "$__RootfsDir/tmp" diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 0ff85cf0367e..ff2dfdb4a5bf 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -3,15 +3,22 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR}) # reset platform variables (e.g. cmake 3.25 sets LINUX=1) unset(LINUX) unset(FREEBSD) +unset(OPENBSD) unset(ILLUMOS) unset(ANDROID) unset(TIZEN) unset(HAIKU) set(TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}) + +file(GLOB OPENBSD_PROBE "${CROSS_ROOTFS}/etc/signify/openbsd-*.pub") + if(EXISTS ${CROSS_ROOTFS}/bin/freebsd-version) set(CMAKE_SYSTEM_NAME FreeBSD) set(FREEBSD 1) +elseif(OPENBSD_PROBE) + set(CMAKE_SYSTEM_NAME OpenBSD) + set(OPENBSD 1) elseif(EXISTS ${CROSS_ROOTFS}/usr/platform/i86pc) set(CMAKE_SYSTEM_NAME SunOS) set(ILLUMOS 1) @@ -53,6 +60,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") + elseif(OPENBSD) + set(triple "aarch64-unknown-openbsd") endif() elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) @@ -109,6 +118,8 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") + elseif(OPENBSD) + set(triple "x86_64-unknown-openbsd") elseif(ILLUMOS) set(TOOLCHAIN "x86_64-illumos") elseif(HAIKU) @@ -193,7 +204,7 @@ if(ANDROID) # include official NDK toolchain script include(${CROSS_ROOTFS}/../build/cmake/android.toolchain.cmake) -elseif(FREEBSD) +elseif(FREEBSD OR OPENBSD) # we cross-compile by instructing clang set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER_TARGET ${triple}) @@ -291,7 +302,7 @@ endif() # Specify compile options -if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD) OR ILLUMOS OR HAIKU) +if((TARGET_ARCH_NAME MATCHES "^(arm|arm64|armel|armv6|loongarch64|ppc64le|riscv64|s390x|x64|x86)$" AND NOT ANDROID AND NOT FREEBSD AND NOT OPENBSD) OR ILLUMOS OR HAIKU) set(CMAKE_C_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_CXX_COMPILER_TARGET ${TOOLCHAIN}) set(CMAKE_ASM_COMPILER_TARGET ${TOOLCHAIN}) diff --git a/eng/tools/RepoTasks/CreateFrameworkListFile.cs b/eng/tools/RepoTasks/CreateFrameworkListFile.cs deleted file mode 100644 index b6794c2a9ff2..000000000000 --- a/eng/tools/RepoTasks/CreateFrameworkListFile.cs +++ /dev/null @@ -1,143 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Xml.Linq; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; - -namespace RepoTasks; - -public class CreateFrameworkListFile : Microsoft.Build.Utilities.Task -{ - /// - /// Files to extract basic information from and include in the list. - /// - [Required] - public ITaskItem[] Files { get; set; } - - [Required] - public string TargetFile { get; set; } - - /// - /// Extra attributes to place on the root node. - /// - /// %(Identity): Attribute name. - /// %(Value): Attribute value. - /// - public ITaskItem[] RootAttributes { get; set; } - - public override bool Execute() - { - XAttribute[] rootAttributes = RootAttributes - ?.Select(item => new XAttribute(item.ItemSpec, item.GetMetadata("Value"))) - .ToArray(); - - var frameworkManifest = new XElement("FileList", rootAttributes); - - var usedFileProfiles = new HashSet(); - - foreach (var f in Files - .Select(item => new - { - Item = item, - Filename = Path.GetFileName(item.ItemSpec), - AssemblyName = FileUtilities.GetAssemblyName(item.ItemSpec), - FileVersion = FileUtilities.GetFileVersion(item.ItemSpec), - IsNative = item.GetMetadata("IsNativeImage") == "true", - IsSymbolFile = item.GetMetadata("IsSymbolFile") == "true", - PackagePath = GetPackagePath(item) - }) - .Where(f => - !f.IsSymbolFile && - (f.Filename.EndsWith(".dll", StringComparison.OrdinalIgnoreCase) || f.IsNative)) - .OrderBy(f => f.Filename, StringComparer.Ordinal)) - { - string path = Path.Combine(f.PackagePath, f.Filename).Replace('\\', '/'); - string type = f.IsNative ? "Native" : "Managed"; - var element = new XElement("File", new XAttribute("Path", path)); - - if (path.StartsWith("analyzers/", StringComparison.Ordinal)) - { - type = "Analyzer"; - - if (path.EndsWith(".resources.dll", StringComparison.Ordinal)) - { - // omit analyzer resources - continue; - } - - var pathParts = path.Split('/'); - - if (pathParts.Length < 3 || !pathParts[1].Equals("dotnet", StringComparison.Ordinal) || pathParts.Length > 5) - { - Log.LogError($"Unexpected analyzer path format {path}. Expected 'analyzers/dotnet(/roslyn)(/language)/analyzer.dll"); - } - - // Check if we have enough parts for language directory and include it. - // There could be a roslyn folder before the language folder. Check for it. - bool hasRoslynVersion = pathParts[2].StartsWith("roslyn", StringComparison.Ordinal); - int languageLengthCheck = hasRoslynVersion ? 4 : 3; - int potentialLanguageIndex = hasRoslynVersion ? 3 : 2; - if (pathParts.Length > languageLengthCheck) - { - element.Add(new XAttribute("Language", pathParts[potentialLanguageIndex])); - } - } - - element.Add(new XAttribute("Type", type)); - - if (f.AssemblyName != null) - { - byte[] publicKeyToken = f.AssemblyName.GetPublicKeyToken(); - string publicKeyTokenHex; - - if (publicKeyToken != null) - { - publicKeyTokenHex = BitConverter.ToString(publicKeyToken) - .ToLowerInvariant() - .Replace("-", ""); - } - else - { - Log.LogError($"No public key token found for assembly {f.Item.ItemSpec}"); - publicKeyTokenHex = ""; - } - - element.Add( - new XAttribute("AssemblyName", f.AssemblyName.Name), - new XAttribute("PublicKeyToken", publicKeyTokenHex), - new XAttribute("AssemblyVersion", f.AssemblyName.Version)); - } - else if (!f.IsNative) - { - // This file isn't managed and isn't native. Leave it off the list. - continue; - } - - element.Add(new XAttribute("FileVersion", f.FileVersion)); - - frameworkManifest.Add(element); - } - - Directory.CreateDirectory(Path.GetDirectoryName(TargetFile)); - File.WriteAllText(TargetFile, frameworkManifest.ToString()); - - return !Log.HasLoggedErrors; - } - private static string GetPackagePath(ITaskItem item) - { - string packagePath = item.GetMetadata("PackagePath"); - - // replicate the logic used by PackTask https://github.com/NuGet/NuGet.Client/blob/f24bad0668193ce21a1db8cabd1ce95ba509c7f0/src/NuGet.Core/NuGet.Build.Tasks.Pack/PackTaskLogic.cs#L644-L647 - string recursiveDir = item.GetMetadata("RecursiveDir"); - recursiveDir = string.IsNullOrEmpty(recursiveDir) ? item.GetMetadata("NuGetRecursiveDir") : recursiveDir; - - return string.IsNullOrEmpty(recursiveDir) ? packagePath : - Path.Combine(packagePath, recursiveDir); - } -} diff --git a/eng/tools/RepoTasks/GenerateSharedFrameworkDepsFile.cs b/eng/tools/RepoTasks/GenerateSharedFrameworkDepsFile.cs deleted file mode 100644 index fd823fe8ee38..000000000000 --- a/eng/tools/RepoTasks/GenerateSharedFrameworkDepsFile.cs +++ /dev/null @@ -1,123 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.IO; -using System.Linq; -using System.Reflection; -using System.Text; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Microsoft.Extensions.DependencyModel; - -namespace RepoTasks; - -public class GenerateSharedFrameworkDepsFile : Microsoft.Build.Utilities.Task -{ - [Required] - public string DepsFilePath { get; set; } - - [Required] - public string TargetFramework { get; set; } - - [Required] - public string FrameworkName { get; set; } - - [Required] - public string FrameworkVersion { get; set; } - - [Required] - public ITaskItem[] References { get; set; } - - [Required] - public string RuntimeIdentifier { get; set; } - - [Required] - public string RuntimePackageName { get; set; } - - [Required] - public string PlatformManifestOutputPath { get; set; } - - public override bool Execute() - { - ExecuteCore(); - - return !Log.HasLoggedErrors; - } - - private void ExecuteCore() - { - var target = new TargetInfo(TargetFramework, RuntimeIdentifier, string.Empty, isPortable: false); - var runtimeFiles = new List(); - var nativeFiles = new List(); - var resourceAssemblies = new List(); - var platformManifest = new List(); - - foreach (var reference in References) - { - var filePath = reference.ItemSpec; - var fileName = Path.GetFileName(filePath); - var fileVersion = FileUtilities.GetFileVersion(filePath)?.ToString() ?? string.Empty; - var assemblyVersion = FileUtilities.GetAssemblyName(filePath)?.Version; - if (assemblyVersion == null) - { - var nativeFile = new RuntimeFile(fileName, null, fileVersion); - nativeFiles.Add(nativeFile); - platformManifest.Add($"{fileName}|{FrameworkName}||{fileVersion}"); - } - else - { - var runtimeFile = new RuntimeFile(fileName, - fileVersion: fileVersion, - assemblyVersion: assemblyVersion.ToString()); - runtimeFiles.Add(runtimeFile); - platformManifest.Add($"{fileName}|{FrameworkName}|{assemblyVersion}|{fileVersion}"); - } - } - - var runtimeLibrary = new RuntimeLibrary("package", - RuntimePackageName, - FrameworkVersion, - hash: string.Empty, - runtimeAssemblyGroups: new[] { new RuntimeAssetGroup(string.Empty, runtimeFiles) }, - nativeLibraryGroups: new[] { new RuntimeAssetGroup(string.Empty, nativeFiles) }, - Enumerable.Empty(), - Array.Empty(), - hashPath: null, - path: $"{RuntimePackageName.ToLowerInvariant()}/{FrameworkVersion}", - serviceable: true); - - var context = new DependencyContext(target, - CompilationOptions.Default, - Enumerable.Empty(), - new[] { runtimeLibrary }, - Enumerable.Empty()); - - Directory.CreateDirectory(Path.GetDirectoryName(DepsFilePath)); - Directory.CreateDirectory(Path.GetDirectoryName(PlatformManifestOutputPath)); - - File.WriteAllText( - PlatformManifestOutputPath, - string.Join("\n", platformManifest.OrderBy(n => n)), - Encoding.UTF8); - - try - { - using (var depsStream = File.Create(DepsFilePath)) - { - new DependencyContextWriter().Write(context, depsStream); - } - } - catch (Exception ex) - { - // If there is a problem, ensure we don't write a partially complete version to disk. - if (File.Exists(DepsFilePath)) - { - File.Delete(DepsFilePath); - } - Log.LogErrorFromException(ex); - } - } -} diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 3a47e89428d5..d558037d1978 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -7,9 +7,7 @@ - - - + diff --git a/global.json b/global.json index 192528724df6..6a55eefa5cf9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-preview.1.26104.118", + "version": "11.0.100-preview.3.26128.104", "paths": [ ".dotnet", "$host$" @@ -8,7 +8,7 @@ "errorMessage": "The .NET SDK could not be found, run ./restore.cmd or ./restore.sh first." }, "tools": { - "dotnet": "11.0.100-preview.1.26104.118", + "dotnet": "11.0.100-preview.3.26128.104", "runtimes": { "dotnet/x86": [ "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)" @@ -22,9 +22,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26153.117", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26153.117", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26153.117", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26162.108", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.26162.108", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.26162.108", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440" diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 2d29fd599a7e..9efa686bacd9 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -38,13 +38,6 @@ - - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\net\Microsoft.DotNet.Build.Tasks.Installers.dll - $(NuGetPackageRoot)microsoft.dotnet.build.tasks.installers\$(MicrosoftDotNetBuildTasksInstallersVersion)\tools\netframework\Microsoft.DotNet.Build.Tasks.Installers.dll - - - - diff --git a/src/Servers/Kestrel/Core/src/ListenOptions.cs b/src/Servers/Kestrel/Core/src/ListenOptions.cs index 72ac5e355a2a..7d673ed241d0 100644 --- a/src/Servers/Kestrel/Core/src/ListenOptions.cs +++ b/src/Servers/Kestrel/Core/src/ListenOptions.cs @@ -33,11 +33,11 @@ internal ListenOptions(string socketPath) } internal ListenOptions(ulong fileHandle) - : this(fileHandle, FileHandleType.Auto) + : this(fileHandle, Microsoft.AspNetCore.Connections.FileHandleType.Auto) { } - internal ListenOptions(ulong fileHandle, FileHandleType handleType) + internal ListenOptions(ulong fileHandle, Microsoft.AspNetCore.Connections.FileHandleType handleType) { EndPoint = new FileHandleEndPoint(fileHandle, handleType); } diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportOptionsTests.cs b/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportOptionsTests.cs index 9a61fa2663fe..790b55f34396 100644 --- a/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportOptionsTests.cs +++ b/src/Servers/Kestrel/test/Sockets.BindTests/SocketTransportOptionsTests.cs @@ -55,7 +55,7 @@ public Task SocketTransportCallsCreateBoundListenSocketForNewEndpoints(EndPoint public async Task SocketTransportCallsCreateBoundListenSocketForFileHandleEndpoint() { using var fileHandleSocket = CreateBoundSocket(); - var endpoint = new FileHandleEndPoint((ulong)fileHandleSocket.Handle, FileHandleType.Auto); + var endpoint = new FileHandleEndPoint((ulong)fileHandleSocket.Handle, Microsoft.AspNetCore.Connections.FileHandleType.Auto); await VerifySocketTransportCallsCreateBoundListenSocketAsync(endpoint); } @@ -72,7 +72,7 @@ public void CreateDefaultBoundListenSocket_BindsForNewEndPoints(EndPoint endpoin public void CreateDefaultBoundListenSocket_PreservesLocalEndpointFromFileHandleEndpoint() { using var fileHandleSocket = CreateBoundSocket(); - var endpoint = new FileHandleEndPoint((ulong)fileHandleSocket.Handle, FileHandleType.Auto); + var endpoint = new FileHandleEndPoint((ulong)fileHandleSocket.Handle, Microsoft.AspNetCore.Connections.FileHandleType.Auto); using var listenSocket = SocketTransportOptions.CreateDefaultBoundListenSocket(endpoint);