Merge upstream changes

2018-11-09 15:22:10 -08:00 · 2018-11-09 15:22:10 -08:00 · e13e5fca99
commit e13e5fca99
parent fe80bc7ba3 f1b5e95981
8 changed files with 154 additions and 81 deletions
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/TestBase.cs
@ -42,7 +42,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
            }
        }

-        protected static TestAssets TestAssets
+        public static TestAssets TestAssets
        {
            get
            {