Merge branch 'main' into marcpopMSFT-testtemplates

.vsts-ci.yml

@@ -46,7 +46,7 @@ stages:
 - stage: build
   jobs:
   - job: Publish_Build_Configuration
-    pool:      
+    pool:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: NetCore1ESPool-Public
         demands: ImageOverride -equals build.windows.10.amd64.vs2019.open
@@ -378,8 +378,6 @@ stages:
           - Source_Build_Managed
           - Source_Build_Create_Tarball
         publishUsingPipelines: true
-        pool:
-          vmImage: vs2017-win2016
 
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: eng\common\templates\post-build\post-build.yml

eng/Versions.props

@@ -11,7 +11,7 @@
     <VersionFeature>00</VersionFeature>
     <VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature)</VersionPrefix>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
-    <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
+    <PreReleaseVersionIteration>2</PreReleaseVersionIteration>
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
     <!-- Enable to remove prerelease label. -->