diff --git a/README.md b/README.md
index 5698812..0912e84 100644
--- a/README.md
+++ b/README.md
@@ -9,3 +9,9 @@ Contains the tooling and infrastructure used for .NET stress testing and reliabi
 - unified dump collection, storage, and bucketing across all .NET supported platforms
 - investigating and diagnosis of reliability failures 
  
+Steps to Build:
+build.cmd - builds stress tooling
+build_test.cmd should run
+```
+msbuild test\genstress.proj /p:CoreFxCloudDropAccessToken="" /p:CoreClrCloudDropAccessToken="" /p:HelixApiAccessKey="" /p:BuildPAT="" /p:OperatingSystem="Ubuntu14.04" /flp:v=diag
+```
\ No newline at end of file
diff --git a/build_test.cmd b/build_test.cmd
index c19de0a..11632e9 100644
--- a/build_test.cmd
+++ b/build_test.cmd
@@ -23,10 +23,7 @@ if not defined VisualStudioVersion (
 )
 
 :EnvSet
-
-:: The property FilterToTestTFM is temporarily required because of  https://github.com/dotnet/buildtools/commit/e9007c16b1832dbd0ea9669fa578b61900b7f724 
 call msbuild test/genstress.proj /maxcpucount %*
 set BUILDERRORLEVEL=%ERRORLEVEL%
 
-
 exit /b %BUILDERRORLEVEL%
diff --git a/src/stress.codegen/RetreiveBuildContainerInformation.cs b/src/stress.codegen/RetreiveBuildContainerInformation.cs
new file mode 100644
index 0000000..b938d63
--- /dev/null
+++ b/src/stress.codegen/RetreiveBuildContainerInformation.cs
@@ -0,0 +1,340 @@
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace stress.codegen
+{
+    public class RetreiveBuildContainerInformation : Task
+    {
+        private BuildMaps buildMap;
+        private bool SeparateTestStep;
+
+        [Required]
+        public string BuildPAT { get; set; }
+        [Required]
+        public string HelixAPIKey { get; set; }
+        [Required]
+        public string Repo { get; set; }
+        [Required]
+        public string Branch { get; set; }
+        [Required]
+        public string OperatingSystem{ get; set; }
+        public string ConfigurationGroup { get; set; }
+        public string Platform { get; set; }
+        public string SubType { get; set; }
+        public string BuildNumber{ get; set; }
+        public string TestStorageAccountKey { get; set; }
+        [Output]
+        public string TestPattern { get; set; }
+        [Output]
+        public string ProductContainerName { get; set; }
+        [Output]
+        public string ProductStorageAccount { get; set; }
+        [Output]
+        public string TestStorageAccount { get; set; }
+        [Output]
+        public string TestContainerName { get; set; }
+
+        const string containerRegex = @"Creating container named '(.*?)' in storage account (.*?)\.";
+        const string buildDefnUrlRegex = @"https:\/\/(.*?)\.visualstudio\.com\/DefaultCollection\/(.*?)\/_build\?_a=summary&buildId=(.*)";
+
+        public override bool Execute()
+        {
+            Debugger.Launch();
+            buildMap = new BuildMaps();
+            GetLatestBuilds();
+            return !Log.HasLoggedErrors;
+        }
+
+        private void GetLatestBuilds()
+        {
+            if (string.IsNullOrEmpty(BuildNumber))
+            {
+                GetLatestBuildNumber();
+                buildMap.BuildNumber = BuildNumber;
+            }
+            //Product build
+            string dotnetMCUrl = $"https://helix.dot.net/api/2017-01-20/aggregate/analysisdetail?analysisName=Visual+Studio+Build+Information&analysisType=external&build={ BuildNumber }&groupBy=job.properties.operatingSystem&groupBy=job.properties.subType&groupBy=job.properties.configurationGroup&groupBy=job.properties.platform&source=official%2F{Repo}%2F{Branch}%2F&type=build%2Fproduct%2F&workitem=Orchestration";
+            try
+            {
+                string value = string.Empty;
+                using (HttpClient client = new HttpClient())
+                {
+                    client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
+                    client.DefaultRequestHeaders.Add("Authentication", string.Format("{0} {1}", "token", HelixAPIKey));
+                    using (HttpResponseMessage response = client.GetAsync(dotnetMCUrl).Result)
+                    {
+                        response.EnsureSuccessStatusCode();
+                        value = response.Content.ReadAsStringAsync().Result;
+                    }
+
+                }
+
+                JArray buildDefintionsArray = (JArray)JsonConvert.DeserializeObject(value);
+                string type = string.Empty;
+                foreach (var buildDefinition in buildDefintionsArray)
+                {
+                    //https://devdiv.visualstudio.com/DefaultCollection/DevDiv/_build?_a=summary&buildId=570846
+                    
+                    string url = buildDefinition["Analysis"]["Uri"].ToString();
+                    string operatingSystem = buildDefinition["Key"]["job.properties.operatingSystem"].ToString().Replace(" ", string.Empty);
+                    string configurationGroup = buildDefinition["Key"]["job.properties.configurationGroup"].ToString();
+                    string platform = buildDefinition["Key"]["job.properties.platform"].ToString();
+                    string subType = buildDefinition["Key"]["job.properties.subType"].ToString();
+                    //coreclr has a testBuild type
+                    type =string.Join("-", operatingSystem, configurationGroup, platform, subType);
+                    Match m = Regex.Match(url, buildDefnUrlRegex);
+                    if (m.Groups == null)
+                    {
+                        continue;
+                    }
+                    //hack until coreclr labels it's builds correctly
+                    if (buildMap.buildmap.ContainsKey(type))
+                    {
+                        continue;
+                    }
+                    BuildContainerInformation bContainerInformation = new BuildContainerInformation();
+                    VSOBuild build = new VSOBuild(m.Groups[1].Value, m.Groups[2].Value, m.Groups[3].Value);
+                    bContainerInformation.ProductBuild = build;
+                    //coreclr
+                    if (subType == "testBuild")
+                    {
+                        SeparateTestStep = true;
+                        GetTestContainer(bContainerInformation);
+                    }
+                    else
+                    {
+                        GetProductContainer(bContainerInformation);
+                    }
+                    buildMap.buildmap.Add(type, bContainerInformation);
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.LogError(ex.ToString());
+            }
+
+            //Grab Test zips for OperatingSystem
+            List<string> potentialTestZips = new List<string>();
+            BuildContainerInformation bc;
+            BuildContainerInformation bcProduct;
+            //coreclr
+            if (SeparateTestStep)
+            {
+                bcProduct = buildMap.buildmap[string.Join("-", OperatingSystem, ConfigurationGroup, Platform, "testBuild")];
+                bc = buildMap.buildmap[string.Join("-", OperatingSystem, ConfigurationGroup, Platform, "testBuild")];
+                potentialTestZips = RetreiveBlobNames.GetBlobs(bc.TestDropStorageAccount, TestStorageAccountKey, bc.TestDropContainer);
+            }
+            else
+            {
+                bcProduct = null;
+                bc = buildMap.buildmap[string.Join("-", OperatingSystem, ConfigurationGroup, Platform, SubType)];
+                potentialTestZips = RetreiveBlobNames.GetBlobs(bc.TestDropStorageAccount, TestStorageAccountKey, bc.TestDropContainer);
+            }
+
+            string testPattern = string.Empty;
+
+            //Get path selection for stress
+            if (potentialTestZips.Count > 0) {
+                for (int counter = 0; counter < potentialTestZips.Count; counter++)
+                {
+                    int lastIndexOf = potentialTestZips[counter].LastIndexOf('/');  
+                    if (lastIndexOf > 0)
+                    {
+                        testPattern = potentialTestZips[counter].Substring(0, lastIndexOf);
+                        Log.LogMessage("Test zip pattern: {0}", testPattern);
+                        break;
+                    }
+                }
+            }
+            
+            //Setup output parameters
+            TestPattern = testPattern;
+            ProductStorageAccount = bc.ProductDropStorageAccount == null ? bcProduct.TestDropStorageAccount : bc.TestDropStorageAccount;
+            ProductContainerName = bc.ProductDropContainer == null ? bcProduct.TestDropStorageAccount : bc.TestDropStorageAccount;
+            TestStorageAccount = bc.TestDropStorageAccount==null ? string.Empty : bc.TestDropStorageAccount;
+            TestContainerName = bc.TestDropContainer==null ? string.Empty : bc.TestDropContainer;
+        }
+
+        private void GetLatestBuildNumber()
+        {
+            string GetBuildNumberUrl = $"https://helix.dot.net/api/2016-08-25/aggregate/jobs?groupBy=job.build&maxResultSets=6&source=official%2F{ Repo }%2F{ Branch }%2F&type=build%2Fproduct%2F";
+            try
+            {
+                string value = string.Empty;
+                using (HttpClient client = new HttpClient())
+                {
+                    client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
+                    client.DefaultRequestHeaders.Add("Authentication", string.Format("{0} {1}", "token", HelixAPIKey));
+                    using (HttpResponseMessage response = client.GetAsync(GetBuildNumberUrl).Result)
+                    {
+                        response.EnsureSuccessStatusCode();
+                        value = response.Content.ReadAsStringAsync().Result;
+                    }
+
+                    JArray buildapiObject = (JArray)JsonConvert.DeserializeObject(value);
+                    //Grab latest one
+                    //TODO: Grab latest passing one?
+                    BuildNumber = buildapiObject[0]["Key"]["job.build"].ToString();
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.LogMessage(ex.ToString());
+            }
+        }
+
+        private void GetProductContainer(BuildContainerInformation b)
+        {
+            string logData = GetBuildLog(b.ProductBuild);
+            int i = 0;
+            
+            MatchCollection mCollection = Regex.Matches(logData, containerRegex, RegexOptions.None);
+            if (mCollection.Count == 3)
+            {
+                foreach (Match m in mCollection)
+                {
+                    if (i == 0)
+                    {
+                        b.TestDropContainer = m.Groups[1].Value;
+                        b.TestDropStorageAccount = m.Groups[2].Value;
+                    }
+                    //Assumption that SendToHelix api order printed out doesn't change. 
+                    if (i == 1)
+                    {
+                        b.TestResultsContainer = m.Groups[1].Value;
+                        b.TestResultsStorageAccount = m.Groups[2].Value;
+                    }
+                    if (i == 2)
+                    {
+                        b.ProductDropContainer = m.Groups[1].Value;
+                        b.ProductDropStorageAccount = m.Groups[2].Value;
+                    }
+                    i++;
+                }
+            }
+            else 
+            {
+                //hack until order for each repo is sorted out.
+                foreach (Match m in mCollection)
+                {
+                    if (i == 0)
+                    {
+                        b.ProductDropContainer = m.Groups[1].Value;
+                        b.ProductDropStorageAccount = m.Groups[2].Value;
+                    }
+                    i++;
+                }
+            }
+        }
+
+        //In case you would like to get TestContainer for a repo like coreclr where the test build is in a separate step
+        private void GetTestContainer(BuildContainerInformation b)
+        {
+            string logData = GetBuildLog(b.ProductBuild);
+            int i = 0;
+            MatchCollection mCollection = Regex.Matches(logData, containerRegex, RegexOptions.None);
+            foreach (Match m in mCollection)
+            {
+                if (i == 0)
+                {
+                    b.TestDropContainer = m.Groups[1].Value;
+                    b.TestDropStorageAccount = m.Groups[2].Value;
+                }
+                //Assumption that SendToHelix api order printed out doesn't change. 
+                if (i == 1)
+                {
+                    b.TestResultsContainer = m.Groups[1].Value;
+                    b.TestResultsStorageAccount = m.Groups[2].Value;
+                }
+                i++;
+            }
+            
+        }
+
+        private string GetBuildLog(VSOBuild build)
+        {
+            string logData = string.Empty;
+            string stepNumber = string.Empty;
+            string LogApiUrl = $"https://{build.VSOProjectNamespace}.visualstudio.com/DefaultCollection/{build.DefaultCollection}/_apis/build/builds/{build.VSOBuildId}/logs";
+            try
+            {
+                using (HttpClient client = new HttpClient())
+                {
+                    client.DefaultRequestHeaders.Accept.Add(new System.Net.Http.Headers.MediaTypeWithQualityHeaderValue("application/json"));
+                    client.DefaultRequestHeaders.Authorization = new System.Net.Http.Headers.AuthenticationHeaderValue("Basic", Convert.ToBase64String(System.Text.ASCIIEncoding.ASCII.GetBytes(string.Format("{0}:{1}", "", BuildPAT))));
+                    using (HttpResponseMessage response = client.GetAsync(LogApiUrl).Result)
+                    {
+                        response.EnsureSuccessStatusCode();
+                        logData = response.Content.ReadAsStringAsync().Result;
+                        JObject logCountObject = (JObject)JsonConvert.DeserializeObject(logData);
+                        string count = logCountObject["count"].ToString();
+                        int stepNumber1 = int.Parse(count) - 1;
+                        stepNumber = stepNumber1.ToString();
+                    }
+                    string LogCountApiUrl = $"https://{build.VSOProjectNamespace}.visualstudio.com/DefaultCollection/{build.DefaultCollection}/_apis/build/builds/{build.VSOBuildId}/logs/{stepNumber}";
+                    using (HttpResponseMessage response = client.GetAsync(LogCountApiUrl).Result)
+                    {
+                        response.EnsureSuccessStatusCode();
+                        logData = response.Content.ReadAsStringAsync().Result;
+                    }
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.LogMessage(ex.ToString());
+            }
+
+            return logData;
+        }
+    }
+}
+
+internal class BuildMaps
+{
+    public Dictionary<string, BuildContainerInformation> buildmap;
+    public string BuildNumber;
+    public BuildMaps()
+    {
+        buildmap = new Dictionary<string, BuildContainerInformation>();
+    }
+}
+
+internal class VSOBuild
+{
+    public string DefaultCollection { get; set; }
+    public string VSOProjectNamespace { get; set; }
+    public string VSOBuildId { get; set; }
+
+    public string ProductStepContainingContainer { get; set; }
+    public string TestStepContainingContainer { get; set; }
+
+    public VSOBuild(string project, string collection, string buildid)
+    {
+        VSOProjectNamespace = project;
+        DefaultCollection = collection;
+        VSOBuildId = buildid;
+    }
+
+}
+
+internal class BuildContainerInformation
+{
+    public VSOBuild ProductBuild { get; set; }
+    public string TestDropStorageAccount { get; set; }
+    public string TestDropContainer { get; set; }
+
+    public string ProductDropStorageAccount { get; set; }
+    public string ProductDropContainer { get; set; }
+
+    public string TestResultsContainer { get; set; }
+    public string TestResultsStorageAccount { get; set; }
+
+}
\ No newline at end of file
diff --git a/src/stress.codegen/RetreiveContainerInformation.cs b/src/stress.codegen/RetreiveContainerInformation.cs
new file mode 100644
index 0000000..2c6d750
--- /dev/null
+++ b/src/stress.codegen/RetreiveContainerInformation.cs
@@ -0,0 +1,67 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text;
+using System.Xml.Linq;
+using Microsoft.DotNet.Build.CloudTestTasks;
+
+namespace stress.codegen
+{
+    class RetreiveBlobNames
+    {
+        public static List<string> GetBlobs(string storageAccount, string accountKey, string container)
+        {
+            string url = $"https://{ storageAccount }.blob.core.windows.net/{ container }?restype=container&comp=list";
+            List<string> testZipStrings = new List<string>();
+            try
+            {
+                Func<HttpRequestMessage> createRequest = () =>
+                {
+                    DateTime dateTime = DateTime.UtcNow;
+                    var request = new HttpRequestMessage(HttpMethod.Get, url);
+                    request.Headers.Add(AzureHelper.DateHeaderString, dateTime.ToString("R", CultureInfo.InvariantCulture));
+                    request.Headers.Add(AzureHelper.VersionHeaderString, AzureHelper.StorageApiVersion);
+                    request.Headers.Add(AzureHelper.AuthorizationHeaderString, AzureHelper.AuthorizationHeader(
+                            storageAccount,
+                            accountKey,
+                            "GET",
+                            dateTime,
+                            request));
+                    return request;
+                };
+
+                XDocument responseFile;
+                using (HttpClient client = new HttpClient())
+                using (HttpResponseMessage response = client.SendAsync(createRequest()).Result)
+                {
+                    string content = response.Content.ReadAsStringAsync().Result;
+                    using (StreamReader sr = new StreamReader(response.Content.ReadAsStreamAsync().Result))
+                    {
+                        responseFile = XDocument.Load(sr);
+
+                        List<XElement> blobs = responseFile.Descendants("EnumerationResults").First()
+                                                           .Descendants("Blobs").First()
+                                                           .Descendants("Blob").ToList();
+
+                        var testZipBlobs = from blob in blobs
+                                           where blob.Element("Name").ToString().Contains(".Tests.zip")
+                                           select blob.Element("Name").Value;
+                        testZipStrings = testZipBlobs.ToList();
+
+                        if (testZipStrings.Count == 0)
+                            Console.WriteLine("No test zips found.");
+                    }
+
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+            return testZipStrings;
+        }
+    }
+}
diff --git a/src/stress.codegen/stress.codegen.csproj b/src/stress.codegen/stress.codegen.csproj
index 409933e..589f143 100644
--- a/src/stress.codegen/stress.codegen.csproj
+++ b/src/stress.codegen/stress.codegen.csproj
@@ -53,6 +53,10 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.DotNet.Build.CloudTestTasks">
+      <HintPath>$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ExecutionFileGenerator.cs" />
@@ -68,6 +72,8 @@
     <Compile Include="ProgramSourceFileGenerator.cs" />
     <Compile Include="ProjectJsonDependencyInfo.cs" />
     <Compile Include="resources\Resources.Designer.cs" />
+    <Compile Include="RetreiveBuildContainerInformation.cs" />
+    <Compile Include="RetreiveContainerInformation.cs" />
     <Compile Include="SourceFileInfo.cs" />
     <Compile Include="StandAloneTestDiscoverer.cs" />
     <Compile Include="ToFProjectFileGenerator.cs" />
diff --git a/test/genstress.proj b/test/genstress.proj
index a35d76e..9dc7532 100644
--- a/test/genstress.proj
+++ b/test/genstress.proj
@@ -1,13 +1,7 @@
 <Project ToolsVersion="12.0" DefaultTargets="BuildAndTest" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-
   <Import Project="$(MSBuildThisFileDirectory)dir.props" />
 
-  <PropertyGroup>
-    <BuildMoniker Condition="'$(BuildMoniker)' == ''">$(OfficialBuildId)</BuildMoniker>
-    <BuildMoniker Condition="'$(BuildMoniker)' == ''">$(USERNAME)-$([System.DateTime]::Now.ToString(MMdd-hhmmss))</BuildMoniker>
-  </PropertyGroup>
-  
    <!--
     Stress suite generation properties
    -->
@@ -31,6 +25,10 @@
     <UnitTestDirectory Condition="'$(UnitTestDirectory)' == ''">$(MSBuildThisFileDirectory)../bin/obj/TestArchives/</UnitTestDirectory>
   </PropertyGroup>
   
+  <PropertyGroup>
+    <FetchedDataDir>$(MSBuildThisFileDirectory)../bin/FetchedData/</FetchedDataDir>
+  </PropertyGroup>
+  
   <!-- 
     Stress tooling locations
     get stress.codegen and stress.execution from the bin directory (using the latest built version) 
@@ -38,19 +36,14 @@
     without affecting runs
   -->
   <PropertyGroup>
-    <StressCodegenAssmPath>$(BinDir)$(TargetOS).$(Platform).$(Configuration)\stress.codegen\stress.codegen.dll</StressCodegenAssmPath>
-    <StressExecAssmPath>$(BinDir)$(TargetOS).$(Platform).$(Configuration)\stress.codegen\stress.execution.dll</StressExecAssmPath>
+    <StressCodegenAssmPath>$(BinDir)$(OSGroup).$(Platform).$(Configuration)\stress.codegen\stress.codegen.dll</StressCodegenAssmPath>
+    <StressExecAssmPath>$(BinDir)$(OSGroup).$(Platform).$(Configuration)\stress.codegen\stress.execution.dll</StressExecAssmPath>
   </PropertyGroup>
   <PropertyGroup>
-    <UnitTestCLIProjDir>$(BaseIntermediateOutputPath)utcli/</UnitTestCLIProjDir>
-    <UnitTestCLIProjJson>$(UnitTestCLIProjDir)project.json</UnitTestCLIProjJson>
-    <UnitTestCLIProjLockJson>$(UnitTestCLIProjDir)project.lock.json</UnitTestCLIProjLockJson>
     <UnitTestPackageDir>$(MSBuildThisFileDirectory)../packages/</UnitTestPackageDir>
     <UnitTestExtractDir>$(BaseIntermediateOutputPath)utextracted/</UnitTestExtractDir>
     <UnitTestExtractedSemaphore>$(UnitTestExtractDir)extraction.complete</UnitTestExtractedSemaphore>
     <UnitTestDependsBin>$(BaseIntermediateOutputPath)utdepends/</UnitTestDependsBin>
-    <TestDependRestoreCommand>$(DotnetToolCommand) restore $(UnitTestCLIProjJson) --packages "$(UnitTestPackageDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</TestDependRestoreCommand>
-    <TestDependPublishCommand>$(DotnetToolCommand) publish $(UnitTestCLIProjJson) --output "$(UnitTestDependsBin.TrimEnd('/\'.ToCharArray()))" --runtime win7-x64 --framework $(FilterToTestTFM)</TestDependPublishCommand>
   </PropertyGroup>
   
   <PropertyGroup>
@@ -59,7 +52,6 @@
   -->
     <GeneratedProjectBuildProps>UnitTestDependsBin=$(UnitTestDependsBin);DisableReferenceCopyLocal=true</GeneratedProjectBuildProps>
     <GeneratedProjectBuildProps Condition="'$(LocalPackageSource)' != ''">$(GeneratedProjectBuildProps);LocalPackageSource=$(LocalPackageSource)</GeneratedProjectBuildProps>
-    <GeneratedProjectBuildProps Condition="'$(TestWithLocalLibraries)' != ''">$(GeneratedProjectBuildProps);TestWithLocalLibraries=$(TestWithLocalLibraries)</GeneratedProjectBuildProps>
     <GeneratedProjectBuildProps Condition="'$(ConfigurationGroup)' != ''">$(GeneratedProjectBuildProps);ConfigurationGroup=$(ConfigurationGroup)</GeneratedProjectBuildProps>
     <GeneratedProjectBuildProps Condition="'$(ArchiveTests)' != ''">$(GeneratedProjectBuildProps);ArchiveTests=$(ArchiveTests)</GeneratedProjectBuildProps>
     <GeneratedProjectBuildProps Condition="'$(BuildMoniker)' != ''">$(GeneratedProjectBuildProps);BuildMoniker=$(BuildMoniker)</GeneratedProjectBuildProps>
@@ -68,8 +60,26 @@
     <GeneratedProjectBuildProps Condition="'$(TestNugetRuntimeId)' != ''">$(GeneratedProjectBuildProps);TestNugetRuntimeId=$(TestNugetRuntimeId)</GeneratedProjectBuildProps>
   </PropertyGroup>
   
-  <Import Project="..\dir.targets" />
+  <ItemGroup>
+    <Repos Include="corefx" >
+      <SelectedConfigurationGroup>$(SelectedConfigurationGroup)</SelectedConfigurationGroup>
+      <CloudDropAccessToken>$(CoreFxCloudDropAccessToken)</CloudDropAccessToken>
+      <TestStorageAccountKey>$(CoreFxCloudDropAccessToken)</TestStorageAccountKey>
+    </Repos>
+    <Repos Include="coreclr" >
+      <SubType>$(SubType)</SubType>
+      <CloudDropAccessToken>$(CoreClrCloudDropAccessToken)</CloudDropAccessToken>
+      <TestStorageAccountKey>$(CoreClrCloudDropAccessToken)</TestStorageAccountKey>
+    </Repos>
+    <TestRepos Include="corefx" />
+  </ItemGroup>
+  <PropertyGroup>
+    <BranchName>master</BranchName>
+    <SelectedConfigurationGroup>Debug</SelectedConfigurationGroup>
+    <SubType>native</SubType>
+  </PropertyGroup>
   
+  <Import Project="..\dir.targets" />
   <Import Project="..\dir.traversal.targets" />
   <Import Project="$(ToolsDir)Build.Post.targets" Condition="Exists('$(ToolsDir)Build.Post.targets')" />
   
@@ -77,8 +87,9 @@
      <TestCommandLines Condition="'$(TargetOS)'!='Windows_NT'" Include="chmod +x corerun" /> 
    </ItemGroup>
 
-  <UsingTask TaskName="MergeAllProjectJsonsTask" AssemblyFile="$(StressCodegenAssmPath)"/>
   <UsingTask TaskName="GenerateStressSuiteTask" AssemblyFile="$(StressCodegenAssmPath)"/>
+  <UsingTask TaskName="RetreiveBuildContainerInformation" AssemblyFile="$(StressCodegenAssmPath)"/>
+  <UsingTask TaskName="DownloadFromAzure" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.CloudTestTasks.dll"/>
   <UsingTask TaskName="ZipFileExtractToDirectory" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
 
   <ItemGroup>
@@ -103,73 +114,96 @@
     <WriteLinesToFile File="$(UnitTestExtractedSemaphore)" Lines="" Overwrite="false" />
   </Target>
  
-    <Target Name="UnzipTest"
+  <Target Name="UnzipTest"
+    DependsOnTargets="GetRepoProduct"
     Inputs="@(ZipFile)"
-    Outputs="@(ZipFile->Replace('$(UnitTestDirectory)','$(UnitTestExtractDir)'))"
-    DependsOnTargets="SelectTestZips">
+    Outputs="@(ZipFile->Replace('$(UnitTestDirectory)','$(UnitTestExtractDir)'))">
         <Message Text="Unzipping tests: @(ZipFile)" Importance="Low" />
         
         <ZipFileExtractToDirectory Condition="Exists('%(RootDir)%(Directory)%(ZipFile.FileName)%(ZipFile.Extension)')"
             SourceArchive="%(ZipFile.FullPath)"
             DestinationDirectory="$(UnitTestExtractDir)\%(filename)%(extension)"
             OverwriteDestination="true" />
-        
-        <Copy SourceFiles="@(JsonFile)" DestinationFiles="@(JsonFile->Replace('$(UnitTestDirectory)','$(UnitTestExtractDir)'))" />
     </Target>
-  
-    <Target Name="SelectTestZips">
-        <Error Condition="!Exists('$(MSBuildThisFileDirectory)\..\AnyOS.AnyCPU.Debug-Test-Archive-List.txt')" Text="Can't find AnyOS Test List.'" />
-      
-        <ReadLinesFromFile File="$(MSBuildThisFileDirectory)\..\AnyOS.AnyCPU.Debug-Test-Archive-List.txt">
-            <Output TaskParameter="Lines" ItemName="ItemsFromFile" />
-        </ReadLinesFromFile>
-
-        <ItemGroup>
-            <ZipFile Include="@(ItemsFromFile->'$(UnitTestDirectory)\%(filename)%(extension)')" />
-        </ItemGroup>
-    </Target>
-
-  <Target Name="RestoreTestDependsBin" DependsOnTargets="UnzipAllTests">
-    <Message Text="Restoring test dependencies..." />
     
-    <RemoveDir Directories="$(UnitTestCLIProjDir)" />
-    <RemoveDir Directories="$(UnitTestDependsBin)" />
+    <!-- Download latest product from Azure
+         to avoid restoring time to just get a project.json and lockfile
+         Query engineering infrastructure for latest build moniker if not set
+    -->
+  <Target Name="GetRepoProduct" 
+          Inputs="%(Repos.Identity)"
+          Outputs="CompletedDownloads" 
+          Condition="'$(SkipGetRepoProduct)'!='true'" >
+    <!-- Pass in specific build parameters if required 
+         OS must be in 
+        Alpine3.4.3
+        Debian8.2
+        Fedora23
+        Fedora24
+        openSUSE42.1
+        OSX
+        RedHat7
+        Ubuntu14.04
+        Ubuntu16.04
+        Ubuntu16.10
+        Windows
+    -->
+    <PropertyGroup>
+      <CurrentRepo>%(Repos.Identity)</CurrentRepo>
+    </PropertyGroup>
+    <Message Importance="High" Text="Gathering build information for %(Repos.Identity) ..." />
+    <RetreiveBuildContainerInformation
+        BuildPAT="$(BuildPAT)"
+        HelixAPIKey="$(HelixApiAccessKey)"
+        Repo="$(CurrentRepo)"
+        Branch="$(BranchName)"
+        OperatingSystem="$(OperatingSystem)"
+        ConfigurationGroup="%(Repos.SelectedConfigurationGroup)"
+        Platform="$(Architecture)"
+        SubType="%(Repos.SubType)"
+        BuildNumber="$(BuildMoniker)"
+        TestStorageAccountKey="%(Repos.TestStorageAccountKey)"
+        >
+      <Output TaskParameter="ProductStorageAccount"
+              PropertyName="_EvaluatedProductStorageAccount" />
+      <Output TaskParameter="ProductContainerName"
+              PropertyName="_EvaluatedProductContainerName" />
+      <Output TaskParameter="TestStorageAccount"
+              PropertyName="_EvaluatedTestStorageAccount" />
+      <Output TaskParameter="TestContainerName"
+              PropertyName="_EvaluatedTestContainerName" />
+      <Output TaskParameter="TestPattern"
+              PropertyName="_EvaluatedTestPattern" />
+    </RetreiveBuildContainerInformation>
     
-    <!-- create a dummy project used to restore test binaries -->
-    <MakeDir Directories="$(UnitTestCLIProjDir)"/>
-    <Exec Command="$(DotnetToolCommand) new" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" WorkingDirectory="$(UnitTestCLIProjDir)"/>
-
-    <!-- delete the dummy project.json and replace with merged project json from the unit test drop -->
-    <Delete Files="$(UnitTestCLIProjJson)" />
-    <MergeAllProjectJsonsTask 
-        InPath="$(UnitTestExtractDir)" 
-        OutPath="$(UnitTestCLIProjJson)"
-        OldPrerelease="$(UpgradableMoniker)"
-        NewPrerelease="$(BuildMoniker)"
-        Debug="$(DebugMergeProjectJson)"/>
+    <RemoveDir Directories="$(FetchedDataDir)" Condition="!Exists('$(FetchedDataDir)')" />
+    <MakeDir Directories="$(FetchedDataDir)" />
     
-    <ItemGroup>
-      <GlobalJsonLines Include="{"/>
-      <GlobalJsonLines Include="&quot;packages&quot;: &quot;../../packages&quot;"/>
-      <GlobalJsonLines Include="}"/>
-    </ItemGroup>
-   
-    <WriteLinesToFile File="$(BaseIntermediateOutputPath)global.json" Lines="@(GlobalJsonLines)" Overwrite="true" />
+    <Message Importance="High" Text="$(CurrentRepo) Product SA: $(_EvaluatedProductStorageAccount) Product Container:$(_EvaluatedProductContainerName) Test SA: $(_EvaluatedTestStorageAccount) Test Container:$(_EvaluatedTestContainerName) " />
+    <Message Importance="High" Text="Downloading $(CurrentRepo) Product ... " />
     
-    <!-- restore and publish the dummy project to get a flat  -->
-    <Exec Command="$(TestDependRestoreCommand)" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" WorkingDirectory="$(UnitTestCLIProjDir)"/>
-    <Exec Command="$(TestDependPublishCommand)" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to locate .*" WorkingDirectory="$(UnitTestCLIProjDir)"/>
+    <DownloadFromAzure AccountName="$(_EvaluatedProductStorageAccount)"
+                       AccountKey="%(Repos.CloudDropAccessToken)"
+                       ContainerName="$(_EvaluatedProductContainerName)"
+                       DownloadDirectory="$(FetchedDataDir)%(Repos.Identity)" />
     
-    
-    <MakeDir Directories="$(SuitePath)"/>
-    <Copy SourceFiles="$(UnitTestCLIProjJson)" DestinationFiles="$(SuitePath)project.json"/>
-  </Target>
-
+    <Message Importance="High" Text="Downloading $(CurrentRepo) Test ... " Condition="'%(TestRepos.Identity)'=='$(CurrentRepo)'"/>
+    <DownloadFromAzure AccountName="$(_EvaluatedTestStorageAccount)"
+                   AccountKey="%(Repos.CloudDropAccessToken)"
+                   ContainerName="$(_EvaluatedTestContainerName)"
+                   DownloadDirectory="$(FetchedDataDir)tests/%(TestRepos.Identity)" 
+                   Condition="'%(TestRepos.Identity)'=='$(CurrentRepo)'" />
+                   
     <ItemGroup>
-      <GeneratedJsonFiles Include="$(SuitePath)**/project.json"/>
+      <CompletedDownloads Include="%(Repos.Identity)" Condition="Exists('$(FetchedDataDir)%(Repos.Identity)')">
+        <Semaphore>true</Semaphore>
+        <TestPattern>$(_EvaluatedTestPattern)</TestPattern>
+      </CompletedDownloads>
     </ItemGroup>
+  </Target>
+
     
-  <Target Name="GenerateStressSuiteSource" DependsOnTargets="RestoreTestDependsBin">
+  <Target Name="GenerateStressSuiteSource" DependsOnTargets="UnzipAllTests">
 
     <Error Condition="!Exists('$(SuiteConfigPath)')" Text="ERROR: File not found. Stress suite config path '$(SuiteConfigPath)' is invalid " />
 
@@ -186,11 +220,8 @@
       TestPaths="$(UnitTestExtractDir)"
       TestSearchStrings="$(UnitTestFileMask)"
       FrameworkPaths="$(UnitTestDependsBin)"
-      PackageConfigPath="$(UnitTestCLIProjJson)"/>    
-     
-     <ItemGroup>
-      <GeneratedJsonFiles Include="$(SuitePath)**/project.json"/>
-    </ItemGroup>
+      PackageConfigPath="$(UnitTestCLIProjJson)"/>
+      
   </Target>
 
   <Target Name="Build" DependsOnTargets="GenerateStressSuiteSource">