Merge changes from TFS

build.proj

@@ -57,9 +57,17 @@
               ItemName="ExpandedDnuRestoreDir" />
     </GatherDirectoriesToRestore>
 
-    <Exec Command="$(DnuRestoreCommand) &quot;%(ExpandedDnuRestoreDir.Identity)&quot;" StandardOutputImportance="Low" CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" ContinueOnError="WarnAndContinue" Condition="'$(SkipGatherRestoreDirs)' != 'true'" />
-
-    <Exec Command="$(DnuRestoreCommand) &quot;%(DnuRestoreDir.Identity)&quot;" StandardOutputImportance="Low" CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)" ContinueOnError="WarnAndContinue" Condition="'$(SkipGatherRestoreDirs)' == 'true'" />
+    <Exec Command="$(DnuRestoreCommand) &quot;%(ExpandedDnuRestoreDir.Identity)&quot;"
+          StandardOutputImportance="Low"
+          CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)"
+          ContinueOnError="ErrorAndContinue"
+          Condition="'$(SkipGatherRestoreDirs)' != 'true'" />
+
+    <Exec Command="$(DnuRestoreCommand) &quot;%(DnuRestoreDir.Identity)&quot;"
+          StandardOutputImportance="Low"
+          CustomErrorRegularExpression="(^Unable to locate .*)|(^Updating the invalid lock file with .*)"
+          ContinueOnError="ErrorAndContinue"
+          Condition="'$(SkipGatherRestoreDirs)' == 'true'" />
 
     <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Restoring all packages...Done." />
   </Target>

dir.props

@@ -73,16 +73,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ValidationPattern Include="^((System\..%2A)|(Microsoft\.CSharp)|(Microsoft\.NETCore.%2A)|(Microsoft\.TargetingPack\.Private.%2A)|(Microsoft\.Win32\..%2A)|(Microsoft\.VisualBasic))(?&lt;!TestData)$">
+    <ValidationPattern Include="^(?i)((System\..%2A)|(Microsoft\.CSharp)|(Microsoft\.NETCore.%2A)|(Microsoft\.TargetingPack\.Private\.(CoreCLR|NETNative))|(Microsoft\.Win32\..%2A)|(Microsoft\.VisualBasic))(?&lt;!TestData)$">
       <ExpectedPrerelease>rc3-23808</ExpectedPrerelease>
     </ValidationPattern>
-    <ValidationPattern Include="^(Microsoft\.TargetingPack\.NetFramework.%2A)$">
-      <ExpectedVersion>1.0.0</ExpectedVersion>
+    <ValidationPattern Include="^(?i)Microsoft\.TargetingPack\.(NetFramework.%2A|Private\.WinRT)$">
+      <ExpectedVersion>1.0.1</ExpectedVersion>
     </ValidationPattern>
-    <ValidationPattern Include="^xunit$">
+    <ValidationPattern Include="^(?i)xunit$">
       <ExpectedVersion>2.1.0</ExpectedVersion>
     </ValidationPattern>
-    <ValidationPattern Include="^xunit\.netcore\.extensions$">
+    <ValidationPattern Include="^(?i)xunit\.netcore\.extensions$">
       <ExpectedVersion>1.0.0-prerelease-00123</ExpectedVersion>
     </ValidationPattern>
   </ItemGroup>
@@ -99,19 +99,19 @@
 
   <!-- list of directories to perform batch restore -->
   <ItemGroup>
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/src" />
-    <DnuRestoreDir Include="$(ToolsDir)" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/src" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/pkg" />
   </ItemGroup>
-
+  
   <ItemGroup Condition="'$(SkipGatherRestoreDirs)' == 'true'">
     <!-- workaround to address issue where DNX won't recurse directories under a project.json
          https://github.com/aspnet/dnx/commit/0dda8bf86863364cc20421f1af7494f1b2a3256f -->
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/pkg/**/project.json" />
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/src/*/src/**/project.json" />
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/src/*/ref/*/project.json" />
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/src/*/tests/*/project.json" />
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/src/*/*/netcore50aot/project.json" />
-    <DnuRestoreDir Include="$(MSBuildProjectDirectory)/src/Common/tests/**/project.json" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/pkg/**/project.json" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/src/*/src/**/project.json" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/src/*/ref/*/project.json" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/src/*/tests/*/project.json" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/src/*/*/netcore50aot/project.json" />
+    <DnuRestoreDir Include="$(MSBuildThisFileDirectory)/src/Common/tests/**/project.json" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -129,11 +129,13 @@
     <DnuRestoreCommand Condition="'$(ParallelRestore)'=='true'">$(DnuRestoreCommand) --parallel</DnuRestoreCommand>
     <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand>
     <DnuRestoreCommand Condition="'$(LockDependencies)' == 'true'">$(DnuRestoreCommand) --lock</DnuRestoreCommand>
+    <DnuRestoreCommand Condition="'$(NuGetConfigPath)'!=''">$(DnuRestoreCommand) --configFile $(NuGetConfigPath)</DnuRestoreCommand>
   </PropertyGroup>
 
   <!-- Create a collection of all project.json files for dependency updates. -->
   <ItemGroup>
     <ProjectJsonFiles Include="$(SourceDir)**/project.json" />
+    <ProjectJsonFiles Include="$(MSBuildThisFileDirectory)/pkg/**/project.json" />
   </ItemGroup>
 
   <PropertyGroup Condition="'$(BuildAllProjects)'=='true'">
@@ -354,6 +356,13 @@
     </Otherwise>
   </Choose>
 
+  <!-- If there is a target group, try to find project.json and lockfile in a subfolder named as that target. -->
+  <PropertyGroup Condition="'$(TargetGroup)'!=''">
+    <ProjectJson Condition="Exists('$(MSBuildProjectDirectory)/$(TargetGroup)/project.json')">$(MSBuildProjectDirectory)/$(TargetGroup)/project.json</ProjectJson>
+    <!-- Check for both project.json and lockfile to avoid using a stale lockfile. -->
+    <ProjectLockJson Condition="Exists('$(MSBuildProjectDirectory)/$(TargetGroup)/project.json') AND Exists('$(MSBuildProjectDirectory)/$(TargetGroup)/project.lock.json')">$(MSBuildProjectDirectory)/$(TargetGroup)/project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+
   <!-- Provide defaults for ToolNugetRuntimeId -->
   <PropertyGroup Condition="'$(ToolNugetRuntimeId)'== ''">
     <ToolNugetRuntimeId Condition="'$(OsEnvironment)'=='Windows_NT'">win7-x64</ToolNugetRuntimeId>

pkg/redist/System.Collections/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Collections": "4.0.10"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Collections/lib/project.json

@@ -3,11 +3,6 @@
     "System.Collections": "4.0.10"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Diagnostics.Tracing/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Diagnostics.Tracing": "4.0.20"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Diagnostics.Tracing/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Diagnostics.Tracing": "4.0.20"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Dynamic.Runtime/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Dynamic.Runtime": "4.0.10"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Dynamic.Runtime/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Dynamic.Runtime": "4.0.10"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.IO/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.IO": "4.0.10"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.IO/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.IO": "4.0.10"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Linq.Expressions/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Linq.Expressions": "4.0.10"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Linq.Expressions/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Linq.Expressions": "4.0.10"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Reflection.Extensions/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Reflection.Extensions": "4.0.0"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Reflection.Extensions/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Reflection.Extensions": "4.0.0"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Reflection.Primitives/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Reflection.Primitives": "4.0.0"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Reflection.Primitives/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Reflection.Primitives": "4.0.0"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Reflection.TypeExtensions/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Reflection.TypeExtensions": "4.0.0"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Reflection.TypeExtensions/lib/project.json

@@ -1,14 +1,10 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Reflection.TypeExtensions": "4.0.0"
   },
   "frameworks": {
     "net46": {},
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Resources.ResourceManager/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Resources.ResourceManager": "4.0.0"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}

pkg/redist/System.Resources.ResourceManager/lib/project.json

@@ -1,13 +1,9 @@
 {
   "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
     "System.Resources.ResourceManager": "4.0.0"
   },
   "frameworks": {
-    "dnxcore50": {},
-    "netcore50": {}
-  },
-  "runtimes": {
-    "win8": {},
-    "win8-aot": {}
+    "dnxcore50": {}
   }
-}
+}

pkg/redist/System.Runtime.Extensions/lib/netcore50/project.json

@@ -0,0 +1,13 @@
+{
+  "dependencies": {
+    "Microsoft.NETCore.Targets": "1.0.0",
+    "System.Runtime.Extensions": "4.0.10"
+  },
+  "frameworks": {
+    "netcore50": {}
+  },
+  "runtimes": {
+    "win8": {},
+    "win8-aot": {}
+  }
+}