Merge pull request #3907 from tmat/MDR110

Update System.Reflection.Metadata to 1.1.0-alpha-00008

.nuget/packages.config

@@ -4,7 +4,7 @@
   <package id="Microsoft.Net.Compilers" version="1.0.0-rc3-20150616-02" targetFramework="net45" />
   <package id="Microsoft.Net.RoslynDiagnostics" version="1.0.0-rc3-20150616-02" targetFramework="net45" />
   <package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
-  <package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
+  <package id="System.Reflection.Metadata" version="1.1.0-alpha-00008" targetFramework="net45" />
   <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
   <package id="FakeSign" version="0.9.2" targetFramework="net45" />
   <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />

build/Targets/VSL.Settings.targets

@@ -24,11 +24,11 @@
     <UseRoslynAnalyzers Condition="'$(UseRoslynAnalyzers)' == ''">true</UseRoslynAnalyzers>
 
     <RoslynSemanticVersion Condition="'$(RoslynSemanticVersion)' == ''">1.1.0</RoslynSemanticVersion>
-    <SystemReflectionMetadataAssemblyVersion Condition="'$(SystemReflectionMetadataAssemblyVersion)' == ''">1.0.21</SystemReflectionMetadataAssemblyVersion>
+    <SystemReflectionMetadataAssemblyVersion Condition="'$(SystemReflectionMetadataAssemblyVersion)' == ''">1.1.0</SystemReflectionMetadataAssemblyVersion>
     <SystemCollectionsImmutableAssemblyVersion Condition="'$(SystemCollectionsImmutableAssemblyVersion)' == ''">1.1.36</SystemCollectionsImmutableAssemblyVersion>
     <NuGetCommandLineAssemblyVersion Condition="'$(NuGetCommandLineAssemblyVersion)' == ''">2.8.5</NuGetCommandLineAssemblyVersion>
     <MicrosoftCompositionAssemblyVersion Condition="'$(MicrosoftCompositionAssemblyVersion)' == ''">1.0.27</MicrosoftCompositionAssemblyVersion>
-    <SystemReflectionMetadataVersion>$(SystemReflectionMetadataAssemblyVersion)</SystemReflectionMetadataVersion>
+    <SystemReflectionMetadataVersion>$(SystemReflectionMetadataAssemblyVersion)-alpha-00008</SystemReflectionMetadataVersion>
     <SystemCollectionsImmutableVersion>$(SystemCollectionsImmutableAssemblyVersion)</SystemCollectionsImmutableVersion>
     <NuGetCommandLineVersion>$(NuGetCommandLineAssemblyVersion)</NuGetCommandLineVersion>
     <MicrosoftCompositionVersion>$(MicrosoftCompositionAssemblyVersion)</MicrosoftCompositionVersion>

src/Compilers/CSharp/Test/Emit/Emit/EmitMetadata.cs

@@ -2298,8 +2298,7 @@ public unsafe void PEHeaders1()
             var sections = peHeaders.SectionHeaders;
             Assert.Equal(2, sections.Length);
 
-            // TODO: bug in the reader, should return ".text". Fixed in vNext. https://github.com/dotnet/corefx/issues/1805
-            Assert.Equal(".text\0\0\0", sections[0].Name);
+            Assert.Equal(".text", sections[0].Name);
             Assert.Equal(0, sections[0].NumberOfLineNumbers);
             Assert.Equal(0, sections[0].NumberOfRelocations);
             Assert.Equal(0, sections[0].PointerToLineNumbers);
@@ -2310,8 +2309,7 @@ public unsafe void PEHeaders1()
             Assert.Equal(0x2000, sections[0].VirtualAddress);
             Assert.Equal(872, sections[0].VirtualSize);
 
-            // TODO: bug in the reader, should return ".reloc". Fixed in vNext. https://github.com/dotnet/corefx/issues/1805
-            Assert.Equal(".reloc\0\0", sections[1].Name);
+            Assert.Equal(".reloc", sections[1].Name);
             Assert.Equal(0, sections[1].NumberOfLineNumbers);
             Assert.Equal(0, sections[1].NumberOfRelocations);
             Assert.Equal(0, sections[1].PointerToLineNumbers);
@@ -2438,8 +2436,7 @@ public void PEHeaders2()
             var sections = peHeaders.SectionHeaders;
             Assert.Equal(1, sections.Length);
 
-            // TODO: bug in the reader, should return ".text". Fixed in vNext. https://github.com/dotnet/corefx/issues/1805
-            Assert.Equal(".text\0\0\0", sections[0].Name);
+            Assert.Equal(".text", sections[0].Name);
             Assert.Equal(0, sections[0].NumberOfLineNumbers);
             Assert.Equal(0, sections[0].NumberOfRelocations);
             Assert.Equal(0, sections[0].PointerToLineNumbers);

src/Compilers/VisualBasic/Portable/Emit/TypeParameterSymbolAdapter.vb

@@ -31,8 +31,8 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Symbols
             Return Nothing
         End Function
 
-        Private Function ITypeReferenceTypeCode(context As EmitContext) As PrimitiveTypeCode Implements ITypeReference.TypeCode
-            Return PrimitiveTypeCode.NotPrimitive
+        Private Function ITypeReferenceTypeCode(context As EmitContext) As Cci.PrimitiveTypeCode Implements ITypeReference.TypeCode
+            Return Cci.PrimitiveTypeCode.NotPrimitive
         End Function
 
         Private ReadOnly Property ITypeReferenceTypeDef As TypeDefinitionHandle Implements ITypeReference.TypeDef

src/VisualStudio/Core/Def/Implementation/EditAndContinue/VsENCRebuildableProjectImpl.cs

@@ -30,6 +30,7 @@
 using ShellInterop = Microsoft.VisualStudio.Shell.Interop;
 using VsTextSpan = Microsoft.VisualStudio.TextManager.Interop.TextSpan;
 using VsThreading = Microsoft.VisualStudio.Threading;
+using Document = Microsoft.CodeAnalysis.Document;
 
 namespace Microsoft.VisualStudio.LanguageServices.Implementation.EditAndContinue
 {

src/VisualStudio/Setup/AssemblyRedirects.cs

@@ -162,6 +162,14 @@
     PublicKeyToken = Constants.PublicKeyToken,
     GenerateCodeBase = false)]
 
+[assembly: ProvideBindingRedirection(
+    AssemblyName = "System.Reflection.Metadata",
+    OldVersionLowerBound = "1.0.0.0",
+    OldVersionUpperBound = "1.0.99.0",
+    NewVersion = "1.1.0.0",
+    PublicKeyToken = "b03f5f7f11d50a3a",
+    GenerateCodeBase = false)]
+
 internal class Constants
 {
     public const string OldVersionLowerBound = "0.7.0.0";