From 76585d940e5f55d68876fd283831119d7d7f5cc3 Mon Sep 17 00:00:00 2001 From: Zachary Eisinger Date: Mon, 21 Oct 2019 14:19:40 -0700 Subject: [PATCH 1/5] node_modules --- package-lock.json | 69 ++++++++++++++++------------------------------- 1 file changed, 23 insertions(+), 46 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0d19ed6..03d04f5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1157,9 +1157,9 @@ } }, "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==", + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true, "optional": true }, @@ -2374,9 +2374,9 @@ "dev": true }, "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", + "version": "4.4.5", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.4.5.tgz", + "integrity": "sha512-0Ce31oWVB7YidkaTq33ZxEbN+UDxMMgThvCe8ptgQViymL5DPis9uLdTA13MiRPhgvqyxIegugrP97iK3JeBHg==", "dev": true, "requires": { "neo-async": "^2.6.0", @@ -3551,9 +3551,9 @@ } }, "lodash": { - "version": "4.17.11", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", - "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", "dev": true }, "lodash.sortby": { @@ -3712,9 +3712,9 @@ "dev": true }, "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", "dev": true, "requires": { "for-in": "^1.0.2", @@ -4568,9 +4568,9 @@ "dev": true }, "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -5161,13 +5161,13 @@ "dev": true }, "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", + "version": "3.6.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.3.tgz", + "integrity": "sha512-KfQUgOqTkLp2aZxrMbCuKCDGW9slFYu2A23A36Gs7sGzTLcRBDORdOi5E21KWHFIfkY8kzgi/Pr1cXCh0yIp5g==", "dev": true, "optional": true, "requires": { - "commander": "~2.20.0", + "commander": "~2.20.3", "source-map": "~0.6.1" } }, @@ -5177,38 +5177,15 @@ "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" }, "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { "arr-union": "^3.1.0", "get-value": "^2.0.6", "is-extendable": "^0.1.1", - "set-value": "^0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.1", - "to-object-path": "^0.3.0" - } - } + "set-value": "^2.0.1" } }, "unset-value": { From 73b32e9eb36818ebfff0959a61ea789412b75b7f Mon Sep 17 00:00:00 2001 From: Tim Heuer Date: Tue, 17 Dec 2019 13:21:43 -0800 Subject: [PATCH 2/5] Updating readme snippets to show latest SDK Given the LTS release of .NET Core it's good practice that any samples using the SDK should use the supported versions. 2.2 is no longer a supported version in a month or so and the latest SDK should be used in examples. Minor change, but important for copy/paste folks. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 328e6c4..ea327fd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ steps: - uses: actions/checkout@master - uses: actions/setup-dotnet@v1 with: - dotnet-version: '2.2.103' # SDK Version to use. + dotnet-version: '3.1.100' # SDK Version to use. - run: dotnet build ``` @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-16.04 strategy: matrix: - dotnet: [ '2.2.103', '3.0.100', '3.1.100-preview1-014459' ] + dotnet: [ '2.2.103', '3.0.100', '3.1.100' ] name: Dotnet ${{ matrix.dotnet }} sample steps: - uses: actions/checkout@master @@ -49,7 +49,7 @@ steps: # Authenticates packages to push to GPR - uses: actions/setup-dotnet@v1 with: - dotnet-version: '2.2.103' # SDK Version to use. + dotnet-version: '3.1.100' # SDK Version to use. source-url: https://nuget.pkg.github.com//index.json env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}} From 8886b529ee37c085e823b13a859acb34edad05bc Mon Sep 17 00:00:00 2001 From: Zachary Eisinger Date: Wed, 18 Dec 2019 08:17:54 -0800 Subject: [PATCH 3/5] Set osx as the os name --- externals/get-os-distro.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/externals/get-os-distro.sh b/externals/get-os-distro.sh index 4bc5c45..029dc6e 100755 --- a/externals/get-os-distro.sh +++ b/externals/get-os-distro.sh @@ -113,7 +113,7 @@ get_current_os_name() { local uname=$(uname) if [ "$uname" = "Darwin" ]; then - echo "mac" + echo "osx" return 0 elif [ "$uname" = "Linux" ]; then local linux_platform_name @@ -139,7 +139,7 @@ get_legacy_os_name() { local uname=$(uname) if [ "$uname" = "Darwin" ]; then - echo "mac" + echo "osx" return 0 else if [ -e /etc/os-release ]; then From dccf26c63ecbded2258f0ecc23e7c2399a3aee37 Mon Sep 17 00:00:00 2001 From: Zachary Eisinger Date: Wed, 18 Dec 2019 08:26:43 -0800 Subject: [PATCH 4/5] Test on macos for completeness --- .github/workflows/workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 0b95177..cc18a29 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -6,7 +6,7 @@ jobs: runs-on: ${{ matrix.operating-system }} strategy: matrix: - operating-system: [ubuntu-latest, windows-latest] + operating-system: [ubuntu-latest, windows-latest, macOS-latest] steps: - name: Checkout uses: actions/checkout@master From 0f6f11a75160df3ab10e5c146cdbec37f168809c Mon Sep 17 00:00:00 2001 From: Zachary Eisinger Date: Fri, 20 Dec 2019 07:45:37 -0800 Subject: [PATCH 5/5] Remove warning on master branch --- lib/setup-dotnet.js | 1 - src/setup-dotnet.ts | 3 --- 2 files changed, 4 deletions(-) diff --git a/lib/setup-dotnet.js b/lib/setup-dotnet.js index 258a188..7c42583 100644 --- a/lib/setup-dotnet.js +++ b/lib/setup-dotnet.js @@ -26,7 +26,6 @@ function run() { // Version is optional. If supplied, install / use from the tool cache // If not supplied then task is still used to setup proxy, auth, etc... // - console.log(`::warning::Use the v1 tag to get the last version, master may contain breaking changes and will not contain any required packages in the future. i.e. actions/setup-dotnet@v1`); let version = core.getInput('version'); if (!version) { version = core.getInput('dotnet-version'); diff --git a/src/setup-dotnet.ts b/src/setup-dotnet.ts index e6e9723..f355ba0 100644 --- a/src/setup-dotnet.ts +++ b/src/setup-dotnet.ts @@ -9,9 +9,6 @@ async function run() { // Version is optional. If supplied, install / use from the tool cache // If not supplied then task is still used to setup proxy, auth, etc... // - console.log( - `::warning::Use the v1 tag to get the last version, master may contain breaking changes and will not contain any required packages in the future. i.e. actions/setup-dotnet@v1` - ); let version = core.getInput('version'); if (!version) {