Skip to content

Upgrade MSBuildLocator to version 1.6.1 #1948

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mmitche merged 6 commits into from
Sep 12, 2023
Merged

Upgrade MSBuildLocator to version 1.6.1 #1948

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
41d8598
Upgrade MSBuildLocator to version 1.6.1
JoeRobich Aug 30, 2023
cdb9db2
Update source-build-externals dependency
mthalman Sep 11, 2023
704d899
Update integration test shas.
JoeRobich Sep 11, 2023
015c6c0
Update integration test repo shas.
JoeRobich Sep 11, 2023
08fa79d
Use the test repos .dotnet instance
JoeRobich Sep 12, 2023
02779ee
Check for a local .dotnet folder
JoeRobich Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions azure-pipelines-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,49 +23,49 @@ jobs:
_repoName: "dotnet/format"
_targetSolution: "format.sln"
_branchName: "main"
_sha: "1ec992c6038af9d42499d3ac88c3fd65d0c2f6ed"
_sha: "452f6263277533da0af2b557003256d98fbecc27"
Copy link
Copy Markdown
Contributor

@sharwell sharwell Sep 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❔ Why update all of these?

Copy link
Copy Markdown
Member Author

@JoeRobich JoeRobich Sep 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Habit. Although I see these repos are now on some very preview sdk versions

Copy link
Copy Markdown
Contributor

@sharwell sharwell Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If updating the dependency broke formatting for the previous SHA, doesn't that mean some users could see dotnet-format break for the same change?

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'
Expand Down
4 changes: 2 additions & 2 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<Sha>f5b6c715a742c56b7cc672e47385508fb4df98cc</Sha>
<SourceBuild RepoName="roslyn" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23221.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.23461.1">
<Uri>https://github.com/dotnet/source-build-externals</Uri>
<Sha>834923aef31d157aec19a2b99d5494cea29dcc9e</Sha>
<Sha>69af50008e3396606071c024379acc563258fd29</Sha>
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23253.2">
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<!-- external -->
<BenchmarkDotNetVersion>0.13.5</BenchmarkDotNetVersion>
<BenchmarkDotNetAnnotationsVersion>0.13.5</BenchmarkDotNetAnnotationsVersion>
<MicrosoftBuildLocatorVersion>1.5.5</MicrosoftBuildLocatorVersion>
<MicrosoftBuildLocatorVersion>1.6.1</MicrosoftBuildLocatorVersion>
<MicrosoftVisualStudioCompositionVersion>17.4.16</MicrosoftVisualStudioCompositionVersion>
</PropertyGroup>
</Project>
8 changes: 8 additions & 0 deletions eng/format-verifier.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$' }
Expand Down