Merge branch 'master' of https://github.com/actions/setup-dotnet
This commit is contained in:
commit
fa5b2a78ea
|
@ -8,6 +8,9 @@ jobs:
|
|||
matrix:
|
||||
operating-system: [ubuntu-latest, windows-latest]
|
||||
actions:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@master
|
||||
|
||||
- name: Set Node.js 10.x
|
||||
uses: actions/setup-node@master
|
||||
with:
|
||||
|
|
|
@ -12,7 +12,8 @@ See [action.yml](action.yml)
|
|||
Basic:
|
||||
```yaml
|
||||
actions:
|
||||
- uses: actions/setup-dotnet@latest
|
||||
- uses: actions/checkout@master
|
||||
- uses: actions/setup-dotnet@master
|
||||
with:
|
||||
version: 2.2.103 // Version to use.
|
||||
- run: dotnet build <my project>
|
||||
|
@ -27,8 +28,9 @@ jobs:
|
|||
dotnet: [ 2.2.103, 3.5.2, 4.5.1 ]
|
||||
name: Dotnet ${{ matrix.dotnet }} sample
|
||||
actions:
|
||||
- uses: actions/checkout@master
|
||||
- name: Setup dotnet
|
||||
uses: actions/setup-dotnet@latest
|
||||
uses: actions/setup-dotnet@master
|
||||
with:
|
||||
version: ${{ matrix.dotnet }}
|
||||
- run: dotnet build <my project>
|
||||
|
|
|
@ -251,8 +251,8 @@ class DotnetCoreInstaller {
|
|||
}
|
||||
}
|
||||
});
|
||||
primaryUrlSearchString = 'dotnet-install: Primary - ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy - ';
|
||||
primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
|
||||
}
|
||||
else {
|
||||
let escapedScript = path
|
||||
|
@ -267,8 +267,8 @@ class DotnetCoreInstaller {
|
|||
}
|
||||
}
|
||||
});
|
||||
primaryUrlSearchString = 'dotnet-install: Payload URL: ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy payload URL: ';
|
||||
primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
|
||||
}
|
||||
if (resultCode != 0) {
|
||||
throw `Failed to get download urls with result code ${resultCode}. ${output}`;
|
||||
|
|
|
@ -276,8 +276,8 @@ export class DotnetCoreInstaller {
|
|||
}
|
||||
);
|
||||
|
||||
primaryUrlSearchString = 'dotnet-install: Primary - ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy - ';
|
||||
primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
|
||||
} else {
|
||||
let escapedScript = path
|
||||
.join(__dirname, '..', 'externals', 'install-dotnet.sh')
|
||||
|
@ -297,8 +297,8 @@ export class DotnetCoreInstaller {
|
|||
}
|
||||
);
|
||||
|
||||
primaryUrlSearchString = 'dotnet-install: Payload URL: ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy payload URL: ';
|
||||
primaryUrlSearchString = 'dotnet-install: Primary named payload URL: ';
|
||||
legacyUrlSearchString = 'dotnet-install: Legacy named payload URL: ';
|
||||
}
|
||||
|
||||
if (resultCode != 0) {
|
||||
|
|
Loading…
Reference in New Issue