Skip to content

Commit

Permalink
Merge branch 'master' into stable
Browse files Browse the repository at this point in the history
* master:
  (chocolatey#2205) Remove mention of private repository
  (chocolatey#2205) Update remaining URLs to new location
  (maint) Remove unnecessary whitespace
  (chocolatey#2231) Change default repository URL
  (maint) Remove unnecessary whitespace
  (chocolatey#2205) Update all chocolatey.org/docs URLs
  (maint) Remove unnecessary whitespace
  (chocolatey#2205) Update automatic-packages docs links
  (doc) Changed cla links from clahub to cla-assistant
  (chocolateyGH-2023) Install git in the docker container
  (chocolateyGH-1859) Fix error message for missing 32-bit URL
  Add missing start of comment block
  (build) Change to start building next version of Chocolatey
  (doc) Add security.md file
  Update README.md
  (doc) .NET Framework 3.5 Feature Required for windows builds
  (doc) Fix typo
  (doc) Fix invalid url
  (doc) Fix typo and language in Contributing guidelines
  • Loading branch information
gep13 committed Apr 16, 2021
2 parents fa87453 + 1638afe commit 93b1cfc
Show file tree
Hide file tree
Showing 42 changed files with 349 additions and 347 deletions.
3 changes: 2 additions & 1 deletion .build/nugetBuild.step
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@
<property name="nuget.version" value="${nuget.version + '-' + version.nuget.prerelease}" if="${version.nuget.prerelease != ''}" />
<property name="nuget.version" value="${nuget.version + '.' + pkg.build.date}" if="${version.use.build_date and version.use_semanticversioning and version.nuget.prerelease == ''}" />
<property name="nuget.version" value="${nuget.version + '-' + pkg.build.date}" if="${version.use.build_date and version.nuget.prerelease != ''}" />
<property name="nuget.version" value="${nuget.version + '.' + version.fix}" if="${version.fix != '0'}" />
<property name="nuget.version" value="${nuget.version + '.' + version.fix}" if="${version.fix != '0' and not version.use.build_date}" />
<property name="nuget.version" value="${nuget.version + '-' + version.fix}" if="${version.fix != '0' and version.use.build_date}" />
<!-- version.use.build_date -->
<echo level="Warning" message="Using ${nuget.version} as the version for the nuget package(s)." />
</target>
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
REPORTING A SECURITY FINDING?
Stop, this is not the correct place to provide a security disclosure.
Please go to https://chocolatey.org/security for the proper disclosure process.
Please go to https://docs.chocolatey.org/en-us/information/security for the proper disclosure process.
BEFORE YOU SUBMIT AN ISSUE:
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/AskQuestion.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ about: Do you have a question?

STOP RIGHT HERE - DO NOT CREATE A TICKET FOR A QUESTION ON THIS REPOSITORY

1. Start with https://chocolatey.org/docs/troubleshooting (Troubleshooting) and https://chocolatey.org/docs/chocolatey-faqs (FAQs) to see if your question or issue already has an answer. You can also explore https://chocolatey.org/docs (which are pretty comprehensive, but not always the most searchable).
1. Start with https://docs.chocolatey.org/en-us/troubleshooting (Troubleshooting) and https://docs.chocolatey.org/en-us/faqs (FAQs) to see if your question or issue already has an answer. You can also explore https://docs.chocolatey.org/en-us/ (which are pretty comprehensive, but not always the most searchable).
2. If not found or resolved, please see https://chocolatey.org/support to see what avenues are available to you based on whether you are an open source user or a licensed customer (have a commercial edition).


Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/ReportPackageIssue.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ about: Something went wrong with an installation? Want a package to be added to

STOP RIGHT HERE - DO NOT CREATE A TICKET FOR PACKAGES ON THIS REPOSITORY

This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco. For a package failure, typically you would be reporting an issue with a package on the community package repository, which is not what this repository represents. In fact, the community repository and all of its packages represents about 5% of the packages in existence and less than half of the usage of choco itself.
This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco. For a package failure, typically you would be reporting an issue with a package on the community package repository, which is not what this repository represents. In fact, the community repository and all of its packages represents about 5% of the packages in existence and less than half of the usage of choco itself.

In other words Chocolatey != Chocolatey.org Packages.

For all things packages, you have two routes:

1. If you are having issue with a package or you want to see an enhancement, please see https://chocolatey.org/docs/package-triage-process (Package Triage Process / Becoming a maintainer of existing packages).
2. If you are looking for packages to be added to the community package repository (aka https://chocolatey.org/packages), please see https://chocolatey.org/docs/package-triage-process#package-request-package-missing (Package Requests).
1. If you are having issue with a package or you want to see an enhancement, please see https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process (Package Triage Process / Becoming a maintainer of existing packages).
2. If you are looking for packages to be added to the community package repository (aka https://community.chocolatey.org/packages), please see https://docs.chocolatey.org/en-us/community-repository/users/package-triage-process#package-request-package-missing (Package Requests).



Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/ReportWebsiteIssue.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
---
name: Website - Report Issue / Suggest Feature
about: Something weird about https://chocolatey.org or do you want to suggest a feature?
about: Something weird about https://community.chocolatey.org or do you want to suggest a feature?
---

STOP RIGHT HERE - DO NOT CREATE A TICKET FOR THE WEBSITE ON THIS REPOSITORY

This is the repository for choco.exe, the command line interface for Chocolatey, and issues/feature suggestions should be limited to only choco.

For Chocolatey Gallery aka Chocolatey Community Package Repository, you will need to head over to https://github.com/chocolatey/chocolatey.org and file a ticket there.
For Chocolatey Gallery aka Chocolatey Community Package Repository, you will need to head over to https://github.com/chocolatey/home and file a ticket there.



Expand Down
8 changes: 0 additions & 8 deletions .github/ISSUE_TEMPLATE/SecurityDisclosure.md

This file was deleted.

3 changes: 2 additions & 1 deletion .github/ISSUE_TEMPLATE/zChocoReportIssue.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name: Choco.exe - Report Issue
about: Did you find unexpected behavior?
---

<!--
Ensure you have read over Submitting Issues -
https://github.com/chocolatey/choco#submitting-issues
Expand Down Expand Up @@ -39,4 +40,4 @@ PLACE LOG CONTENT HERE - WE NEED _ALL_ DETAILED OUTPUT BASED ON THE ABOVE TO BE

</p>

</details>
</details>
6 changes: 6 additions & 0 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
# Security Policies and Procedures

Security reports should never start out in the open. Please follow up directly
with the team if you have a contact. If not you can always start with the
information at https://docs.chocolatey.org/en-us/information/security to see
instructions on how to provide the disclosure. Thank you!
28 changes: 14 additions & 14 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ We've also brought in the long desired logging with no colorization. You can set


## [0.10.8](https://github.com/chocolatey/choco/issues?q=milestone%3A0.10.8+is%3Aclosed) (August 30, 2017)
With this release, Package Parameters are fully supported from both the user side and the packaging side. Check out [the documentation](https://chocolatey.org/docs/helpers-get-packageparameters) and check out the [walkthrough](https://chocolatey.org/docs/how-to-parse-package-parameters-argument) on how to use package parameters in your packaging. Note if you are pushing packages to the community repository, you must continue to take a dependency on the `chocolatey-core.extension` as a polyfill for older versions until at least six months after a new feature is released.
With this release, Package Parameters are fully supported from both the user side and the packaging side. Check out [the documentation](https://docs.chocolatey.org/en-us/create/functions/get-packageparameters) and check out the [walkthrough](https://docs.chocolatey.org/en-us/guides/create/parse-packageparameters-argument) on how to use package parameters in your packaging. Note if you are pushing packages to the community repository, you must continue to take a dependency on the `chocolatey-core.extension` as a polyfill for older versions until at least six months after a new feature is released.

What you can do with logging has greatly increased your ability to have more power over how it works and deeper output to determine errors (we've expanded `--trace` [#1379](https://github.com/chocolatey/choco/issues/1379)). This release also gives packagers and users more power when working with the AutoUninstaller - opt-out ([#1257](https://github.com/chocolatey/choco/issues/1257)) and passing arguments to the uninstaller ([#1133](https://github.com/chocolatey/choco/issues/1133)).

Expand Down Expand Up @@ -463,7 +463,7 @@ What was planned for 0.9.10.4 is now 0.10.0. This is due partly to a breaking ch
### BREAKING CHANGES
* [Security] Checksum requirement and enhancements - see [#112](https://github.com/chocolatey/choco/issues/112)

Checksums in package scripts are meant as a measure to validate the originally intended downloaded resources used in the creation of a package are the same files that are received at a future date. This also ensures that the same files that are checked by all parts of moderation (if applicable) are the same files that are received by users for a package. This is seen mostly on the community repository because it is public and packages are subject to copyright laws (distribution rights), which typically requires the package scripts to download software from the official distribution locations. The Chocolatey framework has had the ability to use checksums in package scripts since [July 2014](https://chocolatey.org/packages/chocolatey/0.9.8.24#releasenotes).
Checksums in package scripts are meant as a measure to validate the originally intended downloaded resources used in the creation of a package are the same files that are received at a future date. This also ensures that the same files that are checked by all parts of moderation (if applicable) are the same files that are received by users for a package. This is seen mostly on the community repository because it is public and packages are subject to copyright laws (distribution rights), which typically requires the package scripts to download software from the official distribution locations. The Chocolatey framework has had the ability to use checksums in package scripts since [July 2014](https://community.chocolatey.org/packages/chocolatey/0.9.8.24#releasenotes).

**What is the requirement?** choco will now fail if a package download resources from HTTP/FTP and does not use checksums to verify those downloaded resources. The requirement for HTTP/FTP is [#112](https://github.com/chocolatey/choco/issues/112). We are considering also requiring it for [HTTPS (#895)](https://github.com/chocolatey/choco/issues/895) as well. You can optionally set a feature (`allowEmptyChecksumsSecure`) to ensure packages using HTTPS also use checksums.

Expand All @@ -474,11 +474,11 @@ Checksums in package scripts are meant as a measure to validate the originally i
**Can I shut this behavior off or opt out per package?**
You can shut off the checksum requirement by enabling the feature `allowEmptyChecksums`. This will return Chocolatey to previous behavior. We strongly recommend against it.

You can shut it off or turn it per package install/upgrade with `--allow-empty-checksums` and `--require-checksums`, respectively. See https://chocolatey.org/docs/commands-install / https://chocolatey.org/docs/commands-upgrade.
You can shut it off or turn it per package install/upgrade with `--allow-empty-checksums` and `--require-checksums`, respectively. See https://docs.chocolatey.org/en-us/choco/commands/install / https://docs.chocolatey.org/en-us/choco/commands/upgrade.

You can also disable the feature `allowEmptyChecksumsSecure` to enforce checksums for packages that download from secure locations (HTTPS).

**Other things I should know?** Users also now have the ability to pass their own checksums and checksumtypes into the install. See https://chocolatey.org/docs/commands-install / https://chocolatey.org/docs/commands-upgrade.
**Other things I should know?** Users also now have the ability to pass their own checksums and checksumtypes into the install. See https://docs.chocolatey.org/en-us/choco/commands/install / https://docs.chocolatey.org/en-us/choco/commands/upgrade.

### KNOWN ISSUES
* [Known Issues](https://github.com/chocolatey/choco/labels/Bug)
Expand Down Expand Up @@ -562,7 +562,7 @@ Here's one you probably never knew existed - extensions. Chocolatey has had the

We redesigned our `choco new` default packaging template and we've made managing templates as easy as managing packages.

`choco search`/`choco list` has so many enhancements, you may not need to visit dot org again. [See it in action](https://chocolatey.org/docs/commands-list#see-it-in-action).
`choco search`/`choco list` has so many enhancements, you may not need to visit dot org again. [See it in action](https://docs.chocolatey.org/en-us/choco/commands/list#see-it-in-action).
* [search -v provides moderation related information and a world of nuspec information](https://github.com/chocolatey/choco/issues/493)
* [search by id only](https://github.com/chocolatey/choco/issues/663)
* [search by id exact](https://github.com/chocolatey/choco/issues/453)
Expand Down Expand Up @@ -615,8 +615,8 @@ This further restricts the default installation location by removing all permiss
* Uninstall-ChocolateyEnvironmentVariable function - see [#772](https://github.com/chocolatey/choco/issues/772)
* Get-UninstallRegistryKey function - see [#739](https://github.com/chocolatey/choco/issues/739)
* Pro/Business - Ubiquitous Install Directory Switch - see [#258](https://github.com/chocolatey/choco/issues/258)
* Pro/Business - Runtime Virus Scanning - see [virus scanning](https://chocolatey.org/docs/features-virus-check)
* Pro/Business - Private CDN cache for downloads - see [private CDN cache](https://chocolatey.org/docs/features-private-cdn)
* Pro/Business - Runtime Virus Scanning - see [virus scanning](https://docs.chocolatey.org/en-us/features/virus-check)
* Pro/Business - Private CDN cache for downloads - see [private CDN cache](https://docs.chocolatey.org/en-us/features/private-cdn)
* Pro/Business - Sync "choco installed status" with "Windows installed status" - see [#567](https://github.com/chocolatey/choco/issues/567)

### BUG FIXES
Expand Down Expand Up @@ -994,13 +994,13 @@ We'll try to capture everything here that you should know about. Please call `ch

### FEATURES
* In app documentation! Use `choco -?`, `choco -h` or `choco commandName -?` to learn about each command, complete with examples!
* WhatIf/Noop mode for all commands (`--noop` can also be specified as `-whatif`) - see [Chocolatey #263](https://github.com/chocolatey/chocolatey/issues/263) and [Default Options and Switches](https://chocolatey.org/docs/commands-reference#how-to-pass-options-switches)
* WhatIf/Noop mode for all commands (`--noop` can also be specified as `-whatif`) - see [Chocolatey #263](https://github.com/chocolatey/chocolatey/issues/263) and [Default Options and Switches](https://docs.chocolatey.org/en-us/choco/commands#how-to-pass-options-switches)
* Performs like a package manager, expect to see queries failing because of unmet dependency issues.
* **New Commands:**
1. `pin` - Suppress upgrades. This allows you to 'pin' an install to a particular version - see [#1](https://github.com/chocolatey/choco/issues/1), [Chocolatey #5](https://github.com/chocolatey/chocolatey/issues/5) and [Pin Command](https://chocolatey.org/docs/commands-pin)
2. `apikey` - see [ApiKey Command](https://chocolatey.org/docs/commands-apikey)
3. `new` - see [New Command](https://chocolatey.org/docs/commands-new) and [Chocolatey #157](https://github.com/chocolatey/chocolatey/issues/157)
* New ways to pass arguments! See [How to Pass Options/Switches](https://chocolatey.org/docs/commands-reference#how-to-pass-options-switches)
1. `pin` - Suppress upgrades. This allows you to 'pin' an install to a particular version - see [#1](https://github.com/chocolatey/choco/issues/1), [Chocolatey #5](https://github.com/chocolatey/chocolatey/issues/5) and [Pin Command](https://docs.chocolatey.org/en-us/choco/commands/pin)
2. `apikey` - see [ApiKey Command](https://docs.chocolatey.org/en-us/create/commands/api-key)
3. `new` - see [New Command](https://docs.chocolatey.org/en-us/create/commands/new) and [Chocolatey #157](https://github.com/chocolatey/chocolatey/issues/157)
* New ways to pass arguments! See [How to Pass Options/Switches](https://docs.chocolatey.org/en-us/choco/commands#how-to-pass-options-switches)
* Did we mention there is a help menu that is actually helpful now? Shiny!
* AutoUninstaller!!!! But it is not enabled by default this version. See [#15](https://github.com/chocolatey/choco/issues/15), [#9](https://github.com/chocolatey/choco/issues/9) and [Chocolatey #6](https://github.com/chocolatey/chocolatey/issues/6)
* **New Helpers:**
Expand All @@ -1011,7 +1011,7 @@ Probably a lot of bug fixes that may not make it here, but here are the ones we

* Fix - Cannot upgrade from prerelease to same version released - see [Chocolatey #122](https://github.com/chocolatey/chocolatey/issues/122)
* Fix - install `--force` should not use cache - see [Chocolatey #199](https://github.com/chocolatey/chocolatey/issues/199)
* Fix - force dependencies as well - see [--force-dependencies](https://chocolatey.org/docs/commands-install) and [Chocolatey #199](https://github.com/chocolatey/chocolatey/issues/199)
* Fix - force dependencies as well - see [--force-dependencies](https://docs.chocolatey.org/en-us/choco/commands/install) and [Chocolatey #199](https://github.com/chocolatey/chocolatey/issues/199)
* Fix - Chocolatey should not stop on error - see [Chocolatey #192](https://github.com/chocolatey/chocolatey/issues/192)
* Fix - Upgrading does not remove previous version - see [Chocolatey #259](https://github.com/chocolatey/chocolatey/issues/259)
* Fix - Non-elevated shell message spills errors - see [Chocolatey #540](https://github.com/chocolatey/chocolatey/issues/540)
Expand All @@ -1036,7 +1036,7 @@ Probably a lot of bug fixes that may not make it here, but here are the ones we
* Add $env:CHOCOLATEY_VERSION - see [Chocolatey #251](https://github.com/chocolatey/chocolatey/issues/251)
* Replace ascii cue with visual cues - see [Chocolatey #376](https://github.com/chocolatey/chocolatey/pull/376)
* Uninstall all versions of an app - see [Chocolatey #389](https://github.com/chocolatey/chocolatey/issues/389)
* Add parameters in packages.config files - see [Packages.config](https://chocolatey.org/docs/commands-install#packages.config), [Chocolatey #472](https://github.com/chocolatey/chocolatey/issues/472), and [#10](https://github.com/chocolatey/choco/issues/10)
* Add parameters in packages.config files - see [Packages.config](https://docs.chocolatey.org/en-us/choco/commands/install#packages.config), [Chocolatey #472](https://github.com/chocolatey/chocolatey/issues/472), and [#10](https://github.com/chocolatey/choco/issues/10)
* Choco pack should support `-version` - see [Chocolatey #526](https://github.com/chocolatey/chocolatey/issues/526)
* Enhancements to Start-ChocolateyProcessAsAdmin - see [Chocolatey #564](https://github.com/chocolatey/chocolatey/pull/564)
* Install-ChocolateyFileAssociation - add label to new file types - see [Chocolatey #564](https://github.com/chocolatey/chocolatey/pull/564)
Expand Down
Loading

0 comments on commit 93b1cfc

Please sign in to comment.