Revert "[release/6.0] React to dotnet/runtime#57816 (dotnet#36155)"

- was reacting to a change not in our dependencies This reverts commit e58a6c2.
dougbu · Sep 11, 2021 · c90831d · c90831d
1 parent 783732f
commit c90831d
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/eng/Dependencies.props b/eng/Dependencies.props
@@ -79,6 +79,12 @@ 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
@@ -177,6 +177,10 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.Win32.SystemEvents" Version="6.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.0-rtm.21426.20">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
@@ -193,6 +197,10 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
     </Dependency>
+    <Dependency Name="System.Drawing.Common" Version="6.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
+    </Dependency>
     <Dependency Name="System.IO.Pipelines" Version="6.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
@@ -225,6 +233,10 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
     </Dependency>
+    <Dependency Name="System.Security.Permissions" Version="6.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
+    </Dependency>
     <Dependency Name="System.ServiceProcess.ServiceController" Version="6.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
@@ -241,6 +253,10 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
     </Dependency>
+    <Dependency Name="System.Windows.Extensions" Version="6.0.0">
+      <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
+      <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>
+    </Dependency>
     <Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c176936f25b347a3575f736358e4249a85f16536</Sha>

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -105,10 +105,12 @@
     <MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
     <MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
     <MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
+    <MicrosoftWin32SystemEventsVersion>6.0.0</MicrosoftWin32SystemEventsVersion>
     <MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.0-rtm.21426.20</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
     <SystemDiagnosticsDiagnosticSourceVersion>6.0.0</SystemDiagnosticsDiagnosticSourceVersion>
     <SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
     <SystemDirectoryServicesProtocolsVersion>6.0.0</SystemDirectoryServicesProtocolsVersion>
+    <SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
     <SystemIOPipelinesVersion>6.0.0</SystemIOPipelinesVersion>
     <SystemNetHttpJsonVersion>6.0.0</SystemNetHttpJsonVersion>
     <SystemNetHttpWinHttpHandlerVersion>6.0.0</SystemNetHttpWinHttpHandlerVersion>
@@ -117,10 +119,12 @@
     <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion>
     <SystemSecurityCryptographyPkcsVersion>6.0.0</SystemSecurityCryptographyPkcsVersion>
     <SystemSecurityCryptographyXmlVersion>6.0.0</SystemSecurityCryptographyXmlVersion>
+    <SystemSecurityPermissionsVersion>6.0.0</SystemSecurityPermissionsVersion>
     <SystemServiceProcessServiceControllerVersion>6.0.0</SystemServiceProcessServiceControllerVersion>
     <SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
     <SystemTextJsonVersion>6.0.0</SystemTextJsonVersion>
     <SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
+    <SystemWindowsExtensionsVersion>6.0.0</SystemWindowsExtensionsVersion>
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsVersion>6.0.0</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
@@ -68,6 +68,14 @@ 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
@@ -120,6 +120,14 @@ 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"