Skip to content

Commit

Permalink
Reapply changed from #257
Browse files Browse the repository at this point in the history
I can't explain way, but the changes from PR #257 should have been
merged into master but they aren't there. This commit to to re-apply
them.
  • Loading branch information
devblackops committed Aug 11, 2018
1 parent 972221c commit 5ae52ac
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 2 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Expand Up @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).

## [4.7.3] 2018-08-11

### Fixed

- Re-apply changes from PR #257 as they apparently were not committed correctly.

## [4.7.2] 2018-08-09

### Improvements
Expand Down
9 changes: 9 additions & 0 deletions specs/dotNet4.7.2_should_pass.ps1
@@ -0,0 +1,9 @@
Framework '4.7.2'
task default -depends MsBuild
task MsBuild {
if ( $IsMacOS -OR $IsLinux ) {}
else {
$output = &msbuild /version /nologo 2>&1
Assert ($output -NotLike '15.0') '$output should contain 15.0'
}
}
2 changes: 1 addition & 1 deletion src/private/ConfigureBuildEnvironment.ps1
Expand Up @@ -44,7 +44,7 @@ function ConfigureBuildEnvironment {
$versions = @('v4.0.30319')
$buildToolsVersions = @('15.0', '14.0')
}
{($_ -eq '4.7') -or ($_ -eq '4.7.1')} {
{($_ -eq '4.7') -or ($_ -eq '4.7.1') -or ($_ -eq '4.7.2')} {
$versions = @('v4.0.30319')
$buildToolsVersions = @('15.0')
}
Expand Down
2 changes: 1 addition & 1 deletion src/psake.psd1
@@ -1,6 +1,6 @@
@{
RootModule = 'psake.psm1'
ModuleVersion = '4.7.2'
ModuleVersion = '4.7.3'
GUID = 'cfb53216-072f-4a46-8975-ff7e6bda05a5'
Author = 'James Kovacs'
Copyright = 'Copyright (c) 2010-18 James Kovacs, Damian Hickey, Brandon Olin, and Contributors'
Expand Down

0 comments on commit 5ae52ac

Please sign in to comment.