Skip to content

[automated] Merge branch 'release/6.0-rc1' => 'release/6.0' #35619

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.

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

Closed
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
280 changes: 140 additions & 140 deletions eng/Version.Details.xml

Large diffs are not rendered by default.

140 changes: 70 additions & 70 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -65,78 +65,78 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21418.17</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21418.17</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-rc.1.21418.17</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-rc.1.21418.17</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-rc.1.21418.17</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-rc.1.21418.17</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0-rc.1.21418.17</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftWin32SystemEventsVersion>6.0.0-rc.1.21418.17</MicrosoftWin32SystemEventsVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rc.1.21418.17</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.1.21418.17</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0-rc.1.21418.17</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.0-rc.1.21418.17</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.1.21418.17</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>6.0.0-rc.1.21418.17</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0-rc.1.21418.17</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0-rc.1.21418.17</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>6.0.0-rc.1.21418.17</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21418.17</SystemResourcesExtensionsVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.1.21418.17</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.1.21418.17</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.1.21418.17</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>6.0.0-rc.1.21418.17</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0-rc.1.21418.17</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0-rc.1.21418.17</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.0-rc.1.21418.17</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0-rc.1.21418.17</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>6.0.0-rc.1.21418.17</SystemWindowsExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-rc.1.21421.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-rc.1.21421.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-rc.1.21421.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-rc.1.21421.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-rc.1.21421.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-rc.1.21421.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0-rc.1.21421.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftWin32SystemEventsVersion>6.0.0-rc.1.21421.1</MicrosoftWin32SystemEventsVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rc.1.21421.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.1.21421.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0-rc.1.21421.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.0-rc.1.21421.1</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.1.21421.1</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>6.0.0-rc.1.21421.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0-rc.1.21421.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0-rc.1.21421.1</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>6.0.0-rc.1.21421.1</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>6.0.0-rc.1.21421.1</SystemResourcesExtensionsVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.1.21421.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.1.21421.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.1.21421.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>6.0.0-rc.1.21421.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0-rc.1.21421.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0-rc.1.21421.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.0-rc.1.21421.1</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0-rc.1.21421.1</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>6.0.0-rc.1.21421.1</SystemWindowsExtensionsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21418.17</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.1.21421.1</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>6.0.0-rc.1.21418.16</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-rc.1.21418.16</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>6.0.0-rc.1.21421.6</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-rc.1.21421.6</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21418.12</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/docker/bionic.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.1-runtime-deps-bionic
FROM mcr.microsoft.com/dotnet/runtime-deps:2.1-bionic

ARG USER
ARG USER_ID
Expand Down
2 changes: 1 addition & 1 deletion eng/scripts/CodeCheck.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ try {
}
}
# Check for changes in Unshipped in servicing branches
if ($targetBranch -like 'release*' -and $targetBranch -notlike '*preview*' -and $file -like '*PublicAPI.Unshipped.txt') {
if ($targetBranch -like 'release*' -and $targetBranch -notlike '*preview*' -and $targetBranch -notlike '*rc*' -and $file -like '*PublicAPI.Unshipped.txt') {
$changedAPIBaselines.Add($file)
}
}
Expand Down
Loading