Skip to content

Commit 239baf3

Browse files
committed
Merge branch 'main' into refactor-nuget-cfg-parse
2 parents 6d6c7c9 + 4d4a70f commit 239baf3

File tree

11 files changed

+248
-253
lines changed

11 files changed

+248
-253
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
.licenses/** -diff linguist-generated=true
1+
.licenses/** -diff linguist-generated=true

.licenses/npm/@actions/core.dep.yml

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.prettierrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
"trailingComma": "none",
88
"bracketSpacing": false,
99
"arrowParens": "avoid",
10-
"parser": "typescript"
10+
"parser": "typescript",
11+
"endOfLine": "auto"
1112
}

README.md

+9-1
Original file line numberDiff line numberDiff line change
@@ -195,16 +195,24 @@ Some environment variables may be necessary for your particular case or to impro
195195

196196
| **Env.variable** | **Description** | **Default value** |
197197
| ----------- | ----------- | ----------- |
198+
| DOTNET_INSTALL_DIR |Specifies a directory where .NET SDKs should be installed by the action.|*default value for each OS* |
198199
| DOTNET_NOLOGO |Removes logo and telemetry message from first run of dotnet cli|*false*|
199200
| DOTNET_CLI_TELEMETRY_OPTOUT |Opt-out of telemetry being sent to Microsoft|*false*|
200201
| DOTNET_MULTILEVEL_LOOKUP |Configures whether the global install location is used as a fall-back|*true*|
201202

203+
The default value of the `DOTNET_INSTALL_DIR` environment variable depends on the operation system which is used on a runner:
204+
| **Operation system** | **Default value** |
205+
| ----------- | ----------- |
206+
| **Windows** | `C:\Program Files\dotnet` |
207+
| **Ubuntu** | `/usr/share/dotnet` |
208+
| **macOS** | `/Users/runner/.dotnet` |
209+
202210
**Example usage**:
203211
```yml
204212
build:
205213
runs-on: ubuntu-latest
206214
env:
207-
DOTNET_NOLOGO: true
215+
DOTNET_INSTALL_DIR: "path/to/directory"
208216
steps:
209217
- uses: actions/checkout@main
210218
- uses: actions/setup-dotnet@v3

__tests__/authutil.test.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ import path from 'path';
55
const fakeSourcesDirForTesting = path.join(
66
__dirname,
77
'runner',
8-
path.join(
9-
Math.random()
10-
.toString(36)
11-
.substring(7)
12-
),
8+
path.join(Math.random().toString(36).substring(7)),
139
's'
1410
);
1511

0 commit comments

Comments
 (0)