From 2f44dbd572017bdd5bdd9cef3e3b3c64d269598b Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 19 Jan 2018 11:06:41 -0800 Subject: [PATCH 1/2] Update FileSystem submodule to include aspnet/FileSystem#315 --- modules/FileSystem | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/FileSystem b/modules/FileSystem index 3d57b55d72..4f95e44f03 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 3d57b55d72399fddeb8eadca118b44a8c979c912 +Subproject commit 4f95e44f03cd9922e6bdc9180db370b7ada368c7 From df31235288d5b8592351b2f4648b38be15ac7049 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 19 Jan 2018 11:08:34 -0800 Subject: [PATCH 2/2] Ensure the required 2.0.x runtime is installed --- build/repo.props | 7 +++++++ build/repo.targets | 2 +- korebuild-lock.txt | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build/repo.props b/build/repo.props index 2e60df02b8..33c3c4f56f 100644 --- a/build/repo.props +++ b/build/repo.props @@ -6,6 +6,13 @@ true + + + + + diff --git a/build/repo.targets b/build/repo.targets index 788f91ad93..9af43196aa 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -22,7 +22,7 @@ $(PrepareDependsOn);VerifyPackageArtifactConfig;PrepareOutputPath $(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts - $(RestoreDependsOn);RestoreExternalDependencies + $(RestoreDependsOn);InstallDotNet;RestoreExternalDependencies $(CompileDependsOn);BuildRepositories $(PackageDependsOn);BuildTemplates;SplitPackages $(VerifyDependsOn);VerifyCoherentVersions diff --git a/korebuild-lock.txt b/korebuild-lock.txt index df86a509a5..72a056667f 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.0.5-rtm-10016 -commithash:02bda79ac9c564229da734a836f258d6c1321eb7 +version:2.0.5-rtm-10018 +commithash:bfff3b742331a70e257ac29391abdb36dc59dd06