Skip to content

Commit 1b8ed19

Browse files
TanayParikhTanayParikh
committed
Merge branch 'main' into taparik/streamingInterop
2 parents f565366 + 087aae5 commit 1b8ed19

File tree

26 files changed

+428
-236
lines changed

26 files changed

+428
-236
lines changed

‎eng/Version.Details.xml

Lines changed: 124 additions & 124 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 62 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -65,69 +65,69 @@
6565
-->
6666
<PropertyGroup Label="Automated">
6767
<!-- Packages from dotnet/runtime -->
68-
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsDependencyModelVersion>
69-
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.7.21323.1</MicrosoftNETCoreAppRefVersion>
70-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.7.21323.1</MicrosoftNETCoreAppRuntimewinx64Version>
71-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.7.21323.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.7.21323.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
73-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.7.21323.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.7.21323.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
75-
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsCachingAbstractionsVersion>
76-
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsCachingMemoryVersion>
77-
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
78-
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationBinderVersion>
79-
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationCommandLineVersion>
80-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
81-
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
82-
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationIniVersion>
83-
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationJsonVersion>
84-
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationVersion>
85-
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
86-
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsConfigurationXmlVersion>
87-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
88-
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsDependencyInjectionVersion>
89-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
90-
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsFileProvidersCompositeVersion>
91-
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
92-
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsFileSystemGlobbingVersion>
93-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
94-
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsHostingAbstractionsVersion>
95-
<MicrosoftExtensionsHostingVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsHostingVersion>
96-
<MicrosoftExtensionsHttpVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsHttpVersion>
97-
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingAbstractionsVersion>
98-
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingConfigurationVersion>
99-
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingConsoleVersion>
100-
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingDebugVersion>
101-
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingEventSourceVersion>
102-
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingEventLogVersion>
103-
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingVersion>
104-
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsLoggingTraceSourceVersion>
105-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
106-
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107-
<MicrosoftExtensionsOptionsVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsOptionsVersion>
108-
<MicrosoftExtensionsPrimitivesVersion>6.0.0-preview.7.21323.1</MicrosoftExtensionsPrimitivesVersion>
109-
<MicrosoftWin32SystemEventsVersion>6.0.0-preview.7.21323.1</MicrosoftWin32SystemEventsVersion>
110-
<MicrosoftAspNetCoreInternalTransportVersion>6.0.0-preview.7.21323.1</MicrosoftAspNetCoreInternalTransportVersion>
111-
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.7.21323.1</SystemDiagnosticsDiagnosticSourceVersion>
112-
<SystemDiagnosticsEventLogVersion>6.0.0-preview.7.21323.1</SystemDiagnosticsEventLogVersion>
113-
<SystemDirectoryServicesProtocolsVersion>6.0.0-preview.7.21323.1</SystemDirectoryServicesProtocolsVersion>
114-
<SystemDrawingCommonVersion>6.0.0-preview.7.21323.1</SystemDrawingCommonVersion>
115-
<SystemIOPipelinesVersion>6.0.0-preview.7.21323.1</SystemIOPipelinesVersion>
116-
<SystemNetHttpJsonVersion>6.0.0-preview.7.21323.1</SystemNetHttpJsonVersion>
117-
<SystemNetHttpWinHttpHandlerVersion>6.0.0-preview.7.21323.1</SystemNetHttpWinHttpHandlerVersion>
118-
<SystemReflectionMetadataVersion>6.0.0-preview.7.21323.1</SystemReflectionMetadataVersion>
119-
<SystemResourcesExtensionsVersion>6.0.0-preview.7.21323.1</SystemResourcesExtensionsVersion>
120-
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21323.1</SystemRuntimeCompilerServicesUnsafeVersion>
121-
<SystemSecurityCryptographyPkcsVersion>6.0.0-preview.7.21323.1</SystemSecurityCryptographyPkcsVersion>
122-
<SystemSecurityCryptographyXmlVersion>6.0.0-preview.7.21323.1</SystemSecurityCryptographyXmlVersion>
123-
<SystemSecurityPermissionsVersion>6.0.0-preview.7.21323.1</SystemSecurityPermissionsVersion>
124-
<SystemServiceProcessServiceControllerVersion>6.0.0-preview.7.21323.1</SystemServiceProcessServiceControllerVersion>
125-
<SystemTextEncodingsWebVersion>6.0.0-preview.7.21323.1</SystemTextEncodingsWebVersion>
126-
<SystemTextJsonVersion>6.0.0-preview.7.21323.1</SystemTextJsonVersion>
127-
<SystemThreadingChannelsVersion>6.0.0-preview.7.21323.1</SystemThreadingChannelsVersion>
128-
<SystemWindowsExtensionsVersion>6.0.0-preview.7.21323.1</SystemWindowsExtensionsVersion>
68+
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsDependencyModelVersion>
69+
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.7.21325.1</MicrosoftNETCoreAppRefVersion>
70+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.7.21325.1</MicrosoftNETCoreAppRuntimewinx64Version>
71+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.7.21325.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.7.21325.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
73+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.7.21325.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.7.21325.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
75+
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsCachingAbstractionsVersion>
76+
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsCachingMemoryVersion>
77+
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
78+
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationBinderVersion>
79+
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationCommandLineVersion>
80+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
81+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
82+
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationIniVersion>
83+
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationJsonVersion>
84+
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationVersion>
85+
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
86+
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsConfigurationXmlVersion>
87+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
88+
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsDependencyInjectionVersion>
89+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
90+
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsFileProvidersCompositeVersion>
91+
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
92+
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsFileSystemGlobbingVersion>
93+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
94+
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsHostingAbstractionsVersion>
95+
<MicrosoftExtensionsHostingVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsHostingVersion>
96+
<MicrosoftExtensionsHttpVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsHttpVersion>
97+
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingAbstractionsVersion>
98+
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingConfigurationVersion>
99+
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingConsoleVersion>
100+
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingDebugVersion>
101+
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingEventSourceVersion>
102+
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingEventLogVersion>
103+
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingVersion>
104+
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsLoggingTraceSourceVersion>
105+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
106+
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107+
<MicrosoftExtensionsOptionsVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsOptionsVersion>
108+
<MicrosoftExtensionsPrimitivesVersion>6.0.0-preview.7.21325.1</MicrosoftExtensionsPrimitivesVersion>
109+
<MicrosoftWin32SystemEventsVersion>6.0.0-preview.7.21325.1</MicrosoftWin32SystemEventsVersion>
110+
<MicrosoftAspNetCoreInternalTransportVersion>6.0.0-preview.7.21325.1</MicrosoftAspNetCoreInternalTransportVersion>
111+
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.7.21325.1</SystemDiagnosticsDiagnosticSourceVersion>
112+
<SystemDiagnosticsEventLogVersion>6.0.0-preview.7.21325.1</SystemDiagnosticsEventLogVersion>
113+
<SystemDirectoryServicesProtocolsVersion>6.0.0-preview.7.21325.1</SystemDirectoryServicesProtocolsVersion>
114+
<SystemDrawingCommonVersion>6.0.0-preview.7.21325.1</SystemDrawingCommonVersion>
115+
<SystemIOPipelinesVersion>6.0.0-preview.7.21325.1</SystemIOPipelinesVersion>
116+
<SystemNetHttpJsonVersion>6.0.0-preview.7.21325.1</SystemNetHttpJsonVersion>
117+
<SystemNetHttpWinHttpHandlerVersion>6.0.0-preview.7.21325.1</SystemNetHttpWinHttpHandlerVersion>
118+
<SystemReflectionMetadataVersion>6.0.0-preview.7.21325.1</SystemReflectionMetadataVersion>
119+
<SystemResourcesExtensionsVersion>6.0.0-preview.7.21325.1</SystemResourcesExtensionsVersion>
120+
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21325.1</SystemRuntimeCompilerServicesUnsafeVersion>
121+
<SystemSecurityCryptographyPkcsVersion>6.0.0-preview.7.21325.1</SystemSecurityCryptographyPkcsVersion>
122+
<SystemSecurityCryptographyXmlVersion>6.0.0-preview.7.21325.1</SystemSecurityCryptographyXmlVersion>
123+
<SystemSecurityPermissionsVersion>6.0.0-preview.7.21325.1</SystemSecurityPermissionsVersion>
124+
<SystemServiceProcessServiceControllerVersion>6.0.0-preview.7.21325.1</SystemServiceProcessServiceControllerVersion>
125+
<SystemTextEncodingsWebVersion>6.0.0-preview.7.21325.1</SystemTextEncodingsWebVersion>
126+
<SystemTextJsonVersion>6.0.0-preview.7.21325.1</SystemTextJsonVersion>
127+
<SystemThreadingChannelsVersion>6.0.0-preview.7.21325.1</SystemThreadingChannelsVersion>
128+
<SystemWindowsExtensionsVersion>6.0.0-preview.7.21325.1</SystemWindowsExtensionsVersion>
129129
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
130-
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.7.21323.1</MicrosoftNETCorePlatformsVersion>
130+
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.7.21325.1</MicrosoftNETCorePlatformsVersion>
131131
<!-- Packages from dotnet/efcore -->
132132
<dotnetefVersion>6.0.0-preview.7.21321.1</dotnetefVersion>
133133
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-preview.7.21321.1</MicrosoftEntityFrameworkCoreInMemoryVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.100-preview.6.21313.2"
3+
"version": "6.0.100-preview.7.21324.2"
44
},
55
"tools": {
6-
"dotnet": "6.0.100-preview.6.21313.2",
6+
"dotnet": "6.0.100-preview.7.21324.2",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.27",

‎src/Components/Web.JS/dist/Release/blazor.server.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Components/Web.JS/dist/Release/blazor.webview.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)