Skip to content
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.

Sign up for GitHub

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

[main] Update dependencies from dotnet/efcore dotnet/runtime #34033

Merged
merged 51 commits into from
Jul 12, 2021
Merged

[main] Update dependencies from dotnet/efcore dotnet/runtime #34033

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
ef1a0e5
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 2, 2021
42412d4
Workaround duplicate logging source generator
pranavkm Jul 2, 2021
bf18ea4
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 3, 2021
2533e93
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 5, 2021
1b37f79
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 5, 2021
6fbf14b
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 6, 2021
8f99347
Merge branch 'main' into darc-main-1709b9ed-50a0-4e28-b9b8-0e3759aee720
TanayParikh Jul 6, 2021
a2ec9d6
Fix CS8795
TanayParikh Jul 7, 2021
81fdc44
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 7, 2021
c2344ed
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 7, 2021
a54fe68
Update Wasm.Performance.TestApp.csproj
TanayParikh Jul 7, 2021
91b5158
Fix skipEnabledCheck
TanayParikh Jul 7, 2021
db9d09f
Merge branch 'main' into darc-main-1709b9ed-50a0-4e28-b9b8-0e3759aee720
TanayParikh Jul 7, 2021
2df9266
Update Workarounds.targets
TanayParikh Jul 7, 2021
ce1c062
Revert "Fix CS8795"
TanayParikh Jul 7, 2021
5d6e21e
Revert "Convert HealthChecks logging to use new Logging Source Genera…
TanayParikh Jul 7, 2021
fd25b6b
Utilize class level SkipEnabledCheckLogOptions
TanayParikh Jul 8, 2021
7148dcb
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 8, 2021
6f08d04
React to MvcCoreLoggerExtensions feedback
captainsafia Jul 8, 2021
8731131
Merge remote-tracking branch 'origin/main' into darc-main-1709b9ed-50…
captainsafia Jul 8, 2021
56977cd
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 8, 2021
9a90983
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 8, 2021
ed196cb
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 9, 2021
bcfb3e1
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 9, 2021
6f72cf7
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 9, 2021
d92ac8f
Update dependencies from https://github.com/dotnet/efcore build 20210…
dotnet-maestro[bot] Jul 9, 2021
72b736c
React to nullability changes in TypeConverter
captainsafia Jul 9, 2021
2d1ca9b
Merge branch 'main' into darc-main-1709b9ed-50a0-4e28-b9b8-0e3759aee720
BrennanConroy Jul 9, 2021
0b06bf5
React to new analyzer warnings
captainsafia Jul 9, 2021
544458f
Revert "Revert "Convert HealthChecks logging to use new Logging Sourc…
captainsafia Jul 9, 2021
ff4cd8d
Update src/Http/Routing/src/Matching/DfaMatcher.cs
captainsafia Jul 9, 2021
1f32895
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 10, 2021
b782842
Update exception caught in HTTP2 tests
captainsafia Jul 11, 2021
9d60f25
Merge branch 'main' of https://github.com/dotnet/aspnetcore into darc…
captainsafia Jul 11, 2021
cce1bd7
Revert "Remove usings from templates implicitly added by the SDK (#34…
captainsafia Jul 11, 2021
cde8ba4
Fix up exceptions for HTTP2 tests
captainsafia Jul 11, 2021
a355d6b
Revert "Revert "Remove usings from templates implicitly added by the …
captainsafia Jul 11, 2021
1f88826
Update dependencies from https://github.com/dotnet/runtime build 2021…
dotnet-maestro[bot] Jul 11, 2021
1c9a52e
Bump up SDK to bring in usings changes
captainsafia Jul 11, 2021
6bdb3ac
Try running template tests on non-Helix
captainsafia Jul 11, 2021
1ca4eaa
Update ci.yml
captainsafia Jul 11, 2021
2136f31
Try disabling template tests on Helix
captainsafia Jul 11, 2021
62fbc87
Revert "Stop running template tests on azdo job (already helix-ified)…
captainsafia Jul 11, 2021
1714f50
Don't build Helix payload for template tests
captainsafia Jul 11, 2021
d7fe599
Temporarily skip FrameworkListListsContainsCorrectPaths
captainsafia Jul 11, 2021
f5cecb2
Use dotnet test for test discovery
captainsafia Jul 11, 2021
f201b29
Revert "Use dotnet test for test discovery"
davidfowl Jul 12, 2021
00a8f1f
Try skipping listing tests list in helix
davidfowl Jul 12, 2021
a94dde5
Revert "Try disabling template tests on Helix"
davidfowl Jul 12, 2021
942e2c6
Remove generic type from test method
davidfowl Jul 12, 2021
0079eee
Removed another generic from the test method
davidfowl Jul 12, 2021
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
248 changes: 124 additions & 124 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

124 changes: 62 additions & 62 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,69 +65,69 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.7.21351.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.7.21351.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.7.21351.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.7.21351.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.7.21351.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.7.21351.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0-preview.7.21351.2</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftWin32SystemEventsVersion>6.0.0-preview.7.21351.2</MicrosoftWin32SystemEventsVersion>
<MicrosoftAspNetCoreInternalTransportVersion>6.0.0-preview.7.21351.2</MicrosoftAspNetCoreInternalTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.7.21351.2</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0-preview.7.21351.2</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.0-preview.7.21351.2</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.7.21351.2</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>6.0.0-preview.7.21351.2</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0-preview.7.21351.2</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0-preview.7.21351.2</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>6.0.0-preview.7.21351.2</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.7.21351.2</SystemResourcesExtensionsVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21351.2</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0-preview.7.21351.2</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0-preview.7.21351.2</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>6.0.0-preview.7.21351.2</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0-preview.7.21351.2</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0-preview.7.21351.2</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.0-preview.7.21351.2</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0-preview.7.21351.2</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>6.0.0-preview.7.21351.2</SystemWindowsExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.7.21352.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.7.21352.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.7.21352.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.7.21352.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.7.21352.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.7.21352.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0-preview.7.21352.2</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftWin32SystemEventsVersion>6.0.0-preview.7.21352.2</MicrosoftWin32SystemEventsVersion>
<MicrosoftAspNetCoreInternalTransportVersion>6.0.0-preview.7.21352.2</MicrosoftAspNetCoreInternalTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-preview.7.21352.2</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0-preview.7.21352.2</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.0-preview.7.21352.2</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>6.0.0-preview.7.21352.2</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>6.0.0-preview.7.21352.2</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0-preview.7.21352.2</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0-preview.7.21352.2</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>6.0.0-preview.7.21352.2</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>6.0.0-preview.7.21352.2</SystemResourcesExtensionsVersion>
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-preview.7.21352.2</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0-preview.7.21352.2</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0-preview.7.21352.2</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>6.0.0-preview.7.21352.2</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0-preview.7.21352.2</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0-preview.7.21352.2</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.0-preview.7.21352.2</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0-preview.7.21352.2</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>6.0.0-preview.7.21352.2</SystemWindowsExtensionsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.7.21351.2</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>6.0.0-preview.7.21352.2</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>6.0.0-preview.7.21351.1</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-preview.7.21351.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
Expand Down
7 changes: 7 additions & 0 deletions eng/Workarounds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,4 +59,11 @@
<RazorReferencePath Include="@(ReferencePathWithRefAssemblies)" />
</ItemGroup>
</Target>

<!-- Work around https://github.com/dotnet/aspnetcore/issues/34048 -->
<Target Name="_RemoveDuplicateLoggingSourceGenerator" AfterTargets="ResolvePackageAssets" Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dougbu I did a random workaround because I couldn't get PrivateAssets / ExcludeAssets to work for some reason. Could you have a look and see if there's a better way to do this?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks about right b/c Logging.Abstractions is referenced transitively so often. But, I'd like to hear from @ericstj why the offending assembly is duplicated between Logging.Abstractions and our transport package.

<ItemGroup>
<ResolvedAnalyzers Remove="@(ResolvedAnalyzers)" Condition="'%(ResolvedAnalyzers.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
</ItemGroup>
</Target>
</Project>
1 change: 0 additions & 1 deletion ...p/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This references are brought in from the transport package. Having / removing it does nothing, but it seemed unnecessary.

<Reference Include="Microsoft.Extensions.Options" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion src/Http/Http.Results/src/Microsoft.AspNetCore.Http.Results.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
<Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Routing" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />

<InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Results.Tests" />
</ItemGroup>
Expand Down
1 change: 0 additions & 1 deletion src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
<Reference Include="Microsoft.AspNetCore.Authorization" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.ObjectPool" />
<Reference Include="Microsoft.Extensions.Options" />

Expand Down
1 change: 0 additions & 1 deletion src/Security/Authentication/Core/src/Microsoft.AspNetCore.Authentication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
<Reference Include="Microsoft.AspNetCore.DataProtection" />
<Reference Include="Microsoft.AspNetCore.Http" />
<Reference Include="Microsoft.AspNetCore.Http.Extensions" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="Microsoft.Extensions.WebEncoders" />
</ItemGroup>
Expand Down