diff --git a/Directory.Packages.props b/Directory.Packages.props
index 99fd7dfe23..01586ede25 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,7 +12,7 @@
false
- 9.5.1
+ 13.1.0
17.11.48
3.11.0
4.10.0
@@ -23,7 +23,7 @@
6.2.14
18.0.1
- 1.56.0
+ 1.58.0
18.1.1
1.5.0-preview.24577.4
4.5.4
diff --git a/azure-pipelines-codeql.yml b/azure-pipelines-codeql.yml
index 19e1e27093..97e510acfc 100644
--- a/azure-pipelines-codeql.yml
+++ b/azure-pipelines-codeql.yml
@@ -6,7 +6,7 @@ parameters:
default: true
variables:
-- template: /eng/common/templates/variables/pool-providers.yml
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
# CG is handled in the primary CI pipeline
- name: skipComponentGovernanceDetection
value: true
@@ -35,7 +35,7 @@ schedules:
branches:
include:
- main
- - rel/4.0
+ - rel/4.1
always: true
jobs:
@@ -43,7 +43,7 @@ jobs:
displayName: CodeQL
pool:
name: $(DncEngInternalBuildPool)
- demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
+ demands: ImageOverride -equals windows.vs2026preview.scout.amd64
timeoutInMinutes: 90
steps:
diff --git a/azure-pipelines-official.yml b/azure-pipelines-official.yml
index a53f701568..79a0f6f79f 100644
--- a/azure-pipelines-official.yml
+++ b/azure-pipelines-official.yml
@@ -107,9 +107,7 @@ extends:
enableTelemetry: true
jobs:
- job: Windows
- # Allow build, test, publishing, etc to take 90 minutes, plus allow for 2 hours of manual validation.
- # We will only publish to test-tools feed if manual validation passes and is manually approved.
- timeoutInMinutes: 210
+ timeoutInMinutes: 90
pool:
name: $(DncEngInternalBuildPool)
image: windows.vs2026preview.scout.amd64
@@ -197,27 +195,20 @@ extends:
ArtifactName: TestResults_Windows_Attempt$(System.JobAttempt)
condition: always()
- # Manual validation is only needed for RTM.
- # This allows us to keep re-building the same RTM version until it passes manual validation, then we publish it to test-tools, where we have only one chance at publishing the final (RTM) package.
- - ${{ if ne(parameters.isRTM, False) }}:
- - task: ManualValidation@0
- displayName: 'Wait for manual validation before publishing to test-tools feed'
- timeoutInMinutes: 120
- inputs:
- notifyUsers: ''
- instructions: 'Please validate the build configuration and resume'
- onTimeout: 'reject'
-
- task: NuGetAuthenticate@1
displayName: 'NuGet Authenticate to test-tools feed'
- - task: 1ES.PublishNuget@1
- displayName: 'Publish NuGet packages to test-tools feed'
- inputs:
- # Do not push symbol packages nor Microsoft.Testing.Platform package
- packageParentPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
- packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/**/*.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/**/*.symbols.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/Microsoft.Testing.Platform.*.nupkg'
- publishVstsFeed: 'public/test-tools'
+ # Final builds should not go into test-tools package feed, so we can keep re-building them until we are ready to ship to nuget.org.
+ # This has to depend on the parameter and not on variable, variables are not defined early enough to be used in templating condition.
+ # We still need the final builds on test-tools so that internal repos can consume it, so we will publish it manually.
+ - ${{ if eq(parameters.isRTM, False) }}:
+ - task: 1ES.PublishNuget@1
+ displayName: 'Publish NuGet packages to test-tools feed'
+ inputs:
+ # Do not push symbol packages nor Microsoft.Testing.Platform package
+ packageParentPath: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)'
+ packagesToPush: '$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/**/*.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/**/*.symbols.nupkg;!$(Build.SourcesDirectory)/artifacts/packages/$(_BuildConfig)/NonShipping/Microsoft.Testing.Platform.*.nupkg'
+ publishVstsFeed: 'public/test-tools'
- job: Linux
timeoutInMinutes: 90
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 72852b4cc8..d931bcea01 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -17,13 +17,13 @@
https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage
d3d17aac8329f24259c83d33e8f1bd8d1371e108
-
+
https://github.com/microsoft/testfx
- 25cc8f2b28eac830a37d1c666f05fa5b95d07b76
+ 263532d95929e372f9d2e3688cbaa4ac7288d9df
-
+
https://github.com/microsoft/testfx
- 25cc8f2b28eac830a37d1c666f05fa5b95d07b76
+ 263532d95929e372f9d2e3688cbaa4ac7288d9df
diff --git a/eng/Versions.props b/eng/Versions.props
index 896cdcae87..dccc83f846 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
11.0.0-beta.26080.3
18.4.0-preview.26077.3
- 4.1.0-preview.26078.2
- 2.1.0-preview.26078.2
+ 4.1.0-preview.26102.3
+ 2.1.0-preview.26102.3