Skip to content

Commit

Permalink
Merge branch 'hotfix/5.2.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
matkoch committed Aug 3, 2021
2 parents 1adbb7b + 6f83b87 commit c749bba
Show file tree
Hide file tree
Showing 34 changed files with 15,889 additions and 85 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,20 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

## [vNext]
- Fixed invocations for PowerShell bootstrapping script
- Fixed retrieval of `version_dotnet_sdk` in telemetry
- Fixed solution serialization to show information about duplicated entries
- Fixed path construction to be lazy for in-memory solutions that get saved
- Fixed missing LFS and Submodule settings in AzurePipelines configuration
- Fixed `GitHubTasks.GetGitHubBrowseUrl` to trim trailing slash
- Fixed `GitVersionAttribute.Framework` default value to `net5.0`
- Fixed URLs in `ChangeLogTasks`
- Fixed default value emission for `DotCoverTasks`
- Fixed missing properties for `GitVersionTasks`
- Fixed missing secret attributes in `SonarScannerTasks`
- Fixed missing `OctoVersionTasks` and `OctoVersionAttribute`
- Fixed missing `ChocolateyTasks`
- Fixed enumeration for `NerdbankGitVersioning`

## [5.2.1] / 2021-06-18
- Fixed telemetry
Expand Down
4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ else {
# Install by channel or version
$DotNetDirectory = "$TempDirectory\dotnet-win"
if (!(Test-Path variable:DotNetVersion)) {
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Channel $DotNetChannel -NoPath }
} else {
ExecSafe { & $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
ExecSafe { & powershell $DotNetInstallFile -InstallDir $DotNetDirectory -Version $DotNetVersion -NoPath }
}
$env:DOTNET_EXE = "$DotNetDirectory\dotnet.exe"
}
Expand Down

0 comments on commit c749bba

Please sign in to comment.