Merge pull request #2130 from nguerrera/metadata-resources

Switch S.R.Metadata to standard Strings.resx pattern

Author: stephentoub

src/System.Reflection.Metadata/src/Resources/MetadataResources.Designer.cs

@@ -38,11 +38,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Properties\InternalsVisibleTo.cs" />
-    <Compile Include="Resources\MetadataResources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>MetadataResources.resx</DependentUpon>
-    </Compile>
     <Compile Include="System\Reflection\Internal\MemoryBlocks\AbstractMemoryBlock.cs" />
     <Compile Include="System\Reflection\Internal\MemoryBlocks\ByteArrayMemoryBlock.cs" />
     <Compile Include="System\Reflection\Internal\MemoryBlocks\ByteArrayMemoryProvider.cs" />
@@ -166,14 +161,6 @@
     <Compile Include="System\Reflection\PortableExecutable\SectionHeader.cs" />
     <Compile Include="System\Reflection\System.Reflection.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Resources\MetadataResources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <SubType>Designer</SubType>
-      <LastGenOutput>MetadataResources.Designer.cs</LastGenOutput>
-      <CustomToolNamespace>System.Reflection.Metadata</CustomToolNamespace>
-    </EmbeddedResource>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Collections.Immutable, Version=1.1.34.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <HintPath>$(PackagesDir)\System.Collections.Immutable.1.1.34-rc\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>

src/System.Reflection.Metadata/src/Resources/MetadataResources.resx renamed to src/System.Reflection.Metadata/src/Resources/Strings.resx

@@ -35,13 +35,13 @@ private void CheckBounds(int offset, int byteCount)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowOutOfBounds()
         {
-            throw new BadImageFormatException(MetadataResources.OutOfBoundsRead);
+            throw new BadImageFormatException(SR.OutOfBoundsRead);
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowReferenceOverflow()
         {
-            throw new BadImageFormatException(MetadataResources.RowIdOrHeapOffsetTooLarge);
+            throw new BadImageFormatException(SR.RowIdOrHeapOffsetTooLarge);
         }
 
         internal byte[] ToArray()

src/System.Reflection.Metadata/src/System.Reflection.Metadata.csproj

@@ -29,7 +29,7 @@ internal static unsafe void CopyTo(this Stream source, byte* destination, int si
 
                 if (bytesRead <= 0 || bytesRead > readSize)
                 {
-                    throw new IOException(MetadataResources.UnexpectedStreamEnd);
+                    throw new IOException(SR.UnexpectedStreamEnd);
                 }
 
                 Marshal.Copy(buffer, 0, (IntPtr)destination, bytesRead);

src/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/MemoryBlock.cs

@@ -38,7 +38,7 @@ public unsafe BlobReader(byte* buffer, int length)
             // the reader performs little-endian specific operations
             if (!BitConverter.IsLittleEndian)
             {
-                throw new PlatformNotSupportedException(MetadataResources.LitteEndianArchitectureRequired);
+                throw new PlatformNotSupportedException(SR.LitteEndianArchitectureRequired);
             }
 
             this = new BlobReader(new MemoryBlock(buffer, length));
@@ -163,7 +163,7 @@ internal MemoryBlock GetMemoryBlockAt(int offset, int length)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowOutOfBounds()
         {
-            throw new BadImageFormatException(MetadataResources.OutOfBoundsRead);
+            throw new BadImageFormatException(SR.OutOfBoundsRead);
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
@@ -423,13 +423,13 @@ public int ReadCompressedSignedInteger()
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidCompressedInteger()
         {
-            throw new BadImageFormatException(MetadataResources.InvalidCompressedInteger);
+            throw new BadImageFormatException(SR.InvalidCompressedInteger);
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidSerializedString()
         {
-            throw new BadImageFormatException(MetadataResources.InvalidSerializedString);
+            throw new BadImageFormatException(SR.InvalidSerializedString);
         }
 
         /// <summary>

src/System.Reflection.Metadata/src/System/Reflection/Internal/Utilities/StreamExtensions.cs

@@ -91,10 +91,10 @@ private static int MapVirtualHandleRowId(MetadataReader reader, Handle handle)
                 case HandleKind.Blob:
                     // We could precalculate offsets for virtual strings and blobs as we are creating them
                     // if we wanted to implement this.
-                    throw new NotSupportedException(MetadataResources.CantGetOffsetForVirtualHeapHandle);
+                    throw new NotSupportedException(SR.CantGetOffsetForVirtualHeapHandle);
 
                 default:
-                    throw new ArgumentException(MetadataResources.InvalidHandle, "handle");
+                    throw new ArgumentException(SR.InvalidHandle, "handle");
             }
         }
 
@@ -401,25 +401,25 @@ public static GuidHandle GuidHandle(int offset)
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowEntityHandleRequired()
         {
-            throw new ArgumentException(MetadataResources.NotMetadataTableHandle, "handle");
+            throw new ArgumentException(SR.NotMetadataTableHandle, "handle");
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowHeapHandleRequired()
         {
-            throw new ArgumentException(MetadataResources.NotMetadataHeapHandle, "handle");
+            throw new ArgumentException(SR.NotMetadataHeapHandle, "handle");
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowEntityOrUserStringHandleRequired()
         {
-            throw new ArgumentException(MetadataResources.NotMetadataTableOrUserStringHandle, "handle");
+            throw new ArgumentException(SR.NotMetadataTableOrUserStringHandle, "handle");
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidToken()
         {
-            throw new ArgumentException(MetadataResources.InvalidToken, "token");
+            throw new ArgumentException(SR.InvalidToken, "token");
         }
 
         [MethodImpl(MethodImplOptions.NoInlining)]

src/System.Reflection.Metadata/src/System/Reflection/Metadata/BlobReader.cs

@@ -191,7 +191,7 @@ internal static void ThrowInvalidCast()
         [MethodImpl(MethodImplOptions.NoInlining)]
         internal static void ThrowInvalidCodedIndex()
         {
-            throw new BadImageFormatException(MetadataResources.InvalidCodedIndex);
+            throw new BadImageFormatException(SR.InvalidCodedIndex);
         }
 
         public static readonly ModuleDefinitionHandle ModuleDefinition = new ModuleDefinitionHandle(1);

src/System.Reflection.Metadata/src/System/Reflection/Metadata/Ecma335/MetadataTokens.cs

@@ -60,7 +60,7 @@ internal NamespaceData GetNamespaceData(NamespaceDefinitionHandle handle)
         [MethodImplAttribute(MethodImplOptions.NoInlining)]
         private static void ThrowInvalidHandle()
         {
-            throw new BadImageFormatException(MetadataResources.InvalidHandle);
+            throw new BadImageFormatException(SR.InvalidHandle);
         }
 
         /// <summary>

src/System.Reflection.Metadata/src/System/Reflection/Metadata/Handles.cs

@@ -227,7 +227,7 @@ internal static void CalculateDeltaRowCountsForGeneration(RowCounts[][] rowCount
                 {
                     if (rid != tableRowCounts[generation].AggregateInserts + 1)
                     {
-                        throw new BadImageFormatException(MetadataResources.EnCMapNotSorted);
+                        throw new BadImageFormatException(SR.EnCMapNotSorted);
                     }
 
                     // insert:
@@ -278,7 +278,7 @@ public Handle GetGenerationHandle(Handle handle, out int generation)
 
                 if (generation >= sizes.Length)
                 {
-                    throw new ArgumentException(MetadataResources.HandleBelongsToFutureGeneration, "handle");
+                    throw new ArgumentException(SR.HandleBelongsToFutureGeneration, "handle");
                 }
 
                 // GUID heap accumulates - previous heap is copied to the next generation 
@@ -311,7 +311,7 @@ public Handle GetGenerationHandle(Handle handle, out int generation)
 
                     if (generation >= sizes.Length)
                     {
-                        throw new ArgumentException(MetadataResources.HandleBelongsToFutureGeneration, "handle");
+                        throw new ArgumentException(SR.HandleBelongsToFutureGeneration, "handle");
                     }
                 }