PowerShell · TravisEz13 · Dec 5, 2017 · Dec 2, 2017 · Dec 4, 2017 · Dec 4, 2017
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -13,7 +13,7 @@
 # @TravisEz13 @PaulHigin
 
 # Area: Documentation
-# @joeyaiello @TravisEz13
+.github/    @joeyaiello @TravisEz13
 
 # Area: Test
 # @JamesWTruher @TravisEz13 @adityapatwardhan

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -129,19 +129,20 @@ Additional references:
   If the changes are related to an existing GitHub issue,
   please reference the issue in PR description (e.g. ```Fix #11```).
   See [this][closing-via-message] for more details.
-* If the change warrants a note in the [changelog](../CHANGELOG.MD)
-  either update the changelog in your pull request or
-  add a comment in the PR description saying that the change may warrant a note in the changelog.
-  New changes always go into the **Unreleased** section.
+
+#### Pull request - Change log
+
+* All PRs must update the [changelog](../CHANGELOG.MD) in your pull request.
+  New changes always go into the **Unreleased** section at the top of the changelog.
   Keeping the changelog up-to-date simplifies the release process for Maintainers.
   An example (with an associated PR #):
 
   ```markdown
-  Unreleased
-  ----------
+  ## Unreleased
 
-  * `Update-Item` now supports `-FriendlyName` (#1234).
+  * `Update-Item` now supports `-FriendlyName` (#1234, @ExampleUser).
   ```
+  Note:  Please add `**Breaking Change**` to the front of the entry in the changelog if the change is [breaking.](#making-breaking-changes)
 
 * Please use the present tense and imperative mood when describing your changes:
     * Instead of "Adding support for Windows Server 2012 R2", write "Add support for Windows Server 2012 R2".

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,8 +1,14 @@
-<!--
+## PR Checklist
 
-If you are a PowerShell Team member, please make sure you choose the Reviewer(s) and Assignee for your PR.
-If you are not from the PowerShell Team, you can leave the fields blank and the Maintainers will choose them for you. If you are familiar with the team, feel free to mention some Reviewers yourself.
+Note: Please mark anything not applicable to this PR `NA`.
+- [ ] [PR has a meaningful title](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
+    - [ ] Use the present tense and imperative mood when describing your changes
+- [ ] [Summarized changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
+- [ ] [Update the changelog](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---changelog)
+- [ ] User facing [Documentation needed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#pull-request---submission)
+    - [ ] Issue filed - Issue link:
+- [ ] [Change is not breaking](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)
+- [ ] [Make sure you've added a new test, if existing tests do not effectively test the code changed](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#before-submitting)
+    - [ ] [Add `[feature]` if the change is significant or affectes feature tests](https://github.com/PowerShell/PowerShell/blob/master/docs/testing-guidelines/testing-guidelines.md#requesting-additional-tests-for-a-pr)
 
-For more information about the roles of Reviewer and Assignee, refer to [CONTRIBUTING.md](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md).
-
--->
+## PR Summary
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+
+- Update the contribution guideline to note that updating the changelog is required. (#5586)
+
 ## v6.0.0-rc - 2017-11-16
 
 ### Breaking changes

diff --git a/build.psm1 b/build.psm1
@@ -97,19 +97,13 @@ function Get-PSCommitId
 function Get-EnvironmentInformation
 {
     $environment = @{}
-    # Use the .NET Core APIs to determine the current platform.
-    # If a runtime exception is thrown, we are on Windows PowerShell, not PowerShell Core,
-    # because System.Runtime.InteropServices.RuntimeInformation
-    # and System.Runtime.InteropServices.OSPlatform do not exist in Windows PowerShell.
-    try {
-        $Runtime = [System.Runtime.InteropServices.RuntimeInformation]
-        $OSPlatform = [System.Runtime.InteropServices.OSPlatform]
-
+    # PowerShell Core will likely not be built on pre-1709 nanoserver
+    if ($PSVersionTable.ContainsKey("PSEdition") -and "Core" -eq $PSVersionTable.PSEdition) {
         $environment += @{'IsCoreCLR' = $true}
-        $environment += @{'IsLinux' = $Runtime::IsOSPlatform($OSPlatform::Linux)}
-        $environment += @{'IsMacOS' = $Runtime::IsOSPlatform($OSPlatform::OSX)}
-        $environment += @{'IsWindows' = $Runtime::IsOSPlatform($OSPlatform::Windows)}
-    } catch {
+        $environment += @{'IsLinux' = $IsLinux}
+        $environment += @{'IsMacOS' = $IsMacOS}
+        $environment += @{'IsWindows' = $IsWindows}
+    } else {
         $environment += @{'IsCoreCLR' = $false}
         $environment += @{'IsLinux' = $false}
         $environment += @{'IsMacOS' = $false}

diff --git a/test/powershell/Installer/WindowsInstaller.Tests.ps1 b/test/powershell/Installer/WindowsInstaller.Tests.ps1
@@ -1,6 +1,7 @@
 Describe "Windows Installer" -Tags "Scenario" {
 
     BeforeAll {
+        $skipTest = -not $IsWindows
         $preRequisitesLink =  'https://aka.ms/pscore6-prereq'
         $linkCheckTestCases = @(
             @{ Name = "Universal C Runtime"; Url = $preRequisitesLink }
@@ -10,15 +11,26 @@ Describe "Windows Installer" -Tags "Scenario" {
         )
     }
 
-    It "WiX (Windows Installer XML) file contains pre-requisites link $preRequisitesLink" {
+    It "WiX (Windows Installer XML) file contains pre-requisites link $preRequisitesLink" -skip:$skipTest {
         $wixProductFile = Join-Path -Path $PSScriptRoot -ChildPath "..\..\..\assets\Product.wxs"
         (Get-Content $wixProductFile -Raw).Contains($preRequisitesLink) | Should Be $true
     }
 
-    It "Pre-Requisistes link for '<Name>' is reachable: <url>" -TestCases $linkCheckTestCases -Test {
+    ## Running 'Invoke-WebRequest' with WMF download URLs has been failing intermittently,
+    ## because sometimes the URLs lead to a 'this download is no longer available' page.
+    ## We use a retry logic here. Retry for 5 times with 1 second interval.
+    It "Pre-Requisistes link for '<Name>' is reachable: <url>" -TestCases $linkCheckTestCases -skip:$skipTest {
         param ($Url)
 
-        # Because an outdated link 'https://www.microsoft.com/download/details.aspx?id=504100000' would still return a 200 reponse (due to a redirection to an error page), it only checks that it returns something
-        (Invoke-WebRequest $Url -UseBasicParsing) | Should Not Be $null
+        foreach ($i in 1..5) {
+            try {
+                $result = Invoke-WebRequest $Url -UseBasicParsing
+                break;
+            } catch {
+                Start-Sleep -Seconds 1
+            }
+        }
+
+        $result | Should Not Be $null
     }
 }