File tree Expand file tree Collapse file tree 4 files changed +16
-8
lines changed 
pipelines/common/templates Expand file tree Collapse file tree 4 files changed +16
-8
lines changed Original file line number Diff line number Diff line change 2222      #  map dependencies variables to local variables
2323      - name : alwaysRunVar 
2424        value : ${{ parameters.alwaysRun }} 
25+       - name : workloadsTestPreviousVersionsVar 
26+         value : $[ 
27+           or( 
28+             eq(variables['Build.SourceBranchName'], 'main'), 
29+             eq(variables['System.PullRequest.TargetBranch'], 'main')) 
30+           ] 
2531      - name : shouldRunOnDefaultPipelines 
2632        value : $[ 
2733          or( 
3339      isExtraPlatforms : ${{ parameters.isExtraPlatformsBuild }} 
3440      testGroup : innerloop 
3541      nameSuffix : WasmBuildTests 
36-       buildArgs : -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) 
42+       buildArgs : -s mono+libs+host+packs+libs.tests -c $(_BuildConfig) /p:ArchiveTests=true /p:TestWasmBuildTests=true /p:TestAssemblies=false /p:BrowserHost=$(_hostedOs) /p:WorkloadsTestPreviousVersions=$(workloadsTestPreviousVersionsVar)  
3743      timeoutInMinutes : 180 
3844      condition : >- 
3945        or( 
Original file line number Diff line number Diff line change 234234      <WorkloadIdForTesting  Include =" wasm-tools-net7;wasm-experimental-net7" 
235235                            ManifestName =" Microsoft.NET.Workload.Mono.ToolChain.net7" 
236236                            Variant =" net7" 
237-                             Version =" $(PackageVersionForWorkloadManifests)" 
237+                             Version =" $(PackageVersionForWorkloadManifests)" 
238+                             Condition =" '$(WorkloadsTestPreviousVersions)' == 'true'" 
238239
239240      <WorkloadIdForTesting  Include =" wasm-tools-net6" 
240241                            ManifestName =" Microsoft.NET.Workload.Mono.ToolChain.net6" 
241242                            Variant =" net6" 
242243                            Version =" $(PackageVersionForWorkloadManifests)" 
243-                             IgnoreErrors =" $(WasmIgnoreNet6WorkloadInstallErrors)" 
244+                             IgnoreErrors =" $(WasmIgnoreNet6WorkloadInstallErrors)" 
245+                             Condition =" '$(WorkloadsTestPreviousVersions)' == 'true'" 
244246
245-       <WorkloadCombinationsToInstall  Include =" latest" Variants =" latest" 
246-       <WorkloadCombinationsToInstall  Include =" net7" Variants =" net7" 
247-       <WorkloadCombinationsToInstall  Include =" net7+latest" Variants =" net7;latest" 
247+       <WorkloadCombinationsToInstall  Include =" latest"       Variants =" latest" 
248+       <WorkloadCombinationsToInstall  Include =" net7"       Variants =" net7"   Condition = " '$(WorkloadsTestPreviousVersions)' == 'true' " 
249+       <WorkloadCombinationsToInstall  Include =" net7+latest" Variants =" net7;latest" Condition = " '$(WorkloadsTestPreviousVersions)' == 'true' "   />
248250      <!-- <WorkloadCombinationsToInstall Include="net6"     Variants="net6" />--> 
249251      <!-- <WorkloadCombinationsToInstall Include="net6+7"   Variants="net6;net7" />--> 
250252      <!-- <WorkloadCombinationsToInstall Include="none" />--> 
Original file line number Diff line number Diff line change 9494    <SdkWithNoWorkloadStampPath >$(SdkWithNoWorkloadForTestingPath)version-$(SdkVersionForWorkloadTesting).stamp</SdkWithNoWorkloadStampPath >
9595    <SdkWithNoWorkload_WorkloadStampPath >$(SdkWithNoWorkloadForTestingPath)workload.stamp</SdkWithNoWorkload_WorkloadStampPath >
9696
97-     <SdkWithWorkloadForTestingPath  Condition =" '$(TargetOS)' == 'browser'" net7+ latest\</SdkWithWorkloadForTestingPath >
97+     <SdkWithWorkloadForTestingPath  Condition =" '$(TargetOS)' == 'browser'" SdkWithWorkloadForTestingPath >
9898    <SdkWithWorkloadForTestingPath  Condition =" '$(TargetOS)' == 'wasi'" SdkWithWorkloadForTestingPath >
9999    <SdkWithWorkloadForTestingPath  Condition =" '$(SdkWithWorkloadForTestingPath)' != ''" SdkWithWorkloadForTestingPath >
100100
Original file line number Diff line number Diff line change 6161
6262    <FailOnTestFailure  Condition =" '$(FailOnTestFailure)' == '' and '$(WaitForWorkItemCompletion)' != ''" FailOnTestFailure >
6363
64-     <SdkForWorkloadTestingDirName  Condition =" '$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'" net7+ latest</SdkForWorkloadTestingDirName >
64+     <SdkForWorkloadTestingDirName  Condition =" '$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' == 'true'" SdkForWorkloadTestingDirName >
6565    <SdkForWorkloadTestingDirName  Condition =" '$(SdkForWorkloadTestingDirName)' == '' and '$(NeedsWorkload)' == 'true' and '$(TestUsingWorkloads)' != 'true'" SdkForWorkloadTestingDirName >
6666  </PropertyGroup >
6767
 
 
   
 
     
   
   
          
    
    
     
    
      
     
     
    You can’t perform that action at this time.
  
 
    
  
    
      
        
     
       
      
     
   
 
    
    
  
 
  
 
     
    
0 commit comments