Finish the TypeName cleanup (#101910)

* remove pragma warning that was required when the code was linked by the tools * move the files
dotnet · May 7, 2024 · 9181d5f · 9181d5f
1 parent 256f320
commit 9181d5f
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 13 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems b/src/libraries/System.Private.CoreLib/src/System.Private.CoreLib.Shared.projitems
@@ -1482,19 +1482,19 @@
     <Compile Include="$(CommonPath)System\Reflection\AssemblyNameFormatter.cs">
       <Link>Common\System\Reflection\AssemblyNameFormatter.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\AssemblyNameInfo.cs">
+    <Compile Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System\Reflection\Metadata\AssemblyNameInfo.cs">
       <Link>Common\System\Reflection\Metadata\AssemblyNameInfo.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeName.cs">
+    <Compile Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System\Reflection\Metadata\TypeName.cs">
       <Link>Common\System\Reflection\Metadata\TypeName.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameHelpers.cs">
       <Link>Common\System\Reflection\Metadata\TypeNameHelpers.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameParser.cs">
+    <Compile Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System\Reflection\Metadata\TypeNameParser.cs">
       <Link>Common\System\Reflection\Metadata\TypeNameParser.cs</Link>
     </Compile>
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameParserHelpers.cs">
+    <Compile Include="$(LibrariesProjectRoot)System.Reflection.Metadata\src\System\Reflection\Metadata\TypeNameParserHelpers.cs">
       <Link>Common\System\Reflection\Metadata\TypeNameParserHelpers.cs</Link>
     </Compile>
     <Compile Include="$(CommonPath)System\Runtime\Versioning\NonVersionableAttribute.cs">

diff --git a/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj b/src/libraries/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj
@@ -122,6 +122,11 @@ The System.Reflection.Metadata library is built-in as part of the shared framewo
     <Compile Include="System\Reflection\Metadata\TypeSystem\AssemblyDefinition.cs" />
     <Compile Include="System\Reflection\Metadata\TypeSystem\AssemblyFile.cs" />
     <Compile Include="System\Reflection\Metadata\TypeSystem\AssemblyReference.cs" />
+    <Compile Include="System\Reflection\Metadata\AssemblyNameInfo.cs" />
+    <Compile Include="System\Reflection\Metadata\TypeName.cs" />
+    <Compile Include="System\Reflection\Metadata\TypeNameParser.cs" />
+    <Compile Include="System\Reflection\Metadata\TypeNameParserHelpers.cs" />
+    <Compile Include="System\Reflection\Metadata\TypeNameParserOptions.cs" />
     <Compile Include="System\Reflection\Metadata\BlobReader.cs" />
     <Compile Include="System\Reflection\Metadata\TypeSystem\Constant.cs" />
     <Compile Include="System\Reflection\Metadata\Signatures\ConstantTypeCode.cs" />
@@ -255,11 +260,6 @@ The System.Reflection.Metadata library is built-in as part of the shared framewo
     <Compile Include="$(CommonPath)System\Obsoletions.cs" Link="Common\System\Obsoletions.cs" />
     <Compile Include="$(CommonPath)System\Reflection\AssemblyNameFormatter.cs" Link="System\Reflection\AssemblyNameFormatter.cs" />
     <Compile Include="$(CommonPath)System\Reflection\AssemblyNameParser.cs" Link="System\Reflection\AssemblyNameParser.cs" />
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\AssemblyNameInfo.cs" Link="System\Reflection\Metadata\AssemblyNameInfo.cs" />
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeName.cs" Link="System\Reflection\Metadata\TypeName.cs" />
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameParser.cs" Link="System\Reflection\Metadata\TypeNameParser.cs" />
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameParserHelpers.cs" Link="System\Reflection\Metadata\TypeNameParserHelpers.cs" />
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameParserOptions.cs" Link="System\Reflection\Metadata\TypeNameParserOptions.cs" />
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.cs" Link="System\Text\ValueStringBuilder.cs" />
     <Compile Include="$(CommonPath)System\Text\ValueStringBuilder.AppendSpanFormattable.cs" Link="System\Text\ValueStringBuilder.AppendSpanFormattable.cs" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'" />
   </ItemGroup>

diff --git a/...m/Reflection/Metadata/AssemblyNameInfo.cs → ...m/Reflection/Metadata/AssemblyNameInfo.cs b/...m/Reflection/Metadata/AssemblyNameInfo.cs → ...m/Reflection/Metadata/AssemblyNameInfo.cs
@@ -154,7 +154,6 @@ public AssemblyName ToAssemblyName()
 #else
             if (!PublicKeyOrToken.IsDefault)
             {
-#pragma warning disable RS0030 // TypeSystem does not allow System.Linq, but we need to use System.Linq.ImmutableArrayExtensions.ToArray
                 // A copy of the array needs to be created, as AssemblyName allows for the mutation of provided array.
                 if ((Flags & AssemblyNameFlags.PublicKey) != 0)
                 {
@@ -164,7 +163,6 @@ public AssemblyName ToAssemblyName()
                 {
                     assemblyName.SetPublicKeyToken(PublicKeyOrToken.ToArray());
                 }
-#pragma warning restore RS0030
             }
 #endif
 

diff --git a/...rc/System/Reflection/Metadata/TypeName.cs → ...rc/System/Reflection/Metadata/TypeName.cs b/...rc/System/Reflection/Metadata/TypeName.cs → ...rc/System/Reflection/Metadata/TypeName.cs
diff --git a/...tem/Reflection/Metadata/TypeNameParser.cs → ...tem/Reflection/Metadata/TypeNameParser.cs b/...tem/Reflection/Metadata/TypeNameParser.cs → ...tem/Reflection/Metadata/TypeNameParser.cs
diff --git a/...lection/Metadata/TypeNameParserHelpers.cs → ...lection/Metadata/TypeNameParserHelpers.cs b/...lection/Metadata/TypeNameParserHelpers.cs → ...lection/Metadata/TypeNameParserHelpers.cs
diff --git a/...lection/Metadata/TypeNameParserOptions.cs → ...lection/Metadata/TypeNameParserOptions.cs b/...lection/Metadata/TypeNameParserOptions.cs → ...lection/Metadata/TypeNameParserOptions.cs
diff --git a/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj b/src/libraries/System.Reflection.Metadata/tests/System.Reflection.Metadata.Tests.csproj
@@ -25,8 +25,6 @@
              Link="Common\Microsoft\Win32\SafeHandles\SafeLibraryHandle.cs" />
     <Compile Include="$(CommonTestPath)System\IO\TempFile.cs"
              Link="Common\System\IO\TempFile.cs" />
-    <Compile Include="$(CommonPath)System\Reflection\Metadata\TypeNameParserHelpers.cs"
-             Link="System\Reflection\Metadata\TypeNameParserHelpers.cs" />
     <Compile Include="Metadata\AssemblyNameInfoTests.cs" />
 
     <Compile Include="Metadata\BlobContentIdTests.cs" />