Skip to content

Commit

Permalink
Merge pull request #1 from chocolatey/master
Browse files Browse the repository at this point in the history
Merge latest into my repo.
  • Loading branch information
SeanKilleen authored Dec 16, 2018
2 parents 9c0a77d + ea4b155 commit c8512aa
Show file tree
Hide file tree
Showing 361 changed files with 3,357 additions and 1,323 deletions.
2 changes: 1 addition & 1 deletion .build.custom/ilmerge.replace.build
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<property name="args.ilmerge" value="${args.ilmerge} ${dlls.regular}" />
</target>

<target name="run_ilmerge">
<target name="run_ilmerge" if="${msbuild.configuration != 'NoResources'}">
<echo level="Warning" message="Merging the the contents of ${dirs.merge.from} into a single executable - ${dirs.merge.to}${path.separator}${file.merge.name}. This will fail if all dependencies are not resolved."/>
<echo level="Warning" message="Running this: ${app.ilmerge} ${args.ilmerge}"/>
<exec program="${app.ilmerge}"
Expand Down
7 changes: 6 additions & 1 deletion .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<!--
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.
BEFORE YOU SUBMIT AN ISSUE:
Ensure you have read over Submitting Issues -
Expand All @@ -8,7 +13,7 @@ DO NOT CREATE ISSUES FOR PACKAGES. Read over Submitting Issues.
DO NOT CREATE AN ISSUE FOR A QUESTION - questions are better served as email or chat.
- email - http://groups.google.com/group/chocolatey
- chat - https://gitter.im/chocolatey/choco
- chat - https://gitter.im/chocolatey/choco
DELETE EVERYTHING IN THIS COMMENT BLOCK
Expand Down
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/AskQuestion.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: Ask Question
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).
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).


The best routes for getting questions answered when the documentation doesn't serve what you need is the mailing list or in chat:
- email - http://groups.google.com/group/chocolatey
- chat - https://gitter.im/chocolatey/choco



NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/ReportGUIIssue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Chocolatey GUI - Report Issue / Suggest Feature
about: Did you find unexpected behavior?
---

STOP RIGHT HERE - DO NOT CREATE A TICKET FOR Chocolatey GUI 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 GUI, you will need to head over to https://github.com/chocolatey/ChocolateyGUI and file a ticket there.



NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
19 changes: 19 additions & 0 deletions .github/ISSUE_TEMPLATE/ReportPackageIssue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
name: Package - Report Issue / Suggest Missing Package / Package Outdated
about: Something went wrong with an installation? Want a package to be added to the community repository?
---

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.

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).



NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/ReportWebsiteIssue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Website - Report Issue / Suggest Feature
about: Something weird about https://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.



NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/SecurityDisclosure.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
name: Security Disclosure / Report
about: Found a security issue?
---

STOP RIGHT HERE - DO NOT CREATE A TICKET FOR A SECURITY FINDING IN THE OPEN (HERE OR IN ANY COMMUNITY)

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://chocolatey.org/security to see instructions on how to provide the disclosure. Thank you!
10 changes: 10 additions & 0 deletions .github/ISSUE_TEMPLATE/zChocoFeatureRequest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name: Choco.exe - Enhancement / Feature Request
about: How can we make Chocolatey work better for you? Is there additional functionality you would love us to consider?
---

<!--
Please observe https://github.com/chocolatey/choco/blob/master/CONTRIBUTING.md guidelines prior to creating your issue.
NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
-->
42 changes: 42 additions & 0 deletions .github/ISSUE_TEMPLATE/zChocoReportIssue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
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

Please check to see if your issue already exists with a quick search of the issues. Start with one relevant term and then add if you get too many results.

NOTE: Keep in mind we have an etiquette regarding communication that we expect folks to observe when they are looking for support in the Chocolatey community. https://github.com/chocolatey/choco/blob/master/README.md#etiquette-regarding-communication
-->

### What You Are Seeing?

### What is Expected?

### How Did You Get This To Happen? (Steps to Reproduce)

### Output Log
<!--
When including the log information, please ensure you have run the command with --debug --verbose. It provides important information for determining an issue
- Make sure there is no sensitive data shared.
- We need ALL output, not just what you may believe is relevant.
- We need ALL OUTPUT (including the configuration information), see https://gist.github.com/ferventcoder/b1300b91c167c8ac8205#file-error-txt-L1-L41 for what we need.
- If it is hard to reproduce with debug/verbose, the log file already logs with those parameters, just grab the relevant section from the log file (in the logs directory of your Chocolatey install).
-->


<details>
<summary>Full Log Output</summary>

<p>

~~~sh
PLACE LOG CONTENT HERE - WE NEED _ALL_ DETAILED OUTPUT BASED ON THE ABOVE TO BE ABLE TO PROVIDE SUPPORT (YOU WILL FIND THAT IN THE $env:ChocolateyInstall\logs\chocolatey.log between the `=====`)
~~~

</p>

</details>
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ code_drop
obj
src/packages
/.vscode/
.vs

*.suo
*.sln.docstates
Expand Down
4 changes: 2 additions & 2 deletions .uppercut
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
<property name="version.use_semanticversioning" value="true" overwrite="false" />
<property name="version.major" value="0" overwrite="false" />
<property name="version.minor" value="10" overwrite="false" />
<property name="version.patch" value="9" overwrite="false" />
<property name="version.patch" value="12" overwrite="false" />
<property name="version.fix" value="0" overwrite="false" />
<property name="version.nuget.prerelease" value="beta" overwrite="false" />
<property name="version.use.build_date" value="true" overwrite="false" />
<property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
<property name="assembly.copyright" value="Copyright © 2017 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
<property name="assembly.copyright" value="Copyright © 2017 - 2018 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
<property name="sign.project_with_key" value="true" overwrite="false" />

<!-- Build Features Overrides -->
Expand Down
Loading

0 comments on commit c8512aa

Please sign in to comment.