actions
/
setup-dotnet
mirror of https://github.com/actions/setup-dotnet.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/actions/setup-dotnet

This commit is contained in:
Danny McCormick 2019-07-25 14:19:54 -04:00
parent e6ea2e057b 1566687aab
commit fa5b2a78ea
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/workflow.yml vendored
View File

@ -8,6 +8,9 @@ jobs:
matrix: matrix:
operating-system: [ubuntu-latest, windows-latest] operating-system: [ubuntu-latest, windows-latest]
actions: actions:
- name: Checkout
uses: actions/checkout@master
- name: Set Node.js 10.x - name: Set Node.js 10.x
uses: actions/setup-node@master uses: actions/setup-node@master
with: with:

6
README.md
View File

@ -12,7 +12,8 @@ See [action.yml](action.yml)
Basic: Basic:
```yaml ```yaml
actions: actions:
- uses: actions/setup-dotnet@latest - uses: actions/checkout@master
- uses: actions/setup-dotnet@master
with: with:
version: 2.2.103 // Version to use. version: 2.2.103 // Version to use.
- run: dotnet build <my project> - run: dotnet build <my project>
@ -27,8 +28,9 @@ jobs:
dotnet: [ 2.2.103, 3.5.2, 4.5.1 ] dotnet: [ 2.2.103, 3.5.2, 4.5.1 ]
name: Dotnet ${{ matrix.dotnet }} sample name: Dotnet ${{ matrix.dotnet }} sample
actions: actions:
- uses: actions/checkout@master
- name: Setup dotnet - name: Setup dotnet
uses: actions/setup-dotnet@latest uses: actions/setup-dotnet@master
with: with:
version: ${{ matrix.dotnet }} version: ${{ matrix.dotnet }}
- run: dotnet build <my project> - run: dotnet build <my project>

8
lib/installer.js
View File

@ -251,8 +251,8 @@ class DotnetCoreInstaller {
} }
} }
}); });
primaryUrlSearchString = 'dotnet-install: Primary - '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy - '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} }
else { else {
let escapedScript = path let escapedScript = path
@ -267,8 +267,8 @@ class DotnetCoreInstaller {
} }
} }
}); });
primaryUrlSearchString = 'dotnet-install: Payload URL: '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy payload URL: '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} }
if (resultCode != 0) { if (resultCode != 0) {
throw `Failed to get download urls with result code ${resultCode}. ${output}`; throw `Failed to get download urls with result code ${resultCode}. ${output}`;

8
src/installer.ts
View File

@ -276,8 +276,8 @@ export class DotnetCoreInstaller {
} }
); );
primaryUrlSearchString = 'dotnet-install: Primary - '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy - '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} else { } else {
let escapedScript = path let escapedScript = path
.join(__dirname, '..', 'externals', 'install-dotnet.sh') .join(__dirname, '..', 'externals', 'install-dotnet.sh')
@ -297,8 +297,8 @@ export class DotnetCoreInstaller {
} }
); );
primaryUrlSearchString = 'dotnet-install: Payload URL: '; primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
legacyUrlSearchString = 'dotnet-install: Legacy payload URL: '; legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
} }
if (resultCode != 0) { if (resultCode != 0) {