diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml
index 7d6d96b494..52288b0a15 100644
--- a/azure-pipelines-integration.yml
+++ b/azure-pipelines-integration.yml
@@ -23,49 +23,49 @@ jobs:
_repoName: "dotnet/format"
_targetSolution: "format.sln"
_branchName: "main"
- _sha: "1ec992c6038af9d42499d3ac88c3fd65d0c2f6ed"
+ _sha: "452f6263277533da0af2b557003256d98fbecc27"
roslyn:
_repo: "https://github.com/dotnet/roslyn"
_repoName: "dotnet/roslyn"
_targetSolution: "Compilers.sln"
_branchName: "main"
- _sha: "b670821b5150bc7ddb01f415d91c17dd55c752a2"
+ _sha: "d080175cabfe297ebf079af099279b61913bcc28"
sdk:
_repo: "https://github.com/dotnet/sdk"
_repoName: "dotnet/sdk"
_targetSolution: "sdk.sln"
_branchName: "main"
- _sha: "d32c8e7d19f3fc13190ff14cd960370a5d148995"
+ _sha: "be25db95c376bffd508a023399ddd34392fe6458"
project-system:
_repo: "https://github.com/dotnet/project-system"
_repoName: "dotnet/project-system"
_targetSolution: "ProjectSystem.sln"
_branchName: "main"
- _sha: "5896b880c19071eb34c0e9966295c41d2bb44142"
- # msbuild:
- # _repo: "https://github.com/dotnet/msbuild"
- # _repoName: "dotnet/msbuild"
- # _targetSolution: "MSBuild.sln"
- # _branchName: "main"
- # _sha: "14c24b2d38abe2662bd5e3bcc88c91a13655b073"
+ _sha: "e660d54d6b3198751bd0502fe270e1657f32a913"
+ msbuild:
+ _repo: "https://github.com/dotnet/msbuild"
+ _repoName: "dotnet/msbuild"
+ _targetSolution: "MSBuild.sln"
+ _branchName: "main"
+ _sha: "3c910ba83fc9dbd8e12f50dddc8c381404f928c4"
aspnetcore:
_repo: "https://github.com/dotnet/aspnetcore"
_repoName: "dotnet/aspnetcore"
_targetSolution: "AspNetCore.sln"
_branchName: "main"
- _sha: "e832fef051ab1256d6d50fc79d1582451f908453"
+ _sha: "94f1088552518b7b0f5695c12194b7081d98d191"
efcore:
_repo: "https://github.com/dotnet/efcore"
_repoName: "dotnet/efcore"
_targetSolution: "All.sln"
_branchName: "main"
- _sha: "929cab1e250e50751551d628c4d7208de1155af6"
+ _sha: "0ee3ac8de9349f7f9571ed1e50dbb65f9fee3734"
razor-tooling:
- _repo: "https://github.com/dotnet/razor-tooling"
- _repoName: "dotnet/razor-tooling"
+ _repo: "https://github.com/dotnet/razor"
+ _repoName: "dotnet/razor"
_targetSolution: "Razor.sln"
_branchName: "main"
- _sha: "da152bfa9c519efd4e0038fbd7804af3fd27056d"
+ _sha: "a7f2e33efb28ccdf9b32f1ae45731891f9dfe755"
timeoutInMinutes: 60
steps:
- script: eng\integration-test.cmd -repo '$(_repo)' -branchName '$(_branchName)' -sha '$(_sha)' -targetSolution '$(_targetSolution)' -testPath '$(Agent.TempDirectory)\temp' -stage 'prepare'
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a6882ae063..d039602a95 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -6,9 +6,9 @@
f5b6c715a742c56b7cc672e47385508fb4df98cc
-
+
https://github.com/dotnet/source-build-externals
- 834923aef31d157aec19a2b99d5494cea29dcc9e
+ 69af50008e3396606071c024379acc563258fd29
diff --git a/eng/Versions.props b/eng/Versions.props
index fbc04cb2b5..b2b128e9dd 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -40,7 +40,7 @@
0.13.5
0.13.5
- 1.5.5
+ 1.6.1
17.4.16
diff --git a/eng/format-verifier.ps1 b/eng/format-verifier.ps1
index 04d1d54dfd..a86d303cbf 100644
--- a/eng/format-verifier.ps1
+++ b/eng/format-verifier.ps1
@@ -51,6 +51,14 @@ try {
.\eng\common\Build.ps1 -restore
}
+ # project-system doesn't use Arcade so we may not have installed a local .dotnet sdk.
+ if (Test-Path '.\.dotnet') {
+ $dotnetPath = Join-Path $repoPath ".dotnet"
+ $parentDotNetPath = Join-Path $dotnetPath "dotnet.exe"
+ }
+
+ $Env:DOTNET_ROOT = $dotnetPath
+
if ($stage -eq "prepare" -or $stage -eq "format-workspace") {
Write-Output "$(Get-Date) - Finding solutions."
$solutions = Get-ChildItem -Filter *.sln -Recurse -Depth 2 | Select-Object -ExpandProperty FullName | Where-Object { $_ -match '.sln$' }