Merge

Microsoft.DotNet.Cli.sln

@@ -35,6 +35,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\BundledTemplates.props = build\BundledTemplates.props
 		build\Compile.targets = build\Compile.targets
 		build\CoreSetupInfo.props = build\CoreSetupInfo.props
+		build\CrossgenInfo.props = build\CrossgenInfo.props
 		build\DependencyVersions.props = build\DependencyVersions.props
 		build\FileExtensions.props = build\FileExtensions.props
 		build\GitCommitInfo.targets = build\GitCommitInfo.targets
@@ -89,11 +90,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "publish", "publish", "{27B1
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "dotnet-cli-build", "build_projects\dotnet-cli-build\dotnet-cli-build.csproj", "{8A2FA2D8-0DA1-4814-B5C1-2ECEAA613EB1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "crossgen", "crossgen", "{19AC02B7-6D2C-4C2B-A410-9D4A59CE0E47}"
-	ProjectSection(SolutionItems) = preProject
-		build\crossgen\Crossgen.targets = build\crossgen\Crossgen.targets
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "prepare", "prepare", "{2BDC1BC2-867E-47C0-BAD0-ADE897F07F78}"
 	ProjectSection(SolutionItems) = preProject
 		build\prepare\CentosCoreclrAndCoreFxDependencies.props = build\prepare\CentosCoreclrAndCoreFxDependencies.props

build/Compile.targets

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="compile/LzmaArchive.targets" />
-  <Import Project="crossgen/Crossgen.targets" />
 
   <ItemGroup>
     <PublishOutputExtensions Include="$(ExeExtension);.dll;.pdb;.deps.json;.runtimeconfig.json" />
@@ -16,15 +15,14 @@
                                            BuildProjectsForNuGetPackages;
                                            GetNuGetPackagesArchive;" />
 
-  <Target Name="CompileCLI"
+  <Target Name="CompileCLI">
-          DependsOnTargets="InitCrossgenProps;">
       <ItemGroup>
         <SharedFramework Remove="*" />
         <SharedFramework Include="$(SharedFrameworkPublishDirectory)/**/*" />
 
         <RuntimeTargetsAssetsToRemoveFromDeps Remove="*" />
         <RuntimeTargetsAssetsToRemoveFromDeps Include="MSBuild" />
-        
+
         <RuntimeAssetsToRemoveFromDeps Remove="*" />
         <RuntimeAssetsToRemoveFromDeps Include="redist" />
         <RuntimeAssetsToRemoveFromDeps Include="tool_msbuild" />
@@ -47,7 +45,7 @@
     </ItemGroup>
     <Copy SourceFiles="@(HackFilesToCopy)"
           DestinationFiles="@(HackFilesToCopy->'$(SdkOutputDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
-    
+
     <!-- Publish DotNet -->
     <DotNetPublish ToolPath="$(Stage0Directory)"
                    Configuration="$(Configuration)"
@@ -99,7 +97,7 @@
                                       $(SdkOutputDirectory)/System.Collections.NonGeneric.dll;
                                       $(SdkOutputDirectory)/System.Private.DataContractSerialization.dll" />
       </ItemGroup>
-    
+
       <!-- Move these "1.0" assemblies that TestPlatform lays down out of the way so crossgen doesn't pick them up.
            We need https://github.com/dotnet/cli/issues/5464 fixed, so test platform is in a separate directory -->
       <Move SourceFiles="@(NETCore10Assemblies)"

build/CrossgenInfo.props

@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
+    <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
+    <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
+  </PropertyGroup>
+</Project>

build/InputDirectories.props

@@ -4,5 +4,6 @@
     <DotnetCliBuildDirectory>$(RepoRoot)/build_projects/dotnet-cli-build</DotnetCliBuildDirectory>
     <MSBuildImportsDir>$(RepoRoot)/resources/MSBuildImports</MSBuildImportsDir>
     <SrcDirectory>$(RepoRoot)/src</SrcDirectory>
+    <TestDirectory>$(RepoRoot)/test/</TestDirectory>
   </PropertyGroup>
 </Project>

build/OutputDirectories.props

@@ -19,6 +19,12 @@
       <PackagesDirectory>$(BaseOutputDirectory)/packages</PackagesDirectory>
       <SharedFrameworkPublishDirectory>$(IntermediateDirectory)/sharedFrameworkPublish</SharedFrameworkPublishDirectory>
       <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
+      <DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
+      <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
+      <TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
+      <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
+      <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
+      <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
       <NuGetPackagesArchiveProject>$(IntermediateDirectory)/NuGetPackagesArchiveProject</NuGetPackagesArchiveProject>
       <NuGetPackagesArchiveFolder>$(IntermediateDirectory)/NuGetPackagesArchiveFolder</NuGetPackagesArchiveFolder>
   </PropertyGroup>

build/Test.targets

@@ -1,33 +1,27 @@
 <Project ToolsVersion="14.0" DefaultTargets="Test">
-  <PropertyGroup>
-    <PathSeparator>/</PathSeparator>
-    <PathSeparator Condition=" '$(OSName)' == 'win' ">\</PathSeparator>
-  </PropertyGroup>
-
   <Import Project="test/TestPackageProjects.targets" />
   <Import Project="test/TestProjects.targets" />
 
+  <PropertyGroup>
+    <PathListSeparator>:</PathListSeparator>
+    <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
+    <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
+    <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <TestTaskEnvironmentVariables Include="PATH=$(ExecPath)" />
+    <TestTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsDir)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <RunTestEnvironmentVariables>@(TestTaskEnvironmentVariables)</RunTestEnvironmentVariables>
+  </PropertyGroup>
+
   <Target Name="Test"
           Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' "
           DependsOnTargets="BuildTests;">
 
-    <PropertyGroup>
-      <PathListSeparator>:</PathListSeparator>
-      <PathListSeparator Condition=" '$(OSName)' == 'win' ">%3b</PathListSeparator>
-      <ExecPath>$(Stage2Directory)$(PathListSeparator)$(PATH)</ExecPath>
-      <ExecPath Condition=" '$(OSName)' == 'win' ">$(Stage2Directory)</ExecPath>
-      <TestArtifactsEnv>$(TestArtifactsDir)</TestArtifactsEnv>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <TestTaskEnvironmentVariables Include="PATH=$(ExecPath)" />
-      <TestTaskEnvironmentVariables Include="TEST_ARTIFACTS=$(TestArtifactsEnv)" />
-    </ItemGroup>
-
-    <PropertyGroup>
-      <RunTestEnvironmentVariables>@(TestTaskEnvironmentVariables)</RunTestEnvironmentVariables>
-    </PropertyGroup>
-
     <ItemGroup>
       <ProjectsToTest Include="build/test/RunTest.proj">
         <Properties>
@@ -55,16 +49,6 @@
   <Target Name="PrepareTests"
           DependsOnTargets="Init;
                             SetupTestProjectData">
-    <PropertyGroup>
-      <TestOutputDir>$(RepoRoot)/artifacts/testpackages/</TestOutputDir>
-      <TestPackagesBuildDir>$(TestOutputDir)/packagesBuild/</TestPackagesBuildDir>
-      <TestPackagesDir>$(TestOutputDir)/packages/</TestPackagesDir>
-      <TestArtifactsDir>$(TestOutputDir)/artifacts/</TestArtifactsDir>
-      <TestResultXmlDir>$(TestOutputDir)/results/</TestResultXmlDir>
-      <TestDirectory>$(RepoRoot)/test/</TestDirectory>
-      <DotnetUnderTest>$(Stage2Directory)</DotnetUnderTest>
-    </PropertyGroup>
-
     <MakeDir Directories="$(TestPackagesDir)" Condition="!Exists('$(TestPackagesDir)')"/>
   </Target>
 

build/crossgen/Crossgen.targets

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="InitCrossgenProps"
-          DependsOnTargets="Init">
-    <PropertyGroup>
-      <RuntimeNETCoreAppPackageName>runtime.$(CoreCLRRid).microsoft.netcore.app</RuntimeNETCoreAppPackageName>
-
-      <CrossgenPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)</CrossgenPath>
-      <LibCLRJitPath>$(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)</LibCLRJitPath>
-    </PropertyGroup>
-  </Target>
-</Project>

build/test/TestAssetProjects.targets

@@ -31,10 +31,10 @@
 
   <Target Name="SetupBuildTestAssetProjectInputs">
     <ItemGroup>
-      <NoAutoBuildTestAssets Include="TestAssets$(PathSeparator)TestProjects$(PathSeparator)**$(PathSeparator).noautobuild" />
+      <NoAutoBuildTestAssets Include="TestAssets/TestProjects/**/.noautobuild" />
       <NoAutoBuildTestAssetProjects Include="%(NoAutoBuildTestAssets.RelativeDir)project.json" />
 
-      <PreTestAssetProjects Include="TestAssets$(PathSeparator)TestProjects$(PathSeparator)**$(PathSeparator)project.json"/>
+      <PreTestAssetProjects Include="TestAssets/TestProjects/**/project.json"/>
                          
       <TestAssetProjects Include="%(PreTestAssetProjects.RelativeDir)project.json"
                          Exclude="@(NoAutoBuildTestAssetProjects)"/>

build/test/TestProjects.targets

@@ -10,20 +10,20 @@
       <PreTestProjectsToExclude Condition=" '$(IsDesktopAvailable)' != 'True' " 
                              Include="test/binding-redirects.Tests/binding-redirects.Tests.csproj;" />
       -->
-      <PreTestProjectsToExclude Include="test$(PathSeparator)binding-redirects.Tests$(PathSeparator)binding-redirects.Tests.csproj;" />
+      <PreTestProjectsToExclude Include="test/binding-redirects.Tests/binding-redirects.Tests.csproj;" />
 
       <PreTestProjectsToExclude Condition=" 'Non-test projects in test directory' != 'consider moving elsewhere' "
-                             Include="test$(PathSeparator)ArgumentsReflector$(PathSeparator)ArgumentsReflector.csproj;
+                             Include="test/ArgumentsReflector/ArgumentsReflector.csproj;
-                                      test$(PathSeparator)Microsoft.DotNet.Tools.Tests.Utilities$(PathSeparator)Microsoft.DotNet.Tools.Tests.Utilities.csproj;
+                                      test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj;
-                                      test$(PathSeparator)Msbuild.Tests.Utilities$(PathSeparator)Msbuild.Tests.Utilities.csproj;
+                                      test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj;
-                                      test$(PathSeparator)Performance$(PathSeparator)Performance.csproj" />
+                                      test/Performance/Performance.csproj" />
 
       <PreTestProjectsToExclude Condition=" 'Executed after primary test phase.' != ' Consider moving.' "
-                             Include="test$(PathSeparator)Installer$(PathSeparator)Microsoft.DotNet.Cli.Msi.Tests$(PathSeparator)Microsoft.DotNet.Cli.Msi.Tests.csproj;" />
+                             Include="test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj;" />
 
       <TestProjectsToExclude Include="%(PreTestProjectsToExclude.Fullpath)" />
 
-      <PreTestProjects Include="test$(PathSeparator)*$(PathSeparator)*.csproj;" />
+      <PreTestProjects Include="test/*/*.csproj;" />
 
       <TestProjects Include="%(PreTestProjects.Fullpath)"
                     Exclude="@(TestProjectsToExclude)" />

dir.props

@@ -34,4 +34,6 @@
 
     <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
   </PropertyGroup>
+
+  <Import Project="build/CrossgenInfo.props" />
 </Project>