Commit graph

7 commits

Author SHA1 Message Date
Travis Plunk 3a33be87a7 Merge branch '6.0.1' into master
# Conflicts:
#	docker/release/fedora27/Dockerfile
#	docs/installation/linux.md
#	docs/installation/macos.md
#	tools/metadata.json
2018-01-25 16:35:25 -08:00
Dongbo Wang 4b09a93676
Update docs and scripts for PowerShell 6.0.1 release (#5938) 2018-01-18 15:07:43 -08:00
Travis Plunk a08f3241a3 Merge 6.0.0 into master
# Conflicts:
#	.github/Images/GitHub-PR.png
#	assets/Product.wxs
#	docs/installation/linux.md
#	docs/installation/macos.md
#	docs/installation/windows.md
#	test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
#	tools/metadata.json
2018-01-10 17:42:41 -08:00
Dongbo Wang c4cf1440dd
Update docs and scripts for PowerShell 6.0.0 GA release (#5837) 2018-01-09 15:57:38 -08:00
Travis Plunk 7924224f77 Merge branch '6.0.0-upstream' into merge_rc2_to_master
# Conflicts:
#	README.md
#	docker/tests/container.tests.ps1
#	test/tools/WebListener/Controllers/ResponseController.cs
#	test/tools/WebListener/README.md
#	tools/appveyor.psm1
#	tools/travis.ps1
#   docs/linux.md
#   CHANGELOG.md
2017-12-14 15:29:59 -08:00
Travis Plunk e1a57e5194
Update target tag for master CI to 6.1.0-preview.1 (#5513)
* use metadata JSON to create release tag in CI
2017-11-21 13:51:10 -08:00
Dongbo Wang 5f72faab54
Change to query for metadata from our file (#5468) 2017-11-15 13:54:30 -08:00