Change from PackageTesting to BuildAllConfigurations
authorSantiago Fernandez Madero <safern@microsoft.com>
Fri, 24 Jan 2020 19:30:47 +0000 (11:30 -0800)
committerSantiago Fernandez Madero <safern@microsoft.com>
Sat, 25 Jan 2020 00:36:13 +0000 (16:36 -0800)
eng/pipelines/libraries/base-job.yml
src/libraries/sendtohelix.proj

index 7022152..a638757 100644 (file)
@@ -74,7 +74,7 @@ jobs:
 
         - ${{ if eq(parameters.framework, 'allConfigurations') }}:
           - _finalFrameworkArg: -allConfigurations
-          - _extraHelixArguments: /p:PackageTesting=true
+          - _extraHelixArguments: /p:BuildAllConfigurations=true
 
         - ${{ if eq(parameters.isOfficialAllConfigurations, true) }}:
           - _skipTestHostCopy: true
index 91fa96c..8289988 100644 (file)
     
     <!-- We need to enable xunit reporter so that it parses test results
          Package testing doesn't run on xunit. -->
-    <EnableXunitReporter Condition="'$(PackageTesting)' != 'true'">true</EnableXunitReporter>
+    <EnableXunitReporter Condition="'$(BuildAllConfigurations)' != 'true'">true</EnableXunitReporter>
     
     <TestArchiveRuntimeFile>$(TestArchiveRuntimeRoot)test-runtime-$(BuildConfiguration).zip</TestArchiveRuntimeFile>
-    <TestArchiveRuntimeFile Condition="'$(PackageTesting)' == 'true'">$(TestArchiveRuntimeRoot)packages-testPayload-$(ConfigurationGroup).zip</TestArchiveRuntimeFile>
+    <TestArchiveRuntimeFile Condition="'$(BuildAllConfigurations)' == 'true'">$(TestArchiveRuntimeRoot)packages-testPayload-$(ConfigurationGroup).zip</TestArchiveRuntimeFile>
 
     <!-- The helix runtime payload and the tests to run -->
     <HelixCorrelationPayload Condition="'$(HelixCorrelationPayload)' == ''">$(TestArchiveRuntimeFile)</HelixCorrelationPayload>
@@ -31,7 +31,7 @@
     <FailOnTestFailure Condition="'$(WaitForWorkItemCompletion)' != ''">$(WaitForWorkItemCompletion)</FailOnTestFailure>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(PackageTesting)' == 'true'">
+  <PropertyGroup Condition="'$(BuildAllConfigurations)' == 'true'">
     <!-- Use helix feature to include dotnet CLI for every workitem and add it to the path -->
     <IncludeDotNetCli>true</IncludeDotNetCli>
     <DotNetCliPackageType>sdk</DotNetCliPackageType>
     <!-- For PRs we want helixtype to be the same for all frameworks except package testing-->
     <TestScope Condition="'$(TestScope)' == ''">innerloop</TestScope>
     <HelixType>test/functional/cli/$(TestScope)/</HelixType>
-    <HelixType Condition="'$(PackageTesting)' == 'true'">test/functional/packaging/</HelixType>
+    <HelixType Condition="'$(BuildAllConfigurations)' == 'true'">test/functional/packaging/</HelixType>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(HelixCommand)' == '' and '$(PackageTesting)' == 'true'">
+  <PropertyGroup Condition="'$(HelixCommand)' == '' and '$(BuildAllConfigurations)' == 'true'">
     <HelixPreCommands>set DOTNET_CLI_TELEMETRY_OPTOUT=1;set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1;set DOTNET_MULTILEVEL_LOOKUP=0</HelixPreCommands>
 
     <HelixCommand>dotnet msbuild %HELIX_CORRELATION_PAYLOAD%\test.msbuild</HelixCommand>
@@ -80,7 +80,7 @@
   <Target Name="CompressRuntimeDirectory"
           Inputs="@(_RuntimeInputs);@(TestArchiveRuntimeDependency)"
           Outputs="$(TestArchiveRuntimeFile)"
-          Condition="'$(PackageTesting)' != 'true'">
+          Condition="'$(BuildAllConfigurations)' != 'true'">
 
     <MakeDir Directories="$(TestArchiveRuntimeRoot)" />
     <ZipDirectory SourceDirectory="$(TestHostRootPath)"
   </Target>
 
   <Target Name="PrintTargetGroup">
-    <Message Condition="'$(PackageTesting)' != 'true'" Importance="High" Text="Target Group: $(TargetGroup)" />
-    <Message Condition="'$(PackageTesting)' == 'true'" Importance="High" Text="Doing Package Testing" />
+    <Message Condition="'$(BuildAllConfigurations)' != 'true'" Importance="High" Text="Target Group: $(TargetGroup)" />
+    <Message Condition="'$(BuildAllConfigurations)' == 'true'" Importance="High" Text="Doing Package Testing" />
   </Target>
 </Project>