Merge pull request #6084 from nattress/merge_master

Merge remote-tracking branch 'dotnet/master' into r2r
dotnet · Jul 11, 2018 · b120c74 · b120c74
2 parents 3f2f88b + 5bda6a9
commit b120c74
Show file tree

Hide file tree

Showing 439 changed files with 8,643 additions and 6,654 deletions.
diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt
@@ -1 +1 @@
-2.1.300-rc1-008673
+2.1.301
diff --git a/dependencies.props b/dependencies.props
@@ -1,10 +1,10 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <RyuJITVersion>2.2.0-preview1-26620-01</RyuJITVersion>
+    <RyuJITVersion>3.0.0-preview1-26702-01</RyuJITVersion>
     <ObjectWriterVersion>1.0.0-alpha-26412-0</ObjectWriterVersion>
-    <CoreFxVersion>4.6.0-preview1-26621-04</CoreFxVersion>
-    <CoreFxUapVersion>4.7.0-preview1-26621-04</CoreFxUapVersion>
-    <MicrosoftNETCoreNativeVersion>2.2.0-preview1-26620-01</MicrosoftNETCoreNativeVersion>
+    <CoreFxVersion>4.6.0-preview1-26625-01</CoreFxVersion>
+    <CoreFxUapVersion>4.7.0-preview1-26625-01</CoreFxUapVersion>
+    <MicrosoftNETCoreNativeVersion>3.0.0-preview1-26702-01</MicrosoftNETCoreNativeVersion>
     <MicrosoftNETCoreAppPackageVersion>2.1.0</MicrosoftNETCoreAppPackageVersion>
     <XunitNetcoreExtensionsVersion>1.0.1-prerelease-02104-02</XunitNetcoreExtensionsVersion>
   </PropertyGroup>

diff --git a/samples/WebApi/README.md b/samples/WebApi/README.md
@@ -48,7 +48,9 @@ services.AddMvc();
 to
 
 ```csharp
-services.Add(new ServiceDescriptor(typeof(ApplicationPartManager), new ApplicationPartManager()));
+var applicationPartManager = new ApplicationPartManager();
+applicationPartManager.ApplicationParts.Add(new AssemblyPart(typeof(Startup).Assembly));
+services.Add(new ServiceDescriptor(typeof(ApplicationPartManager), applicationPartManager));
 
 services.AddMvcCore().AddJsonFormatters();
 ```

diff --git a/samples/WebApi/Startup.cs b/samples/WebApi/Startup.cs
@@ -29,7 +29,9 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             // Override automatic discovery of Application parts done by MVC. It is not compatible with single file compilation.
-            services.Add(new ServiceDescriptor(typeof(ApplicationPartManager), new ApplicationPartManager()));
+            var applicationPartManager = new ApplicationPartManager();
+            applicationPartManager.ApplicationParts.Add(new AssemblyPart(typeof(Startup).Assembly));
+            services.Add(new ServiceDescriptor(typeof(ApplicationPartManager), applicationPartManager));
 
             services.AddMvcCore().AddJsonFormatters();
         }

diff --git a/src/BuildIntegration/Microsoft.NETCore.Native.targets b/src/BuildIntegration/Microsoft.NETCore.Native.targets
@@ -91,7 +91,8 @@ See the LICENSE file in the project root for more information.
     <PrivateSdkAssemblies Include="$(IlcPath)\sdk\*.dll" />
   </ItemGroup>
   <ItemGroup>
-    <FrameworkAssemblies Include="$(IlcPath)\framework\*.dll" />
+    <!-- Exclude clrcompression.dll for now https://github.com/dotnet/corert/issues/5496 -->
+    <FrameworkAssemblies Include="$(IlcPath)\framework\*.dll" Exclude="$(IlcPath)\framework\clrcompression.dll" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Common/src/Internal/NativeFormat/NativeFormatReader.cs b/src/Common/src/Internal/NativeFormat/NativeFormatReader.cs
@@ -223,7 +223,7 @@ internal unsafe partial class NativeReader
         public NativeReader(byte* base_, uint size)
         {
             // Limit the maximum blob size to prevent buffer overruns triggered by boundary integer overflows
-            if (size >= UInt32.MaxValue / 4)
+            if (size >= uint.MaxValue / 4)
                 ThrowBadImageFormatException();
 
             Debug.Assert(base_ <= base_ + size);

diff --git a/src/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs b/src/Common/src/Internal/Runtime/CompilerHelpers/StartupCodeHelpers.cs
@@ -304,6 +304,6 @@ private static unsafe void InitializeStatics(IntPtr gcStaticRegionStart, int len
     internal unsafe struct TypeManagerSlot
     {
         public TypeManagerHandle TypeManager;
-        public Int32 ModuleIndex;
+        public int ModuleIndex;
     }
 }