Skip to content

Commit

Permalink
Merge branch 'GH2112' of https://github.com/steviecoaster/choco into …
Browse files Browse the repository at this point in the history
…GH2112

* 'GH2112' of https://github.com/steviecoaster/choco:
  (chocolatey#2112) Add msp support to Install helper
  (maint) Switch to using a Regex match
  (maint) Change formatting
  (maint) Remove use of PowerShell aliases
  (maint) Replace " with '
  (chocolatey#2044) Fix for changing $env:Temp
  (chocolatey#2259) Switched to versioned NuGet.Core
  (chocolatey#2111) Deep copy config
  (chocolatey#2244) Add Mac build into main workflow
  (chocolatey#2238) Mono build don't hardcode xbuild path
  (maint) Fix artifact paths on AppVeyor
  (chocolatey#2244) Fix syntax for running on Windows
  (chocolatey#2244) Initial workflow for Windows and Ubuntu
  (doc) Remove Mono instructions for other distributions
  (doc) Add Ubuntu 20.04 mono install instructions
  (chocolatey#2227) Bump Mono version in Dockerfile and README
  (chocolatey#2236) Mono test work with merged usr systems
  (chocolatey#2190) Clarify help for SpecificFolder parameter
  (chocolatey#1962) Use different message on error
  (chocolatey#1861) Improves terminology in help documentation
  (chocolatey#1998) Add authorization header to Get-WebFile
  (maint) Repalce RawGit with raw.githack.com CDN
  (chocolatey#1899) Remove unused variables
  (chocolateyGH-1060) Add BeforeInstall parameter to Install-ChocolateyPackage.ps1
  (maint) Improve log message
  (chocolateyGH-2092) Take all registry keys into account
  (chocolateyGH-1364) Template create .nuspec encoded without BOM
  (chocolatey#1866) Limit pending package removal to top level
  (chocolateyGH-2203) Get-ChocolateyUnzip add unzipLocation alias
  (chocolateyGH-1889) Fix: Removal of ApiKey broken
  (chocolatey#2114) Remove unused variable
  (chocolateyGH-2048) update deprecation note to outdated
  (maint) Spelling and grammar fixes
  (maint) Replace tabs with spaces
  (chocolatey#2078) Skip importing Chocolatey GUI Extension
  (chocolatey#2227) Use latest Mono and Ubuntu on Travis
  (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) Update to prefer # rather than GH-
  (maint) Fix replacement
  (maint) Revert change to earlier commit
  (maint) Fix spelling mistake
  (maint) Fix spelling mistake
  (doc) Update script to Statiq format
  (maint) Add missing backtick in example
  (maint) Added explicit link to new function name
  (maint) Fix spelling mistake
  (maint) Fix spelling mistake
  (maint) Fix spelling mistake
  (maint) Fix spelling mistake
  (maint) Fix spelling mistake
  (maint) Fix spelling mistake
  (maint) Remove generated docs files
  (maint) Add docs/generated folder to ignore list
  (chocolateyGH-2105) Update link to Chocolatey workshop
  • Loading branch information
steviecoaster committed May 11, 2021
2 parents a365a87 + 2f07a6c commit 61102d6
Show file tree
Hide file tree
Showing 144 changed files with 804 additions and 13,063 deletions.
2 changes: 0 additions & 2 deletions .build/compile.step
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,12 @@
<!-- Do clean and build in two steps since xbuild has a bug with using OutputPath and Rebuild together Bug #628525 at Novell -->
<echo level="Warning" message="Cleaning build..." if="${microsoft.framework.specific != 'mono-4.5'}" />
<exec program="${app.xbuild}"
basedir="/usr/bin"
workingdir="${dirs.build}"
commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:minimal /noconsolelogger /target:Clean" if="${microsoft.framework.specific != 'mono-4.5'}" />
<echo level="Warning" message="Building..." />
<echo level="Warning" message="Working directory ${dirs.build}" />
<echo level="Warning" message="Running ${app.xbuild} ${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:detailed /toolsversion:${framework::get-version(microsoft.framework.specific)} /property:Platform='${msbuild.platform}' /property:TargetFrameworkVersion=v${framework::get-version(microsoft.framework.specific)} /l:${msbuild.logger};'${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml'" />
<exec program="${app.xbuild}"
basedir="/usr/bin"
workingdir="${dirs.build}"
commandline="${solution.path} /nologo /property:OutputPath='${msbuild.outputpath}' /property:Configuration=${msbuild.configuration} /verbosity:detailed /toolsversion:4.0 /property:Platform='${msbuild.platform}' /property:TargetFrameworkProfile='' /property:TargetFrameworkVersion=v${framework::get-version(microsoft.framework.specific)} /l:${msbuild.logger};'${dirs.build_results}${path.separator}msbuild-${microsoft.framework.specific}-results.xml'" />
</if>
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
4 changes: 2 additions & 2 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

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!
information at https://docs.chocolatey.org/en-us/information/security to see
instructions on how to provide the disclosure. Thank you!
42 changes: 42 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Chocolatey Builds

on:
# Trigger on pushes to master and stable, or with pull requests
push:
branches:
- master
- stable
pull_request:
branches:
- master
- stable

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
# Build using mono on Ubuntu
ubuntu-build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Build with Mono
run: |
chmod +x build.sh
$GITHUB_WORKSPACE//build.sh -v
# Build on Windows
windows-build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- name: Build with .Net Framework
run: .\build.bat -v
# Build using mono on MacOS
macos-build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- name: Build with Mono
run: |
chmod +x build.sh
$GITHUB_WORKSPACE//build.sh -v
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,5 @@ SolutionVersion.vb
src/_dotCover.chocolatey/
src/_dotTrace.chocolatey/
src/chocolatey.sln.GhostDoc.xml

docs/generated
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
language: csharp
dist: bionic
mono:
- 5.20.1
- 6.12.0
install:
- sudo apt-get install mono-devel
- nuget restore src/chocolatey.sln
Expand Down
Loading

0 comments on commit 61102d6

Please sign in to comment.