React to dotnet/runtime#54147

- remove newly-unnecessary package references - do not expect affected assemblies in _our_ targeting packs
dotnet · Jun 16, 2021 · 7977dfb · 7977dfb
1 parent bcb1646
commit 7977dfb
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 23 deletions.
diff --git a/eng/SharedFramework.External.props b/eng/SharedFramework.External.props
@@ -89,14 +89,4 @@
     <_CompilationOnlyReference Include="System.Runtime.CompilerServices.Unsafe" />
     <_CompilationOnlyReference Include="System.Text.Json" />
   </ItemGroup>
-
-  <!--
-    These compilation references are necessary to workaround the mismatch of what is found in the ref pack for NETCore.App and what
-    is actually present at runtime. See https://github.com/dotnet/corefx/issues/34906
-  -->
-  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)' or $(TargetFrameworks.Contains('$(DefaultNetCoreTargetFramework)'))">
-    <_CompilationOnlyReference Include="Microsoft.Win32.Registry" />
-    <_CompilationOnlyReference Include="System.Security.Principal.Windows" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj b/src/DataProtection/DataProtection/src/Microsoft.AspNetCore.DataProtection.csproj
@@ -26,10 +26,15 @@
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
-    <Reference Include="Microsoft.Win32.Registry" />
     <Reference Include="System.Security.Cryptography.Xml" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR
+      '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR
+      '$(MSBuildRestoreSessionId)' == '' ">
+    <Reference Include="Microsoft.Win32.Registry" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(MSBuildRestoreSessionId)' == ''">
     <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>

diff --git a/src/Framework/test/TestData.cs b/src/Framework/test/TestData.cs
@@ -276,13 +276,10 @@ static TestData()
                 { "Microsoft.Extensions.WebEncoders", "6.0.0.0" },
                 { "Microsoft.JSInterop", "6.0.0.0" },
                 { "Microsoft.Net.Http.Headers", "6.0.0.0" },
-                { "Microsoft.Win32.Registry", "6.0.0.0" },
                 { "System.Diagnostics.EventLog", "6.0.0.0" },
                 { "System.IO.Pipelines", "6.0.0.0" },
-                { "System.Security.AccessControl", "6.0.0.0" },
                 { "System.Security.Cryptography.Cng", "6.0.0.0" },
                 { "System.Security.Cryptography.Xml", "6.0.0.0" },
-                { "System.Security.Principal.Windows", "6.0.0.0" },
             };
 
             if (!VerifyAncmBinary())

diff --git a/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj b/src/Servers/HttpSys/src/Microsoft.AspNetCore.Server.HttpSys.csproj
@@ -26,8 +26,6 @@
     <Reference Include="Microsoft.AspNetCore.Connections.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Hosting" />
     <Reference Include="Microsoft.Net.Http.Headers" />
-    <Reference Include="Microsoft.Win32.Registry" />
-    <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj
@@ -46,7 +46,6 @@
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
     <Reference Include="Microsoft.Extensions.FileProviders.Physical" />
     <Reference Include="System.IO.Pipelines" />
-    <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 
   <Import Project="..\..\build\assets.props" />

diff --git a/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/Servers/IIS/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration.csproj
@@ -24,7 +24,6 @@
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
     <Reference Include="System.IO.Pipelines" />
-    <Reference Include="System.Security.Principal.Windows" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj b/src/Shared/test/Shared.Tests/Microsoft.AspNetCore.Shared.Tests.csproj
@@ -40,7 +40,6 @@
     <Reference Include="System.IO.Pipelines" />
     <Reference Include="System.Reflection.Metadata" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe" />
-    <Reference Include="System.Security.Principal.Windows" />
     <Reference Include="System.Threading.Tasks.Extensions" />
     <Reference Include="Microsoft.AspNetCore.Http.Features" />
     <Reference Include="Microsoft.AspNetCore.Http" />

diff --git a/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj b/src/SignalR/common/Http.Connections/src/Microsoft.AspNetCore.Http.Connections.csproj
@@ -34,7 +34,6 @@
     <Reference Include="Microsoft.AspNetCore.Http" />
     <Reference Include="Microsoft.AspNetCore.Routing" />
     <Reference Include="Microsoft.AspNetCore.WebSockets" />
-    <Reference Include="System.Security.Principal.Windows" />
 
     <Compile Include="$(SharedSourceRoot)ValueStopwatch\*.cs" />
   </ItemGroup>

diff --git a/src/Testing/src/Microsoft.AspNetCore.Testing.csproj b/src/Testing/src/Microsoft.AspNetCore.Testing.csproj
@@ -28,7 +28,6 @@
     <Reference Include="Microsoft.Extensions.DependencyInjection" />
     <Reference Include="Microsoft.Extensions.Logging.Console" />
     <Reference Include="Microsoft.Extensions.Logging" />
-    <Reference Include="Microsoft.Win32.Registry" />
     <Reference Include="Serilog.Extensions.Logging" />
     <Reference Include="Serilog.Sinks.File" />
     <Reference Include="System.ValueTuple" />
@@ -45,6 +44,12 @@
     <Reference Include="xunit.extensibility.execution" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR
+      '$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR
+      '$(MSBuildRestoreSessionId)' == '' ">
+    <Reference Include="Microsoft.Win32.Registry" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation" />

diff --git a/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj b/src/Tools/Microsoft.dotnet-openapi/src/Microsoft.dotnet-openapi.csproj
@@ -17,8 +17,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.Build" ExcludeAssets="runtime" />
     <Reference Include="Microsoft.Build.Locator" />
-    <Reference Include="Microsoft.Win32.Registry"  />
-    <Reference Include="System.Security.Principal.Windows"  />
   </ItemGroup>
 
   <ItemGroup>