From 41d859889efe03036aaa2ee93f532cfce38a53d4 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Wed, 30 Aug 2023 10:20:02 -0700 Subject: [PATCH 1/6] Upgrade MSBuildLocator to version 1.6.1 This includes several fixes around resolving hostfxr. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From cdb9db227d816193ed0d4b2bbf534f16ca6a5d0f Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 11 Sep 2023 11:12:13 -0500 Subject: [PATCH 2/6] Update source-build-externals dependency --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 704d8993e5e1325dd94239dd13d3112cf9a07f12 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 11 Sep 2023 10:02:20 -0700 Subject: [PATCH 3/6] Update integration test shas. --- azure-pipelines-integration.yml | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index 7d6d96b494..3bd6fab929 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: "6f668d8666c730291f7b71c5380c89427e4130ee" efcore: _repo: "https://github.com/dotnet/efcore" _repoName: "dotnet/efcore" _targetSolution: "All.sln" _branchName: "main" - _sha: "929cab1e250e50751551d628c4d7208de1155af6" + _sha: "ecfc1ced12714a972f538a071d23cdf34aafbb2e" 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' From 015c6c0a374f7917813a062b6e4a2f8fe40456f8 Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 11 Sep 2023 15:34:16 -0700 Subject: [PATCH 4/6] Update integration test repo shas. --- azure-pipelines-integration.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines-integration.yml b/azure-pipelines-integration.yml index 3bd6fab929..52288b0a15 100644 --- a/azure-pipelines-integration.yml +++ b/azure-pipelines-integration.yml @@ -53,13 +53,13 @@ jobs: _repoName: "dotnet/aspnetcore" _targetSolution: "AspNetCore.sln" _branchName: "main" - _sha: "6f668d8666c730291f7b71c5380c89427e4130ee" + _sha: "94f1088552518b7b0f5695c12194b7081d98d191" efcore: _repo: "https://github.com/dotnet/efcore" _repoName: "dotnet/efcore" _targetSolution: "All.sln" _branchName: "main" - _sha: "ecfc1ced12714a972f538a071d23cdf34aafbb2e" + _sha: "0ee3ac8de9349f7f9571ed1e50dbb65f9fee3734" razor-tooling: _repo: "https://github.com/dotnet/razor" _repoName: "dotnet/razor" From 08fa79d3ad35172e25f400de331f137dfc79d4cf Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 11 Sep 2023 17:01:11 -0700 Subject: [PATCH 5/6] Use the test repos .dotnet instance --- eng/format-verifier.ps1 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/format-verifier.ps1 b/eng/format-verifier.ps1 index 04d1d54dfd..55cfc47425 100644 --- a/eng/format-verifier.ps1 +++ b/eng/format-verifier.ps1 @@ -14,8 +14,6 @@ if ($stage -eq "prepare") { } $currentLocation = Get-Location -$dotnetPath = Join-Path $currentLocation ".dotnet" -$parentDotNetPath = Join-Path $dotnetPath "dotnet.exe" if (!(Test-Path $testPath)) { New-Item -ItemType Directory -Force -Path $testPath | Out-Null @@ -51,6 +49,11 @@ try { .\eng\common\Build.ps1 -restore } + $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$' } From 02779ee8781a50c39ed37e306751482defaaa17d Mon Sep 17 00:00:00 2001 From: Joey Robichaud Date: Mon, 11 Sep 2023 17:21:56 -0700 Subject: [PATCH 6/6] Check for a local .dotnet folder --- eng/format-verifier.ps1 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/format-verifier.ps1 b/eng/format-verifier.ps1 index 55cfc47425..a86d303cbf 100644 --- a/eng/format-verifier.ps1 +++ b/eng/format-verifier.ps1 @@ -14,6 +14,8 @@ if ($stage -eq "prepare") { } $currentLocation = Get-Location +$dotnetPath = Join-Path $currentLocation ".dotnet" +$parentDotNetPath = Join-Path $dotnetPath "dotnet.exe" if (!(Test-Path $testPath)) { New-Item -ItemType Directory -Force -Path $testPath | Out-Null @@ -49,8 +51,11 @@ try { .\eng\common\Build.ps1 -restore } - $dotnetPath = Join-Path $repoPath ".dotnet" - $parentDotNetPath = Join-Path $dotnetPath "dotnet.exe" + # 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