From bc0ed79d787c3567f7f857447b3f5a5d083789dc Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 16 Mar 2018 21:39:27 -0700 Subject: [PATCH 1/6] Update the changelog.md for 6.0.2 release --- CHANGELOG.md | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94a26d337ed..be587ea9803 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,30 @@ # Changelog +## v6.0.2 - 2018-03-15 + +### Engine updates and fixes + +- Update PowerShell to use `2.0.6` dotnet core runtime and packages (https://github.com/PowerShell/PowerShell/commit/d607f207b9726f1c8b3a115803db2c4d129127e1) + - **This change addresses the following vulnerabilities**: + - [Microsoft Security Advisory CVE-2018-0875: Hash Collision can cause Denial of Service](https://github.com/PowerShell/Announcements/issues/4) + +### Build and Packaging Improvements + +- Add Ubuntu build without AppImage (#6380) +- Add scripts to set and or update the release tag in VSTS (#6107) +- Fix DSC Configuration compilation (#6225) +- Fix errors in `Start-PSBootStrap` during release builds (#6159) +- Fix spelling failures in CI (#6191) +- Use PowerShell `windowsservercore` Docker image for release builds (#6226) +- Use `ADD` instead of `Invoke-WebRequest` in `nanoserver` Docker file (#6255) +- When doing daily/test build in a non-release branch use the branch name as the preview name (#6355) +- Add Environment Variable override of telemetry (#6063) (Thanks, @diddledan!) +- Build: Remove two unneeded lines from 'Invoke-AppveyorFinish' (#6344) +- MSI: Refactor `New-MsiPackage` into `packaging.psm1` + and various fixes to enable patching + (#5871, #6221, #6254, #6303, #6356, #6208, #6334, #6379, #6094, #6192) +- MSI: Use HKLM instead of HKCU registry keys since the current installation scope is perMachine. (#5915) (Thanks @bergmeister!) + ## v6.0.1 - 2018-01-25 ### Engine updates and fixes From 60232abb774f059fcf22f8d4fa90757fb89d23e7 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 16 Mar 2018 21:46:55 -0700 Subject: [PATCH 2/6] Some updates --- CHANGELOG.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index be587ea9803..8af2ac5b4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,20 +10,20 @@ ### Build and Packaging Improvements -- Add Ubuntu build without AppImage (#6380) -- Add scripts to set and or update the release tag in VSTS (#6107) -- Fix DSC Configuration compilation (#6225) +- Add Ubuntu build without `AppImage` (#6380) +- Add scripts to set and or update the release tag in `VSTS` (#6107) +- Fix `DSC` Configuration compilation (#6225) - Fix errors in `Start-PSBootStrap` during release builds (#6159) -- Fix spelling failures in CI (#6191) +- Fix spelling failures in `CI` (#6191) - Use PowerShell `windowsservercore` Docker image for release builds (#6226) - Use `ADD` instead of `Invoke-WebRequest` in `nanoserver` Docker file (#6255) - When doing daily/test build in a non-release branch use the branch name as the preview name (#6355) -- Add Environment Variable override of telemetry (#6063) (Thanks, @diddledan!) +- Add Environment Variable override of telemetry (#6063) (Thanks @diddledan!) - Build: Remove two unneeded lines from 'Invoke-AppveyorFinish' (#6344) - MSI: Refactor `New-MsiPackage` into `packaging.psm1` and various fixes to enable patching (#5871, #6221, #6254, #6303, #6356, #6208, #6334, #6379, #6094, #6192) -- MSI: Use HKLM instead of HKCU registry keys since the current installation scope is perMachine. (#5915) (Thanks @bergmeister!) +- MSI: Use `HKLM` instead of `HKCU` registry keys since the current installation scope is per-machine. (#5915) (Thanks @bergmeister!) ## v6.0.1 - 2018-01-25 From 4d5e83ddc28a97699db751b49b1139165669dc96 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Sat, 17 Mar 2018 09:19:18 -0700 Subject: [PATCH 3/6] Spelling fixes --- CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8af2ac5b4b9..96abc241b10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,8 @@ ### Engine updates and fixes -- Update PowerShell to use `2.0.6` dotnet core runtime and packages (https://github.com/PowerShell/PowerShell/commit/d607f207b9726f1c8b3a115803db2c4d129127e1) - - **This change addresses the following vulnerabilities**: - - [Microsoft Security Advisory CVE-2018-0875: Hash Collision can cause Denial of Service](https://github.com/PowerShell/Announcements/issues/4) +- Update PowerShell to use `2.0.6` dotnet core runtime and packages (#6403) + - This change addresses this vulnerability: [Microsoft Security Advisory `CVE-2018-0875`: Hash Collision can cause Denial of Service](https://github.com/PowerShell/Announcements/issues/4) ### Build and Packaging Improvements @@ -19,7 +18,7 @@ - Use `ADD` instead of `Invoke-WebRequest` in `nanoserver` Docker file (#6255) - When doing daily/test build in a non-release branch use the branch name as the preview name (#6355) - Add Environment Variable override of telemetry (#6063) (Thanks @diddledan!) -- Build: Remove two unneeded lines from 'Invoke-AppveyorFinish' (#6344) +- Build: Remove two unneeded lines from `Invoke-AppveyorFinish` (#6344) - MSI: Refactor `New-MsiPackage` into `packaging.psm1` and various fixes to enable patching (#5871, #6221, #6254, #6303, #6356, #6208, #6334, #6379, #6094, #6192) From 23314fcb056ec62af3f13ab6434f424e5b7031a9 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Sat, 17 Mar 2018 10:06:29 -0700 Subject: [PATCH 4/6] Minor update in internals.md --- docs/building/internals.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/building/internals.md b/docs/building/internals.md index 5779f0d2e58..13cb3875451 100644 --- a/docs/building/internals.md +++ b/docs/building/internals.md @@ -136,7 +136,7 @@ For example, the following builds the release flavor of the binary targeting arm Start-BuildNativeWindowsBinaries -Configuration Release -Arch x64_arm64 ``` -Be sure to build and test for all supported architectures: x86, x64, x64_arm, and x64_arm64. +Be sure to build and test for all supported architectures: `x86`, `x64`, `x64_arm`, and `x64_arm64`. The `x64_arm` and `x64_arm64` architectures mean that the host system needs to be x64 to cross-compile to ARM. When building for multiple architectures, be sure to use the `-clean` switch as cmake will cache the previous run and the wrong compiler will be used to generate the subsequent architectures. From 7e7663c12e6f950987b6bdc22d8ab014aac05b0b Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Sat, 17 Mar 2018 17:27:18 +0000 Subject: [PATCH 5/6] Update .spelling --- .spelling | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.spelling b/.spelling index 5dcaae610e3..77cc97a19fd 100644 --- a/.spelling +++ b/.spelling @@ -388,6 +388,8 @@ XPath Youtube stuntguy3000 SwarfegaGit +v6.0.2 +diddledan #endregion #region CODE_OF_CONDUCT.md Overrides From 93b14d2cd8c2fb9bf05aceedc495be9a2bfd3999 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Sat, 17 Mar 2018 21:09:26 -0700 Subject: [PATCH 6/6] Fix a markdown formatting error --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96abc241b10..0be3042a8b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### Engine updates and fixes - Update PowerShell to use `2.0.6` dotnet core runtime and packages (#6403) - - This change addresses this vulnerability: [Microsoft Security Advisory `CVE-2018-0875`: Hash Collision can cause Denial of Service](https://github.com/PowerShell/Announcements/issues/4) + - This change addresses this vulnerability: [Microsoft Security Advisory `CVE-2018-0875`: Hash Collision can cause Denial of Service](https://github.com/PowerShell/Announcements/issues/4) ### Build and Packaging Improvements