Merge pull request #1061 from KevinRansom/master

Use msbuild to coordinate builds in build.cmd

Merge pull request #1061 from KevinRansom/master
Use msbuild to coordinate builds in build.cmd
d7afa838 · Kevin Ransom (msft) · 9e288341 · 4f7300cd · d7afa838 · d7afa838
隐藏空白更改
内联并排

Showing with 55 addition and 106 deletion

appveyor.yml appveyor.yml +1 -1

build-everything.proj build-everything.proj +53 -26

build.cmd build.cmd +1 -79

未找到文件。
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -25,4 +25,4 @@ artifacts:
    type: zip

 #on_finish:
-#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+#  - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
\ No newline at end of file
--- a/build-everything.proj
+++ b/build-everything.proj
 <!-- Copyright (c) Microsoft Corporation.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-  <ItemGroup>
+
+  <ItemGroup Condition="'$(BUILD_NET40)'=='1'">
    <ProjectsWithDefaultFramework Include="src/fsharp-library-build.proj" />
    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-build.proj" />
-    <ProjectsWithDefaultFramework Include="src/fsharp-typeproviders-build.proj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj"  Condition="'$(TEST_NET40_COREUNIT)'=='1'" />
+    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" Condition="'$(TEST_COMPILERUNIT)'=='1'" />
+    <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj"         Condition="'$(TEST_FSHARP_SUITE)'=='1'" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj"           Condition="'$(BUILD_PORTABLE)'=='1'"/>
+    <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_PORTABLE_COREUNIT)'=='1'" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectsWithDefaultFramework Include="src/fsharp-typeproviders-build.proj"      Condition="'$(BUILD_FSHARP_DATA_TYPEPROVIDERS)'=='1'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BUILD_VS)'=='1'">
    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-src-build.proj" />
    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-deployment-build.proj" />
-    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" />
-    <ProjectsWithDefaultFramework Include="src/fsharp-library-unittests-build.proj" />
-    <ProjectsWithDefaultFramework Include="src/fsharp-compiler-unittests-build.proj" />
-    <ProjectsWithDefaultFramework Include="tests/fsharp/FSharp.Tests.fsproj" />
-	
-    <ProjectsWithPortableFramework Include="src/fsharp-library-build.proj" />
-    <ProjectsWithPortableFramework Include="src/fsharp-library-unittests-build.proj" />
-  </ItemGroup>
-  
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectsWithDefaultFramework Include="vsintegration/fsharp-vsintegration-unittests-build.proj" Condition="'$(TEST_VS)'=='1'" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(BUILD_CORECLR)'=='1'">
+    <ProjectsWithCoreClr Include="src/fsharp-library-build.proj" />
+    <ProjectsWithCoreClr Include="src/fsharp-compiler-build.proj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectsWithCoreClr Include="src/fsharp-library-unittests-build.proj" Condition="'$(TEST_CORECLR)'=='1'" />
+  </ItemGroup>
+
  <Target Name="Build">
-    <MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Build" BuildInParallel="true"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable47"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable7"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable78"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true" Properties="TargetFramework=portable259"/>
+    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Build" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
+    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Build" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
  </Target>

  <Target Name="Rebuild">
-    <MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Rebuild" BuildInParallel="true"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable47"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable7"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable78"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true" Properties="TargetFramework=portable259"/>
+    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Rebuild" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
+    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Rebuild" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
  </Target>

  <Target Name="Clean">
-    <MSBuild Projects="@(ProjectsWithDefaultFramework)" Targets="Clean" BuildInParallel="true"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable47"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable7"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable78"/>
-    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true" Properties="TargetFramework=portable259"/>
+    <MSBuild Projects="@(ProjectsWithDefaultFramework)"  Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration)" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable7" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable47" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable78" />
+    <MSBuild Projects="@(ProjectsWithPortableFramework)" Targets="Clean" BuildInParallel="true"  Properties="Configuration=$(Configuration);TargetFramework=portable259" />
+    <MSBuild Projects="@(ProjectsWithCoreClr)"           Targets="Clean" BuildInParallel="false" Properties="Configuration=$(Configuration);TargetFramework=coreclr" />
  </Target>
 </Project>
--- a/build.cmd
+++ b/build.cmd
@@ -281,85 +281,7 @@ if '%BUILD_PROTO%' == '1' (
    @if ERRORLEVEL 1 echo Error: NGen of proto failed  && goto :failure
 )

-%_msbuildexe% %msbuildflags% src/fsharp-compiler-build.proj /p:Configuration=%BUILD_CONFIG%  /p:RestorePackages=%RestorePackages%
-@if ERRORLEVEL 1 echo Error: compiler build failed && goto :failure
-
-%_msbuildexe% %msbuildflags% src/fsharp-library-build.proj /p:Configuration=%BUILD_CONFIG%  /p:RestorePackages=%RestorePackages%
-@if ERRORLEVEL 1 echo Error: library build failed && goto :failure
-
-if '%BUILD_FSHARP_DATA_TYPEPROVIDERS%' == '1' (
-    %_msbuildexe% %msbuildflags% src/fsharp-typeproviders-build.proj /p:Configuration=%BUILD_CONFIG%  /p:RestorePackages=%RestorePackages%
-    @if ERRORLEVEL 1 echo Error: type provider build failed && goto :failure
-)
-
-if '%BUILD_CORECLR%' == '1' (
-    %_msbuildexe% %msbuildflags% src/fsharp-library-build.proj /p:TargetFramework=coreclr /p:Configuration=%BUILD_CONFIG% /p:RestorePackages=%RestorePackages%
-    @if ERRORLEVEL 1 echo Error: library coreclr build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% src/fsharp-compiler-build.proj /p:TargetFramework=coreclr /p:Configuration=%BUILD_CONFIG% /p:RestorePackages=%RestorePackages%
-    @if ERRORLEVEL 1 echo Error: compiler coreclr build failed && goto :failure
-
-    if '%TEST_CORECLR%' == '1' (
-        %_msbuildexe% src/fsharp-library-unittests-build.proj /p:TargetFramework=coreclr /p:Configuration=%BUILD_CONFIG%
-        @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
-    )
-)
-
-if '%BUILD_PORTABLE%' == '1' (
-    %_msbuildexe% %msbuildflags% src/fsharp-library-build.proj /p:TargetFramework=portable7 /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: library portable7 build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% src/fsharp-library-build.proj /p:TargetFramework=portable47 /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: library portable47 build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% src/fsharp-library-build.proj /p:TargetFramework=portable78 /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: library portable78 build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% src/fsharp-library-build.proj /p:TargetFramework=portable259 /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: library portable259 build failed && goto :failure
-)
-
-if '%TEST_COMPILERUNIT%' == '1' (
-    %_msbuildexe% %msbuildflags% src/fsharp-compiler-unittests-build.proj /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: compiler unittests build failed && goto :failure
-)
-if '%TEST_NET40_COREUNIT%' == '1' (
-    %_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
-)
-
-if '%TEST_PORTABLE_COREUNIT%' == '1' (
-   %_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj  /p:TargetFramework=portable7 /p:Configuration=%BUILD_CONFIG%
-   @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
-
-   %_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj  /p:TargetFramework=portable47 /p:Configuration=%BUILD_CONFIG%
-   @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
-
-   %_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj  /p:TargetFramework=portable78 /p:Configuration=%BUILD_CONFIG%
-   @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
-
-   %_msbuildexe% %msbuildflags% src/fsharp-library-unittests-build.proj  /p:TargetFramework=portable259 /p:Configuration=%BUILD_CONFIG%
-   @if ERRORLEVEL 1 echo Error: library unittests build failed && goto :failure
-)
-
-if '%BUILD_VS%' == '1' (
-    %_msbuildexe% %msbuildflags% vsintegration/fsharp-vsintegration-src-build.proj /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: VS integration src build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% vsintegration/fsharp-vsintegration-project-templates-build.proj /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: VS integration project templates build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% vsintegration/fsharp-vsintegration-item-templates-build.proj /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: VS integration item templates build failed && goto :failure
-
-    %_msbuildexe% %msbuildflags% vsintegration/fsharp-vsintegration-deployment-build.proj /p:Configuration=%BUILD_CONFIG%
-    @if ERRORLEVEL 1 echo Error: VS integration deployment build failed && goto :failure
-
-    if '%TEST_VS%' == '1' (
-        %_msbuildexe% %msbuildflags% vsintegration/fsharp-vsintegration-unittests-build.proj /p:Configuration=%BUILD_CONFIG%
-        @if ERRORLEVEL 1 echo Error: VS integration unittests build failed && goto :failure
-    )
-)
+%_msbuildexe% %msbuildflags% build-everything.proj /p:Configuration=%BUILD_CONFIG%

 @echo on
 call src\update.cmd %BUILD_CONFIG_LOWERCASE% -ngen