Merge branch 'release/2.0'

build/repo.props

@@ -6,6 +6,13 @@
     <SkipBillOfMaterials>true</SkipBillOfMaterials>
   </PropertyGroup>
 
+  <ItemGroup>
+    <!-- Explicitly require the 2.0.x version of shared runtime used by universe -->
+    <DotNetCoreRuntime Include="$(MicrosoftNETCoreApp20PackageVersion)"
+      Feed="$(DotNetAssetRootUrl)"
+      FeedCredential="$(DotNetAssetRootAccessTokenSuffix)" />
+  </ItemGroup>
+
   <Import Project="artifacts.props" />
   <Import Project="submodules.props" />
 </Project>

build/repo.targets

@@ -22,7 +22,7 @@
 
     <PrepareDependsOn>$(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath</PrepareDependsOn>
     <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
-    <RestoreDependsOn>$(RestoreDependsOn);RestoreExternalDependencies</RestoreDependsOn>
+    <RestoreDependsOn>$(RestoreDependsOn);InstallDotNet;RestoreExternalDependencies</RestoreDependsOn>
     <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
     <PackageDependsOn>$(PackageDependsOn);BuildTemplates;SplitPackages</PackageDependsOn>
     <VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn>

korebuild-lock.txt

@@ -1,2 +1,2 @@
-version:2.0.5-rtm-10016
-commithash:02bda79ac9c564229da734a836f258d6c1321eb7
+version:2.0.5-rtm-10018
+commithash:bfff3b742331a70e257ac29391abdb36dc59dd06

modules/FileSystem

@@ -1 +1 @@
-Subproject commit 3d57b55d72399fddeb8eadca118b44a8c979c912
+Subproject commit 4f95e44f03cd9922e6bdc9180db370b7ada368c7