Revert trimming test workarounds (dotnet#58272)

wu-qian-qian · Oct 17, 2024 · 109c0d4 · 109c0d4
1 parent 1890959
commit 109c0d4
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git a/eng/testing/linker/ILLink.Descriptors.xml b/eng/testing/linker/ILLink.Descriptors.xml
diff --git a/eng/testing/linker/project.csproj.template b/eng/testing/linker/project.csproj.template
@@ -27,11 +27,4 @@
     {AdditionalProjectReferences}
   </ItemGroup>
 
-  <!-- Workaround for trimming tests failing during execution. -->
-  <ItemGroup>
-    <EmbeddedResource Include="ILLink.Descriptors.xml">
-      <LogicalName>ILLink.Descriptors.xml</LogicalName>
-    </EmbeddedResource>
-  </ItemGroup>
-
 </Project>
diff --git a/eng/testing/linker/trimmingTests.targets b/eng/testing/linker/trimmingTests.targets
@@ -96,8 +96,6 @@
     <Copy SourceFiles="$(_projectSourceFile);
                        @(_additionalProjectSourceFiles)"
           DestinationFolder="$(_projectDir)" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)ILLink.Descriptors.xml"
-          DestinationFolder="$(_projectDir)" />
     <Message Text="Generated $(_projectFile)" />
   </Target>
 

diff --git a/src/SignalR/server/Core/src/DynamicHub.cs b/src/SignalR/server/Core/src/DynamicHub.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics.CodeAnalysis;
+
 namespace Microsoft.AspNetCore.SignalR;
 
 /// <summary>