Fix local build and tests for UWP #980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

benstevens48 wants to merge 30 commits into microsoft:uwp/main from Pictureflect:fix-build

CONTRIBUTING.md

-Original file line number
+Diff line change
@@ Expand Up / @@ -105,7 +105,7 @@ appropriate test suites. @@
     To validate your changes, run "msbuild /m /nr:false Win2D.proj" from a
     Visual Studio Developer Command Prompt. This will:
-    - Build all flavors of all projects (debug, release, x86, x64, ARM, and ARM64)
+    - Build all flavors of all projects (debug, release, x86, x64, and ARM64)
     - Run all automated tests
     - Generate updated reference documentation
     - Make sure all source files include the correct MIT copyright header
@@ Expand Down @@

Win2D.proj

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -12,7 +12,7 @@
  
      <!-- Parameters that can be configured by the caller, eg. "msbuild Win2D.proj /p:BuildTests=false" -->

      <PropertyGroup>

        <BuildPlatforms>Win32;x64;ARM;ARM64;AnyCPU</BuildPlatforms>

        <BuildPlatforms>Win32;x64;ARM64;AnyCPU</BuildPlatforms>

        <BuildConfigurations>Debug;Release</BuildConfigurations>

        <BuildTests>true</BuildTests>

        <BuildTools>true</BuildTools>

    @@ -28,7 +28,7 @@
  
      <!-- Set default platforms for each project type -->

      <ItemDefinitionGroup>

        <UAPProject>

          <Platforms>Win32;x64;ARM;ARM64</Platforms>

          <Platforms>Win32;x64;ARM64</Platforms>

          <BinDir>UAP</BinDir>

        </UAPProject>

        <AnyCPUProject>

    @@ -62,7 +62,7 @@
  
        </UAPProject>

        <UAPProject Include="winrt\test.nativecomponent\winrt.test.nativecomponent.uap.vcxproj" />

        <UAPProject Include="winrt\test.managed\winrt.test.managed.uap.csproj">

          <Platforms>Win32;x64;ARM</Platforms>

          <Platforms>Win32;x64</Platforms>

          <AutomatedTests Condition="$(ShouldRunUAPTests)">store</AutomatedTests>

          <BuildInParallel>false</BuildInParallel>

        </UAPProject>

    @@ -99,54 +99,21 @@
  
      <Target Name="Build"

              DependsOnTargets="BuildProjects; CheckCode; BuildDocs; RunTests" />

      <!-- TargetPlatformMinVersion 10.0.16299.0 and 10.0.10240 Platforms must be build separately. -->

      <Target Name="BuildProjects" DependsOnTargets="BuildProjects10240" />

      <!-- Since ARM64 requires a TargetPlatformMinVersion of at least 10.0.16299.0,

           its NuGet restore and subsequent build need to run separately from the other

           (10240) platforms.

           In order to minimize refactoring of the existing build, this is done just after

           the existing Platform targets build. This is done by adding !='ARM64' Conditions

           to RestoreNuGetPackages and BuildProjects, duplicating them with =='ARM64'

           Conditions, then stitching them into the target graph just after BuildProjects.

           -->

      <Target Name="BuildProjectsPrelim" DependsOnTargets="PrepareVersionInfo; ChooseProjectsToBuild; ChooseConfigurationsToRestore" />

      <!-- Duplicate BuildProjects for just ARM64 -->

      <Target Name="BuildProjects16299"

              DependsOnTargets="BuildProjectsPrelim; RestoreNuGetPackages16299"

              Inputs="@(ProjectsToBuild)"

              Outputs="%(PlatformIndependentName)">

        <Message Text="Building TargetPlatformMinVersion 16299 variants of project %(ProjectsToBuild.PlatformIndependentName):"

                 Importance="High" />

        <Message Text="  %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))"

                 Importance="High"

                 Condition="'%(ProjectsToBuild.Platform)'=='ARM64'" />

        <MSBuild Projects="@(ProjectsToBuild)"

                 BuildInParallel="%(ProjectsToBuild.BuildInParallel)"

                 Properties="IncludeVersionInfo=true"

                 Condition="'%(ProjectsToBuild.Platform)'=='ARM64'" />

      </Target>

      <!-- Use batching to build each project in turn -->

      <Target Name="BuildProjects10240"

              DependsOnTargets="BuildProjectsPrelim; BuildProjects16299; RestoreNuGetPackages10240"

      <Target Name="BuildProjects"

              DependsOnTargets="BuildProjectsPrelim; RestoreNuGetPackages"

              Inputs="@(ProjectsToBuild)"

              Outputs="%(PlatformIndependentName)">

        <Message Importance="High" Text="Building TargetPlatformMinVersion 10240 variants of project %(ProjectsToBuild.PlatformIndependentName):" />

        <Message Importance="High" Text="  %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" Condition="'%(ProjectsToBuild.Platform)'!='ARM64'" />

        <Message Importance="High" Text="Building all variants of project %(ProjectsToBuild.PlatformIndependentName):" />

        <Message Importance="High" Text="  %(ProjectsToBuild.Filename) (%(ProjectsToBuild.Configuration)|%(ProjectsToBuild.Platform))" />

        <!-- All the variants (platform and configuration) of most projects can be built in parallel -->

        <MSBuild Projects="@(ProjectsToBuild)"

                 BuildInParallel="%(ProjectsToBuild.BuildInParallel)"

                 Properties="IncludeVersionInfo=true"

                 Condition="'%(ProjectsToBuild.Platform)'!='ARM64'" />

                 Properties="IncludeVersionInfo=true" />

      </Target>

    @@ -268,11 +235,8 @@
  
      <PropertyGroup>

        <_VsTestPathUnderCommonTools>..\IDE\CommonExtensions\Microsoft\TestWindow\vstest.console.exe</_VsTestPathUnderCommonTools>

        <_VsTest Condition="Exists('$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS120COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>

        <_VsTest Condition="Exists('$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS140COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>

        <_VsTest Condition="Exists('$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS150COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>

        <_VsTest Condition="Exists('$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS160COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>

        <_VsTest Condition="Exists('$(VS170COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS170COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>

        <_VsTest Condition="Exists('$(VS180COMNTOOLS)$(_VsTestPathUnderCommonTools)')">$(VS180COMNTOOLS)$(_VsTestPathUnderCommonTools)</_VsTest>

        <VsTest Condition="'$(_VsTest)' != ''">"$([System.IO.Path]::GetFullPath('$(_VsTest)'))"</VsTest>

      </PropertyGroup>

    @@ -296,7 +260,7 @@
  
      <Target Name="ChooseTestsToRun">

        <ItemGroup>

          <TestProjects Include="@(ProjectsToBuild)" Condition="%(ProjectsToBuild.AutomatedTests) != '' and %(ProjectsToBuild.Platform) != ARM and %(ProjectsToBuild.Platform) != ARM64">

          <TestProjects Include="@(ProjectsToBuild)" Condition="%(ProjectsToBuild.AutomatedTests) != '' and %(ProjectsToBuild.Platform) != ARM64">

            <!-- Remap Win32 to x86 -->

            <TestPlatform Condition="%(ProjectsToBuild.Platform) == Win32">x86</TestPlatform>

            <TestPlatform Condition="%(ProjectsToBuild.Platform) != Win32">%(ProjectsToBuild.Platform)</TestPlatform>

    @@ -332,7 +296,7 @@
  
            <Configuration>%(BuildConfiguration.Identity)</Configuration>

          </ConfigToRestore>

          <NuGetRestore Include="@(ConfigToRestore)" Condition="%(BuildPlatform.Identity) != AnyCPU">

          <NuGetRestore Include="@(ConfigToRestore)">

            <Platform>%(BuildPlatform.Identity)</Platform>

          </NuGetRestore>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix local build and tests for UWP #980

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Fix local build and tests for UWP #980

Are you sure you want to change the base?

Uh oh!

Fix local build and tests for UWP #980

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!