Addressing more code review comments and removing the incrementality from BuildProjectsForNuGetPackages. All it does is invoke dotnet build, which already has incremental builds. I will let it handle this one.

2016-06-30 17:34:11 -07:00 · 2016-06-30 17:34:11 -07:00 · 5302a63aa3
commit 5302a63aa3
parent 2846a9b2e7
6 changed files with 15 additions and 83 deletions
--- a/build.proj
+++ b/build.proj
@ -13,18 +13,22 @@

    <NoRunArg Condition=" '$(OS)' == 'Windows_NT' ">-NoRun</NoRunArg>
    <NoRunArg Condition=" '$(OS)' != 'Windows_NT' ">--norun</NoRunArg>
-    
+
    <CLITargets Condition=" '$(CLITargets)' == '' ">Prepare;Compile;Test;Package;Publish</CLITargets>
    <CLIBuildFileName>$(MSBuildThisFileDirectory)/build_projects/dotnet-cli-build/bin/dotnet-cli-build</CLIBuildFileName>
    <CLIBuildDll>$(CLIBuildFileName).dll</CLIBuildDll>

    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
-    
+
    <CoreSetupChannel>preview</CoreSetupChannel>
+    <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
    <SharedFrameworkVersion>1.0.0</SharedFrameworkVersion>
    <SharedHostVersion>1.0.1</SharedHostVersion>
    <HostFxrVersion>1.0.1</HostFxrVersion>
+
+    <CoreCLRVersion>1.0.2</CoreCLRVersion>
+    <JitVersion>1.0.2</JitVersion>
  </PropertyGroup>

  <ItemGroup>
--- a/build/Microsoft.DotNet.Cli.Compile.targets
+++ b/build/Microsoft.DotNet.Cli.Compile.targets
@ -7,12 +7,11 @@
  <UsingTask TaskName="CleanPublishOutput" AssemblyFile="$(CLIBuildDll)" />
  <UsingTask TaskName="CrossgenDirectory" AssemblyFile="$(CLIBuildDll)" />    

-  <Target Name="Compile" DependsOnTargets="Init;
+  <Target Name="Compile" DependsOnTargets="Prepare;
                                           SetupStage;
                                           CompileStage;
                                           BuildProjectsForNuGetPackages;
-                                           GenerateNuGetPackagesArchive">
-  </Target>
+                                           GenerateNuGetPackagesArchive" />

  <Target Name="SetupStage">
    <PropertyGroup>
@ -62,10 +61,8 @@
        <BinaryToCorehostifyRelDir>runtimes/any/native</BinaryToCorehostifyRelDir>
        <BinaryToCorehostifyOutDir>$(SdkOutputDirectory)/$(BinaryToCorehostifyRelDir)</BinaryToCorehostifyOutDir>
        <MSBuildTargetsDirectory>$(SdkOutputDirectory)/runtimes/any/native</MSBuildTargetsDirectory>
-
-        <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
-        <SharedFrameworkNuGetVersion>1.0.0</SharedFrameworkNuGetVersion>
-        <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkNuGetVersion)</SharedFrameworkNameVersionPath>
+        
+        <SharedFrameworkNameVersionPath>$(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)</SharedFrameworkNameVersionPath>
      </PropertyGroup>

      <ItemGroup>
--- a/build/package/Microsoft.DotNet.Cli.Nupkg.targets
+++ b/build/package/Microsoft.DotNet.Cli.Nupkg.targets
@ -11,111 +11,46 @@
    </PropertyGroup>
    
    <ItemGroup>
-      <MicrosoftDotNetCliUtilsInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/*.cs;
-                                              $(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/project.json;
-                                              $(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/project.lock.json"
-                                     Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils/**/obj/**/*.cs" />
-      <MicrosoftDotNetCompilerCommonInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/*.cs;
-                                                    $(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/project.json;
-                                                    $(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/project.lock.json"
-                                           Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common/**/obj/**/*.cs" />
-      <MicrosoftDotNetFilesInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/*.cs;
-                                           $(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/project.json;
-                                           $(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/project.lock.json"
-                            Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files/**/obj/**/*.cs" />
-      <MicrosoftDotNetInternalAbstractionsInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/*.cs;
-                                                          $(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/project.json;
-                                                          $(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/project.lock.json"
-                                                 Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions/**/obj/**/*.cs" />
-      <MicrosoftDotNetProjectModelInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/*.cs;
-                                                  $(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/project.json;
-                                                  $(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/project.lock.json"
-                                         Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel/**/obj/**/*.cs" />
-      <MicrosoftDotNetProjectModelLoaderInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/*.cs;
-                                                        $(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/project.json;
-                                                        $(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/project.lock.json"
-                                               Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader/**/obj/**/*.cs" />
-      <MicrosoftDotNetProjectModelWorkspacesInputs Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/*.cs;
-                                                            $(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/project.json;
-                                                            $(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/project.lock.json"
-                                                   Exclude="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces/**/obj/**/*.cs" />
-      <MicrosoftExtensionsDependencyModelInputs Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/*.cs;
-                                                         $(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/project.json;
-                                                         $(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/project.lock.json"
-                                                Exclude="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel/**/obj/**/*.cs" />
-      <MicrosoftExtensionsTestingAbstractionsInputs Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/*.cs;
-                                                             $(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/project.json;
-                                                             $(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/project.lock.json"
-                                                    Exclude="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions/**/obj/**/*.cs" />
-
-      <MicrosoftDotNetCliUtilsOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.Cli.Utils/**/netstandard*/Microsoft.DotNet.Cli.Utils.dll" />
-      <MicrosoftDotNetCompilerCommonOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.Compiler.Common/**/netstandard*/Microsoft.DotNet.Compiler.Common.dll" />
-      <MicrosoftDotNetFilesOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.Files/**/netstandard*/Microsoft.DotNet.Files.dll" />
-      <MicrosoftDotNetInternalAbstractionsOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.InternalAbstractions/**/netstandard*/Microsoft.DotNet.InternalAbstractions.dll" />
-      <MicrosoftDotNetProjectModelOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.ProjectModel/**/netstandard*/Microsoft.DotNet.ProjectModel.dll" />
-      <MicrosoftDotNetProjectModelLoaderOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.ProjectModel.Loader/**/netstandard*/Microsoft.DotNet.ProjectModel.Loader.dll" />
-      <MicrosoftDotNetProjectModelWorkspacesOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.DotNet.ProjectModel.Workspaces/**/netstandard*/Microsoft.DotNet.ProjectModel.Workspaces.dll" />
-      <MicrosoftExtensionsDependencyModelOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.Extensions.DependencyModel/**/netstandard*/Microsoft.Extensions.DependencyModel.dll" />
-      <MicrosoftExtensionsTestingAbstractionsOutputs Include="$(PackagingBuildBasePath)/src/Microsoft.Extensions.Testing.Abstractions/**/netstandard*/Microsoft.Extensions.Testing.Abstractions.dll" />
-
-
-      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils">
-        <Inputs>@(MicrosoftDotNetCliUtilsInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetCliUtilsOutputs)</Outputs>
+      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils" >
        <ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
        <Version>$(SdkNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Compiler.Common">
-        <Inputs>@(MicrosoftDotNetCompilerCommonInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetCompilerCommonOutputs)</Outputs>
        <ProjectName>Microsoft.DotNet.Compiler.Common</ProjectName>
        <Version>$(SdkNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Files">
-        <Inputs>@(MicrosoftDotNetFilesInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetFilesOutputs)</Outputs>
        <ProjectName>Microsoft.DotNet.Files</ProjectName>
        <Version>$(SdkNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.InternalAbstractions">
-        <Inputs>@(MicrosoftDotNetInternalAbstractionsInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetInternalAbstractionsOutputs)</Outputs>
        <ProjectName>Microsoft.DotNet.InternalAbstractions</ProjectName>
        <Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel">
-        <Inputs>@(MicrosoftDotNetProjectModelInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetProjectModelOutputs)</Outputs>
        <ProjectName>Microsoft.DotNet.ProjectModel</ProjectName>
        <Version>$(ProjectModelNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Loader">
-        <Inputs>@(MicrosoftDotNetProjectModelLoaderInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetProjectModelLoaderOutputs)</Outputs>
        <ProjectName>Microsoft.DotNet.ProjectModel.Loader</ProjectName>
        <Version>$(SdkNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.ProjectModel.Workspaces">
-        <Inputs>@(MicrosoftDotNetProjectModelWorkspacesInputs)</Inputs>
-        <Outputs>@(MicrosoftDotNetProjectModelWorkspacesOutputs)</Outputs>
        <ProjectName>Microsoft.DotNet.ProjectModel.Workspaces</ProjectName>
        <Version>$(SdkNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.DependencyModel">
-        <Inputs>@(MicrosoftExtensionsDependencyModelInputs)</Inputs>
-        <Outputs>@(MicrosoftExtensionsDependencyModelOutputs)</Outputs>
        <ProjectName>Microsoft.Extensions.DependencyModel</ProjectName>
        <Version>$(DependencyModelAndInternalAbstractionsNugetVersion)</Version>
      </ProjectsToPack>
      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.Extensions.Testing.Abstractions">
-        <Inputs>@(MicrosoftExtensionsTestingAbstractionsInputs)</Inputs>
-        <Outputs>@(MicrosoftExtensionsTestingAbstractionsOutputs)</Outputs>
        <ProjectName>Microsoft.Extensions.Testing.Abstractions</ProjectName>
        <Version>$(SdkNugetVersion)</Version>
      </ProjectsToPack>

-      <ProjectPackTargetInputs Include="%(ProjectsToPack.Outputs)" />
+      <ProjectPackTargetInputs Include="$(PackagingBuildBasePath)/src/%(ProjectsToPack.ProjectName)/**/netstandard*/%(ProjectName).dll" />
      <ProjectPackTargetOutputs Include="$(NupkgOutputDirectory)/%(ProjectsToPack.ProjectName).%(ProjectsToPack.Version).nupkg" />
+    
    </ItemGroup>
  </Target>

@ -135,9 +70,7 @@
  <Target Name="BuildProjectsForNuGetPackages"
            DependsOnTargets="Init;
                              SetupGenerateNugetPackagesInputsOutputs"            
-            Condition=" '$(OS)' == 'Windows_NT' "
-            Inputs="%(ProjectsToPack.Inputs)"
-            Outputs="%(ProjectsToPack.Outputs)">
+            Condition=" '$(OS)' == 'Windows_NT' ">
        <MakeDir Directories="$(PackagingBuildBasePath)" />

        <Exec Command="$(DotnetStage2) build
--- a/build_projects/dotnet-cli-build/CrossgenDirectory.cs
+++ b/build_projects/dotnet-cli-build/CrossgenDirectory.cs
@ -30,7 +30,7 @@ namespace Microsoft.DotNet.Cli.Build

        public override bool Execute()
        {
-            var crossgenUtil = new Crossgen(DependencyVersions.CoreCLRVersion, DependencyVersions.JitVersion);
+            var crossgenUtil = new Crossgen(CoreCLRVersion, JitVersion);

            crossgenUtil.CrossgenDirectory(SharedFrameworkNameVersionPath, SdkOutputDirectory);

--- a/tools/Archiver/project.json
+++ b/tools/Archiver/project.json
@ -20,7 +20,6 @@
  "runtimes": {
    "win7-x64": {},
    "win7-x86": {},
-    "osx.10.10-x64": {},
    "osx.10.11-x64": {},
    "ubuntu.14.04-x64": {},
    "ubuntu.16.04-x64": {},
--- a/tools/MultiProjectValidator/project.json
+++ b/tools/MultiProjectValidator/project.json
@ -23,7 +23,6 @@
  "runtimes": {
    "win7-x64": {},
    "win7-x86": {},
-    "osx.10.10-x64": {},
    "osx.10.11-x64": {},
    "ubuntu.14.04-x64": {},
    "ubuntu.16.04-x64": {},