Skip to content

[release/6.0] React to dotnet/runtime#57816 #36155

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

Merged
dougbu merged 2 commits into from
Sep 7, 2021
Merged

[release/6.0] React to dotnet/runtime#57816 #36155

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd4c2bc
[release/6.0] React to dotnet/runtime#57816
dougbu Sep 3, 2021
caed293
Merge branch 'release/6.0' into dougbu/permissions.closure
dougbu Sep 6, 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
6 changes: 0 additions & 6 deletions eng/Dependencies.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,6 @@ and are generated based on the last package release.
<LatestPackageReference Include="System.Threading.Channels" />
<LatestPackageReference Include="System.ValueTuple" />

<!-- Runtime packages referenced only for exclusions -->
<LatestPackageReference Include="Microsoft.Win32.SystemEvents" />
<LatestPackageReference Include="System.Drawing.Common" />
<LatestPackageReference Include="System.Security.Permissions" />
<LatestPackageReference Include="System.Windows.Extensions" />

<!-- Runtime packages required for crossgen -->
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x64" />
<LatestPackageReference Include="Microsoft.NETCore.App.Runtime.win-x86" />
Expand Down
16 changes: 0 additions & 16 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
Expand All @@ -197,10 +193,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
Expand Down Expand Up @@ -233,10 +225,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
Expand All @@ -253,10 +241,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-rc.2.21453.3">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>41dcbd6a2a7e7963f2a508a8b36cad8689d1e4ae</Sha>
Expand Down
4 changes: 0 additions & 4 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-rc.2.21453.3</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0-rc.2.21453.3</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0-rc.2.21453.3</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftWin32SystemEventsVersion>6.0.0-rc.2.21453.3</MicrosoftWin32SystemEventsVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rc.2.21453.3</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.2.21453.3</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0-rc.2.21453.3</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.0-rc.2.21453.3</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>6.0.0-rc.2.21453.3</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>6.0.0-rc.2.21453.3</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0-rc.2.21453.3</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0-rc.2.21453.3</SystemNetHttpWinHttpHandlerVersion>
Expand All @@ -120,12 +118,10 @@
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.2.21453.3</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.2.21453.3</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.2.21453.3</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>6.0.0-rc.2.21453.3</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0-rc.2.21453.3</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0-rc.2.21453.3</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.0-rc.2.21453.3</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0-rc.2.21453.3</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>6.0.0-rc.2.21453.3</SystemWindowsExtensionsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.2.21453.3</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
Expand Down
8 changes: 0 additions & 8 deletions src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
SkipGetTargetFrameworkProperties="true"
UndefineProperties="TargetFramework;TargetFrameworks;RuntimeIdentifier;PublishDir" />

<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />

@ericstj ericstj Sep 3, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I wonder if you can remove some of the stuff in _DisallowedReferenceAssemblies now?

@dougbu dougbu Sep 3, 2021

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Hmm, _maybe_❔ I'll look at a binlog once the CI wraps up.

<!-- Enforce build order. Targeting pack needs to bundle information about the runtime. -->
<ProjectReference Include="..\..\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
Expand Down
8 changes: 0 additions & 8 deletions src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,6 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<IncludeAssets>Runtime;Native</IncludeAssets>
</Reference>

<!-- Omit System.Security.Permissions closure. https://github.com/dotnet/runtime/issues/54341
It is brought in by System.Security.Cryptography.Xml for netstandard2.0 compatibility
but not required in net6.0 since the types required exist in System.Security.AccessControl. -->
<Reference Include="Microsoft.Win32.SystemEvents" ExcludeAssets="All" />
<Reference Include="System.Drawing.Common" ExcludeAssets="All" />
<Reference Include="System.Security.Permissions" ExcludeAssets="All" />
<Reference Include="System.Windows.Extensions" ExcludeAssets="All" />

<Reference Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
ExcludeAssets="All"
PrivateAssets="All"
Expand Down