Skip to content

Commit

Permalink
[main] React to dotnet/runtime#57816 (#36155)
Browse files Browse the repository at this point in the history
- `cherry-pick` e58a6c2
- see dotnet/runtime#57816 (comment)
- also reacting to dotnet/runtime#58731
- undo much of 18a61fb
  • Loading branch information
dougbu committed Sep 22, 2021
1 parent 2b0e81f commit 0412c9d
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 42 deletions.
6 changes: 0 additions & 6 deletions eng/Dependencies.props
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,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
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand All @@ -197,10 +193,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.IO.Pipelines" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand Down Expand Up @@ -233,10 +225,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand All @@ -253,10 +241,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="7.0.0-alpha.1.21471.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5ba7854fa47572eccae544bd101643a1a99db9d4</Sha>
Expand Down
4 changes: 0 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -107,11 +107,9 @@
<MicrosoftExtensionsOptionsVersion>7.0.0-alpha.1.21471.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0-alpha.1.21471.1</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-alpha.1.21471.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftWin32SystemEventsVersion>7.0.0-alpha.1.21471.1</MicrosoftWin32SystemEventsVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-alpha.1.21471.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0-alpha.1.21471.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>7.0.0-alpha.1.21471.1</SystemDirectoryServicesProtocolsVersion>
<SystemDrawingCommonVersion>7.0.0-alpha.1.21471.1</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>7.0.0-alpha.1.21471.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>7.0.0-alpha.1.21471.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>7.0.0-alpha.1.21471.1</SystemNetHttpWinHttpHandlerVersion>
Expand All @@ -120,12 +118,10 @@
<SystemRuntimeCompilerServicesUnsafeVersion>7.0.0-alpha.1.21471.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>7.0.0-alpha.1.21471.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>7.0.0-alpha.1.21471.1</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>7.0.0-alpha.1.21471.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-alpha.1.21471.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0-alpha.1.21471.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.0-alpha.1.21471.1</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>7.0.0-alpha.1.21471.1</SystemThreadingChannelsVersion>
<SystemWindowsExtensionsVersion>7.0.0-alpha.1.21471.1</SystemWindowsExtensionsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>7.0.0-alpha.1.21471.1</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
Expand Down
8 changes: 0 additions & 8 deletions src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,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 net7.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" />

<!-- 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
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,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 net7.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 Condition="'$(CrossgenOutput)' == 'true'"
Include="Microsoft.NETCore.App.Runtime.$(RuntimeIdentifier)"
ExcludeAssets="All"
Expand Down

0 comments on commit 0412c9d

Please sign in to comment.