From e58a6c2465a75267083cf95755ea950f7b0ae2c2 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 7 Sep 2021 10:38:35 -0700
Subject: [PATCH] [release/6.0] React to dotnet/runtime#57816 (#36155)
- see https://github.com/dotnet/runtime/pull/57816#issuecomment-912755824
- undo much of 18a61fb96c0e
---
eng/Dependencies.props | 6 ------
eng/Version.Details.xml | 16 ----------------
eng/Versions.props | 4 ----
.../src/Microsoft.AspNetCore.App.Ref.csproj | 8 --------
.../src/Microsoft.AspNetCore.App.Runtime.csproj | 8 --------
5 files changed, 42 deletions(-)
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
index b78ad89a9e3..4f64075c07c 100644
--- a/eng/Dependencies.props
+++ b/eng/Dependencies.props
@@ -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" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c6bace3572f..8b15dbd21b8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -177,10 +177,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
</Dependency>
- <Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0-rc.2.21454.1">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
- </Dependency>
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.0-rc.2.21454.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
@@ -197,10 +193,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
</Dependency>
- <Dependency Name="System.Drawing.Common" Version="6.0.0-rc.2.21454.1">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
- </Dependency>
<Dependency Name="System.IO.Pipelines" Version="6.0.0-rc.2.21454.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
@@ -233,10 +225,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
</Dependency>
- <Dependency Name="System.Security.Permissions" Version="6.0.0-rc.2.21454.1">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
- </Dependency>
<Dependency Name="System.ServiceProcess.ServiceController" Version="6.0.0-rc.2.21454.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
@@ -253,10 +241,6 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
</Dependency>
- <Dependency Name="System.Windows.Extensions" Version="6.0.0-rc.2.21454.1">
- <Uri>https://github.com/dotnet/runtime</Uri>
- <Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
- </Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0-rc.2.21454.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b7e72a4ab2cb4832d88f7f23a2493287f7bcc43b</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 36bf5ff08ab..984fefdc571 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -106,12 +106,10 @@
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0-rc.2.21454.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>6.0.0-rc.2.21454.1</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>6.0.0-rc.2.21454.1</MicrosoftExtensionsPrimitivesVersion>
- <MicrosoftWin32SystemEventsVersion>6.0.0-rc.2.21454.1</MicrosoftWin32SystemEventsVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rc.2.21454.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemDiagnosticsDiagnosticSourceVersion>6.0.0-rc.2.21454.1</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>6.0.0-rc.2.21454.1</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>6.0.0-rc.2.21454.1</SystemDirectoryServicesProtocolsVersion>
- <SystemDrawingCommonVersion>6.0.0-rc.2.21454.1</SystemDrawingCommonVersion>
<SystemIOPipelinesVersion>6.0.0-rc.2.21454.1</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>6.0.0-rc.2.21454.1</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>6.0.0-rc.2.21454.1</SystemNetHttpWinHttpHandlerVersion>
@@ -120,12 +118,10 @@
<SystemRuntimeCompilerServicesUnsafeVersion>6.0.0-rc.2.21454.1</SystemRuntimeCompilerServicesUnsafeVersion>
<SystemSecurityCryptographyPkcsVersion>6.0.0-rc.2.21454.1</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>6.0.0-rc.2.21454.1</SystemSecurityCryptographyXmlVersion>
- <SystemSecurityPermissionsVersion>6.0.0-rc.2.21454.1</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>6.0.0-rc.2.21454.1</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>6.0.0-rc.2.21454.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>6.0.0-rc.2.21454.1</SystemTextJsonVersion>
<SystemThreadingChannelsVersion>6.0.0-rc.2.21454.1</SystemThreadingChannelsVersion>
- <SystemWindowsExtensionsVersion>6.0.0-rc.2.21454.1</SystemWindowsExtensionsVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>6.0.0-rc.2.21454.1</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
index 48791e68f59..e7868125ebf 100644
--- a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
+++ b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.csproj
@@ -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" />
-
<!-- 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>
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
index 7db491507a7..76362c47aad 100644
--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
+++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj
@@ -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"
--
GitLab