Remove build output modifying behavioral overrides from the command-line. (#938)

Remove property overrides for build output directory structure behavior. The only always guaranteed safe properties available to override on the command-line are Configuration and Platform. This is due to the fact that there is no way to set other properties in the VS IDE solution (at least to the best of my knowledge).
2021-06-28 17:54:05 -07:00 · 2021-06-28 17:54:05 -07:00 · 6404a51fd3
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -4,20 +4,16 @@
     Adding Sdk="Microsoft.NET.Sdk" to a project causes NuGet files to be generated very early on, so we need these defines to be here
     to ensure that all of our build output files end up in the same location.  This is parsed too late when put in mux.controls.props. -->
 <Project InitialTargets="DirectoryBuildPropsInfo" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup Condition="$(BuildingWithBuildExe) != 'true'">
+
+  <!-- Due to import ordering inconsistencies between different project types, we import this file from multiple places. -->
+  <Import Project="$(MSBuildThisFileDirectory)build\EnsureOutputLayout.props" Condition="$(EnsureOutputLayoutPropsIncluded) == ''" />
+
+  <PropertyGroup>    
    <IsTDPConfiguration>false</IsTDPConfiguration>

-    <BaseOutputPath>$(MSBuildThisFileDirectory)BuildOutput\$(Configuration)</BaseOutputPath>
-    <OutDir>$(BaseOutputPath)\$(Platform)\</OutDir>
-
-    <!-- For native projects that use Win32 to mean x86, override the OutDir
-         property to provide consistency between projects. -->
-    <OutDir Condition="'$(Platform)' == 'Win32'">$(BaseOutputPath)\x86\</OutDir>
-
-    <OutputPath>$(OutDir)\$(MSBuildProjectName)\</OutputPath>
-
    <GeneratedFilesDir>$(BaseIntermediateOutputPath)Generated Files\</GeneratedFilesDir>
    <GenerateProjectSpecificOutputFolder>True</GenerateProjectSpecificOutputFolder>
+    <ForceImportAfterCppTargets>$(BuildRoot)AfterCpp.targets</ForceImportAfterCppTargets>
  </PropertyGroup>

  <!-- Compilation differs for the build pipeline vs local development -->
@ -25,8 +21,9 @@
    <!-- If not set, default it to no . -->
    <ProjectReunionBuildPipeline>0</ProjectReunionBuildPipeline>
  </PropertyGroup>
-  <Target Name="DirectoryBuildPropsInfo" Condition="$(ProjectReunionBuildPipeline) == '1'">
-    <Message Importance="High" Text="Directory.Build.props detects ProjectReunionBuildPipeline=$(ProjectReunionBuildPipeline)"/>
+
+  <Target Name="DirectoryBuildPropsInfo">
+    <Message Condition="$(ProjectReunionBuildPipeline) == '1'" Importance="High" Text="Directory.Build.props detects ProjectReunionBuildPipeline=$(ProjectReunionBuildPipeline)"/>
  </Target>

  <!-- Conditional behavior for build pipeline vs local development -->
@ -44,5 +41,4 @@
      <AdditionalIncludeDirectories>$(SolutionDir)\build\override;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </Midl>
  </ItemDefinitionGroup>
-
 </Project>
--- a/ProjectReunion.props
+++ b/ProjectReunion.props
@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="SdkVersion.props" />
-  <Target Name="ProjectReunionPropsInfoTask">
-    <Message Text="Including $(MSBuildThisFileDirectory)projectreunion.props"/>
-  </Target>
-
-  <!-- Compilation differs for the build pipeline vs local development -->
-  <PropertyGroup Condition="$(ProjectReunionBuildPipeline) != '1'">
-    <!-- If not set, default it to no . -->
-    <ProjectReunionBuildPipeline>0</ProjectReunionBuildPipeline>
-  </PropertyGroup>
-  <Target Name="DirectoryBuildPropsInfo">
-    <Message Importance="High" Text="ProjectReunion.props detects ProjectReunionBuildPipeline=$(ProjectReunionBuildPipeline)"/>
-  </Target>
-
-  <!-- Conditional behavior for build pipeline vs local development -->
-  <ItemDefinitionGroup Condition="$(ProjectReunionBuildPipeline) == '1'">
-    <ClCompile>
-      <PreprocessorDefinitions>PROJECTREUNION_BUILD_PIPELINE=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\build\override;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>PROJECTREUNION_BUILD_PIPELINE=1;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\build\override;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Midl>
-      <PreprocessorDefinitions>PROJECTREUNION_BUILD_PIPELINE=1;%(PreprocessorDefinitions);</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>$(SolutionDir)\build\override;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </Midl>
-  </ItemDefinitionGroup>
-
-  <!-- BaseOutputPath is defined in Directory.Build.props, but that file isn't loaded on lab machines
-       since they have their own directory structure they want to adhere to.  The lab environment variable
-       XES_OUTDIR maps onto the OutDir variable, which is one level above what we want BaseOutputPath to be,
-       so we'll provide a definition for this here based on the value of XES_OUTDIR.
-       The OutDir variable isn't defined automatically in the lab for WPF projects, so we'll provide
-       an explicit definition here as well. -->
-  <PropertyGroup Condition="'$(XES_OUTDIR)' != ''">
-    <BaseOutputPath>$(XES_OUTDIR)\..\</BaseOutputPath>
-    <OutDir>$(XES_OUTDIR)\</OutDir>
-  </PropertyGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)local.props" Condition="Exists('$(MSBuildThisFileDirectory)local.props')"/>
-
-  <PropertyGroup>
-    <CSLangVersion>7</CSLangVersion>
-
-    <!-- Surface as errors the warnings that a ProjectReunion file is using a type defined in a later version of ProjectReunion than the min version for which we're compiling. -->
-    <MSBuildWarningsAsErrors>WMC0151;XLS1105</MSBuildWarningsAsErrors>
-  </PropertyGroup>
-</Project>
--- a/build/AfterCpp.targets
+++ b/build/AfterCpp.targets
@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- <PostBuildDependsOn>$(PostBuildDependsOn);VerboseOutputLayoutInfo</PostBuildDependsOn> -->
+  </PropertyGroup>
+
+  <!-- Display the entire build output directory structure. -->
+  <Target Name="VerboseOutputLayoutInfo">
+    <ItemGroup>
+      <FilesInOutput Include="$(BaseOutputPath)\**\*" />
+    </ItemGroup>
+    <Message Importance="High" Text="BuildOutput: @(FilesInOutput->'%(fullpath)')" Condition="'%(Identity)' != ''" />
+  </Target>
+
+  <!-- Global project level post build event target.  This runs after every project in the solution. It's currently set to just
+       chain targets together. -->
+  <Target Name="PostBuildEvent" DependsOnTargets="$(PostBuildDependsOn)" />
+</Project>
--- a/build/AzurePipelinesTemplates/ProjectReunion-BuildDevProject-Steps.yml
+++ b/build/AzurePipelinesTemplates/ProjectReunion-BuildDevProject-Steps.yml
@ -3,6 +3,5 @@ steps:
    parameters:
      solutionPath: ProjectReunion.sln
      nugetConfigPath: nuget.config
-      appxPackageDir: $(appxPackageDir)
      buildOutputDir: $(buildOutputDir)
      publishDir: $(publishDir)
--- a/build/AzurePipelinesTemplates/ProjectReunion-BuildProject-Steps.yml
+++ b/build/AzurePipelinesTemplates/ProjectReunion-BuildProject-Steps.yml
@ -2,7 +2,6 @@ parameters:
  solutionPath: ''
  nugetConfigPath: ''
  buildOutputDir: '$(Build.SourcesDirectory)\BuildOutput'
-  appxPackageDir: '$(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages'
  artifactName: 'drop'

 steps:
@ -11,7 +10,6 @@ steps:
  - script: |
      echo parameters.solutionPath = '${{ parameters.solutionPath }}'
      echo parameters.nugetConfigPath = '${{ parameters.nugetConfigPath }}'
-      echo parameters.appxPackageDir = '${{ parameters.appxPackageDir }}'
      echo parameters.buildOutputDir = '${{ parameters.buildOutputDir }}'
    displayName: 'BuildProject: Display parameters'

@ -79,7 +77,7 @@ steps:
      vsVersion: 16.0
      platform: '$(buildPlatform)'
      configuration: '$(buildConfiguration)'
-      msbuildArgs: '/p:AppxPackageDir="${{ parameters.appxPackageDir }}" /p:AppxBundle=Never /p:AppxSymbolPackageEnabled=false /binaryLogger:$(Build.SourcesDirectory)/${{ parameters.solutionPath }}.$(buildPlatform).$(buildConfiguration).binlog /p:ProjectReunionVersionBuild=$(builddate_yymm) /p:ProjectReunionVersionRevision=$(builddate_dd)$(buildrevision) /p:VCToolsInstallDir="$(VCToolsInstallDir)\" /p:PGOBuildMode=$(PGOBuildMode) /p:ProjectReunionBuildPipeline=1'
+      msbuildArgs: '/p:AppxSymbolPackageEnabled=false /binaryLogger:$(Build.SourcesDirectory)/${{ parameters.solutionPath }}.$(buildPlatform).$(buildConfiguration).binlog /p:ProjectReunionVersionBuild=$(builddate_yymm) /p:ProjectReunionVersionRevision=$(builddate_dd)$(buildrevision) /p:VCToolsInstallDir="$(VCToolsInstallDir)\" /p:PGOBuildMode=$(PGOBuildMode) /p:ProjectReunionBuildPipeline=1'

  - task: CmdLine@2
    displayName: 'Install Test Certificate'
--- a/build/EnsureOutputLayout.props
+++ b/build/EnsureOutputLayout.props
@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!-- Due to import ordering inconsistencies between different project types, we import this file
+         from multiple places.  We use this property to denote that it has been imported, to avoid
+         multiple import warnings. -->
+    <EnsureOutputLayoutPropsIncluded>true</EnsureOutputLayoutPropsIncluded>
+
+    <!-- The root of the repo. -->
+    <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..'))</RepoRoot>
+    <BuildRoot>$(RepoRoot)\build\</BuildRoot>
+
+    <!-- This is normally defined in Platform.Default.props for each platform, but we need it early in order to ensure
+         our output directories are formatted consistently. -->
+    <PlatformTarget>$(Platform)</PlatformTarget>
+    <PlatformTarget Condition="$(Platform) == 'Win32'">x86</PlatformTarget>
+
+    <!-- Use PlatformTarget instead of Platform to keep things more consistent (avoid 'Win32' as a build output) -->
+    <BaseOutputPath>$(RepoRoot)\BuildOutput\$(Configuration)\$(PlatformTarget)\</BaseOutputPath>
+
+    <!-- This is later fixed up to contain the project name, but if we specify it here then it ends up being included twice. -->
+    <OutDir>$(BaseOutputPath)</OutDir>
+    <OutputPath>$(OutDir)\$(MSBuildProjectName)\</OutputPath>
+    <TargetDir>$(OutDir)</TargetDir>
+
+    <!-- Due to import order complexities and differences between the targets for individual build types,
+         this must be here instead of Directory.Build.props.  For a one other scenario it must be set a 
+         second time in the 'BeforeCommon' targets. -->
+    <AppxPackageDir>$(BaseOutputPath)AppxPackages</AppxPackageDir>
+    <AppxBundle>Never</AppxBundle>
+  </PropertyGroup>
+</Project>
--- a/build/ProjectReunion-BuildFoundation.yml
+++ b/build/ProjectReunion-BuildFoundation.yml
@ -66,7 +66,6 @@ jobs:
        normalizedConfiguration: 'fre'

  variables:
-    appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages
    buildOutputDir : $(Build.SourcesDirectory)\BuildOutput
    publishDir : $(Build.ArtifactStagingDirectory)
  steps:
--- a/build/ProjectReunion-CI.yml
+++ b/build/ProjectReunion-CI.yml
@ -55,7 +55,6 @@ jobs:
        buildConfiguration: 'Release'

  variables:
-    appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages
    buildOutputDir : $(Build.SourcesDirectory)\BuildOutput
    publishDir : $(Build.ArtifactStagingDirectory)
  steps:
--- a/build/ProjectReunion-SimpleBuildAndTest.yml
+++ b/build/ProjectReunion-SimpleBuildAndTest.yml
@ -14,7 +14,6 @@ jobs:
    vmImage: 'windows-2019'
  timeoutInMinutes: 120
  variables:
-    appxPackageDir : $(build.artifactStagingDirectory)\$(buildConfiguration)\$(buildPlatform)\AppxPackages
    buildOutputDir : $(Build.SourcesDirectory)\BuildOutput
    publishDir : $(Build.ArtifactStagingDirectory)
  steps:
--- a/build/publish-mrt.yml
+++ b/build/publish-mrt.yml
@ -205,7 +205,7 @@ steps:
 #      '$(Build.SourcesDirectory)\tools\TestApps\winui_desktop_packaged_app\winui_desktop_packaged_app.sln'
 #      '$(Build.SourcesDirectory)\tools\TestApps\winui_desktop_packaged_app\winui_desktop_packaged_app_cpp.sln'
 #    configuration: '$(buildConfiguration)'
-#    msbuildArgs: '/p:AppxBundlePlatforms="x86" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload'
+#    msbuildArgs: '/p:AppxBundlePlatforms="x86" /p:UapAppxPackageBuildMode=StoreUpload'

 #- task: VSBuild@1
 #  displayName: 'build x64'
@ -215,5 +215,5 @@ steps:
 #      '$(Build.SourcesDirectory)\tools\TestApps\winui_desktop_packaged_app\winui_desktop_packaged_app.sln'
 #      '$(Build.SourcesDirectory)\tools\TestApps\winui_desktop_packaged_app\winui_desktop_packaged_app_cpp.sln'
 #    configuration: '$(buildConfiguration)'
-#    msbuildArgs: '/p:AppxBundlePlatforms="x64" /p:AppxPackageDir="$(appxPackageDir)" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload'
+#    msbuildArgs: '/p:AppxBundlePlatforms="x64" /p:UapAppxPackageBuildMode=StoreUpload'

--- a/dev/DynamicDependency/DynamicDependency.vcxitems
+++ b/dev/DynamicDependency/DynamicDependency.vcxitems
@ -7,7 +7,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\..\DynamicDependency.DataStore.ProxyStub</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory);$(OutDir)\DynamicDependency.DataStore.ProxyStub</AdditionalIncludeDirectories>
    </ClCompile>
  </ItemDefinitionGroup>
  <ItemGroup>
--- a/dev/MRTCore/mrt/Core/unittests/UnitTest.vcxproj
+++ b/dev/MRTCore/mrt/Core/unittests/UnitTest.vcxproj
@ -136,12 +136,6 @@
      <SubSystem>Windows</SubSystem>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
    <ClCompile>
@ -157,12 +151,6 @@
      <SubSystem>Windows</SubSystem>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -178,12 +166,6 @@
      <SubSystem>Windows</SubSystem>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    <ClCompile>
@ -199,12 +181,6 @@
      <SubSystem>Windows</SubSystem>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
@ -224,12 +200,6 @@
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
    <ClCompile>
@ -249,12 +219,6 @@
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
    <ClCompile>
@ -274,12 +238,6 @@
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
    <ClCompile>
@ -299,15 +257,11 @@
      <OptimizeReferences>true</OptimizeReferences>
      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
-    <PostBuildEvent>
-      <Command>
-        copy $(TargetDir)..\MRM\mrm.dll $(TargetDir)
-        copy $(TargetDir)..\MRM\mrm.pdb $(TargetDir)
-      </Command>
-    </PostBuildEvent>
  </ItemDefinitionGroup>
  <ItemGroup>
    <ClCompile Include="MrmTests.cpp" />
+    <CopyFileToFolders Include="$(BaseOutputPath)MRM\mrm.dll" DestinationFolders="$(TargetDir)" TreatOutputAsContent="true" />
+    <CopyFileToFolders Include="$(BaseOutputPath)MRM\mrm.pdb" DestinationFolders="$(TargetDir)" TreatOutputAsContent="true" />
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\src\MRM.vcxproj">
--- a/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/UnpackagedTests/UnpackagedTests.csproj
+++ b/dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/UnpackagedTests/UnpackagedTests.csproj
@ -83,7 +83,7 @@
  </Target>
  <!-- The powershell command below updates the TestAdaptersPaths path in the runsettings file, in order to allow the test to run in VS Test Explorer. -->
  <PropertyGroup>
-    <PostBuildEvent>copy /Y "$(OutputPath)..\Microsoft.Windows.ApplicationModel.Resources\Microsoft.Internal.FrameworkUdk.dll"  "$(OutputPath)Microsoft.Internal.FrameworkUdk.dll"
+    <PostBuildEvent>copy /Y "$(OutputPath)\Microsoft.Windows.ApplicationModel.Resources\Microsoft.Internal.FrameworkUdk.dll"  "$(OutputPath)Microsoft.Internal.FrameworkUdk.dll"
    powershell -command "$file = gi $(OutputPath)UnpackagedTests.runsettings; $x = [xml](gc $file); $x.RunSettings.RunConfiguration.TestAdaptersPaths = '$(OutputPath)'; $x.Save($file.Fullname)"
    </PostBuildEvent>
  </PropertyGroup>
--- a/environment.props
+++ b/environment.props
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project InitialTargets="ErrorIfIncluded" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Condition="$(ProjectReunionFinalRelease) != 'true'">
    <!-- If ProjectReunionPrelease is unset, default it to false. -->
    <ProjectReunionFinalRelease>false</ProjectReunionFinalRelease>
--- a/test/AppLifecycle/AppLifecycle.vcxproj
+++ b/test/AppLifecycle/AppLifecycle.vcxproj
@ -259,9 +259,7 @@
    <TestPkgDebugConfigName Condition="'$(Configuration)' == 'Debug'">_Debug</TestPkgDebugConfigName>

    <TestPkgOutputPath>$(AppxPackageDir)\AppLifecycleTestPackage_1.0.0.0_$(PlatformTarget)$(TestPkgDebugConfigName)_Test</TestPkgOutputPath>
-    <TestPkgOutputPath Condition="!Exists('$(TestPkgOutputPath)')">$(OutDir)\AppLifecycleTestPackage\AppPackages\AppLifecycleTestPackage_1.0.0.0$(TestPkgDebugConfigName)_Test</TestPkgOutputPath>
    <TestPkgOutputFile>$(TestPkgOutputPath)\AppLifecycleTestPackage_1.0.0.0_$(PlatformTarget)$(TestPkgDebugConfigName).msix</TestPkgOutputFile>
-    <TestPkgOutputFile Condition="!Exists('$(TestPkgOutputFile)')">$(TestPkgOutputPath)\AppLifecycleTestPackage_1.0.0.0_$(PlatformTarget)$(TestPkgDebugConfigName).msixbundle</TestPkgOutputFile>
  </PropertyGroup>
  <ItemGroup>
    <CopyFileToFolders Include="$(TargetDir)..\AppLifecycleTestApp\AppLifecycleTestApp.exe" DestinationFolders="$(TargetDir)" TreatOutputAsContent="true" />
--- a/test/PushNotificationTests/PushNotificationTests.vcxproj
+++ b/test/PushNotificationTests/PushNotificationTests.vcxproj
@ -260,9 +260,7 @@
    <VCLibsDebugConfigName Condition="'$(Configuration)' == 'Debug'">.Debug</VCLibsDebugConfigName>
    <TestPkgDebugConfigName Condition="'$(Configuration)' == 'Debug'">_Debug</TestPkgDebugConfigName>
    <TestPkgOutputPath>$(AppxPackageDir)\PushNotificationsTestAppPackage_1.0.0.0_$(PlatformTarget)$(TestPkgDebugConfigName)_Test</TestPkgOutputPath>
-    <TestPkgOutputPath Condition="!Exists('$(TestPkgOutputPath)')">$(OutDir)\PushNotificationsTestAppPackage\AppPackages\PushNotificationsTestAppPackage_1.0.0.0$(TestPkgDebugConfigName)_Test</TestPkgOutputPath>
    <TestPkgOutputFile>$(TestPkgOutputPath)\PushNotificationsTestAppPackage_1.0.0.0_$(PlatformTarget)$(TestPkgDebugConfigName).msix</TestPkgOutputFile>
-    <TestPkgOutputFile Condition="!Exists('$(TestPkgOutputFile)')">$(TestPkgOutputPath)\PushNotificationsTestAppPackage_1.0.0.0_$(PlatformTarget)$(TestPkgDebugConfigName).msixbundle</TestPkgOutputFile>
  </PropertyGroup>
  <ItemGroup>
    <CopyFileToFolders Include="$(TestPkgOutputFile)" DestinationFolders="$(TargetDir)" DestinationFileName="PushNotificationsTestAppPackage.msix" TreatOutputAsContent="true" />
--- a/test/TestApps/AppLifecycleTestPackage/AppLifecycleTestPackage.wapproj
+++ b/test/TestApps/AppLifecycleTestPackage/AppLifecycleTestPackage.wapproj
@ -65,36 +65,6 @@
    <AppxBundlePlatforms>$(Platform)</AppxBundlePlatforms>
    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
  <ItemGroup>
    <AppxManifest Include="Package.appxmanifest">
      <SubType>Designer</SubType>
--- a/test/TestApps/PushNotificationsTestAppPackage/PushNotificationsTestAppPackage.wapproj
+++ b/test/TestApps/PushNotificationsTestAppPackage/PushNotificationsTestAppPackage.wapproj
@ -49,24 +49,6 @@
    <AppxBundlePlatforms>$(Platform)</AppxBundlePlatforms>
    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
-  </PropertyGroup>
  <ItemGroup>
    <AppxManifest Include="Package.appxmanifest">
      <SubType>Designer</SubType>