mirror of
				https://github.com/actions/setup-dotnet.git
				synced 2025-10-31 19:43:46 +00:00 
			
		
		
		
	Add and configure ESLint and update configuration for Prettier (#391)
* Apply ESLint config and update Prettier * Update dependencies and rebuild * Update docs
This commit is contained in:
		
							parent
							
								
									926f442022
								
							
						
					
					
						commit
						c82240598b
					
				
							
								
								
									
										6
									
								
								.eslintignore
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								.eslintignore
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,6 @@ | |||||||
|  | # Ignore list | ||||||
|  | /* | ||||||
|  | 
 | ||||||
|  | # Do not ignore these folders: | ||||||
|  | !__tests__/ | ||||||
|  | !src/ | ||||||
							
								
								
									
										49
									
								
								.eslintrc.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										49
									
								
								.eslintrc.js
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,49 @@ | |||||||
|  | module.exports = { | ||||||
|  |   extends: [ | ||||||
|  |     'eslint:recommended', | ||||||
|  |     'plugin:@typescript-eslint/recommended', | ||||||
|  |     'plugin:eslint-plugin-jest/recommended', | ||||||
|  |     'eslint-config-prettier' | ||||||
|  |   ], | ||||||
|  |   parser: '@typescript-eslint/parser', | ||||||
|  |   plugins: ['@typescript-eslint', 'eslint-plugin-jest'], | ||||||
|  |   rules: { | ||||||
|  |     '@typescript-eslint/no-require-imports': 'error', | ||||||
|  |     '@typescript-eslint/no-non-null-assertion': 'off', | ||||||
|  |     '@typescript-eslint/no-explicit-any': 'off', | ||||||
|  |     '@typescript-eslint/no-empty-function': 'off', | ||||||
|  |     '@typescript-eslint/ban-ts-comment': [ | ||||||
|  |       'error', | ||||||
|  |       { | ||||||
|  |         'ts-ignore': 'allow-with-description' | ||||||
|  |       } | ||||||
|  |     ], | ||||||
|  |     'no-console': 'error', | ||||||
|  |     'yoda': 'error', | ||||||
|  |     'prefer-const': [ | ||||||
|  |       'error', | ||||||
|  |       { | ||||||
|  |         destructuring: 'all' | ||||||
|  |       } | ||||||
|  |     ], | ||||||
|  |     'no-control-regex': 'off', | ||||||
|  |     'no-constant-condition': ['error', {checkLoops: false}] | ||||||
|  |   }, | ||||||
|  |   overrides: [ | ||||||
|  |     { | ||||||
|  |       files: ['**/*{test,spec}.ts'], | ||||||
|  |       rules: { | ||||||
|  |         '@typescript-eslint/no-unused-vars': 'off', | ||||||
|  |         'jest/no-standalone-expect': 'off', | ||||||
|  |         'jest/no-conditional-expect': 'off', | ||||||
|  |         'no-console': 'off', | ||||||
|  | 
 | ||||||
|  |       } | ||||||
|  |     } | ||||||
|  |   ], | ||||||
|  |   env: { | ||||||
|  |     node: true, | ||||||
|  |     es6: true, | ||||||
|  |     'jest/globals': true | ||||||
|  |   } | ||||||
|  | }; | ||||||
							
								
								
									
										1
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								.gitattributes
									
									
									
									
										vendored
									
									
								
							| @ -1 +1,2 @@ | |||||||
|  | * text=auto eol=lf | ||||||
| .licenses/** -diff linguist-generated=true | .licenses/** -diff linguist-generated=true | ||||||
|  | |||||||
							
								
								
									
										4
									
								
								.github/workflows/codeql-analysis.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/codeql-analysis.yml
									
									
									
									
										vendored
									
									
								
							| @ -2,9 +2,9 @@ name: CodeQL analysis | |||||||
| 
 | 
 | ||||||
| on: | on: | ||||||
|   push: |   push: | ||||||
|     branches: [ main ] |     branches: [main] | ||||||
|   pull_request: |   pull_request: | ||||||
|     branches: [ main ] |     branches: [main] | ||||||
|   schedule: |   schedule: | ||||||
|     - cron: '0 3 * * 0' |     - cron: '0 3 * * 0' | ||||||
| 
 | 
 | ||||||
|  | |||||||
							
								
								
									
										136
									
								
								.github/workflows/e2e-tests.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										136
									
								
								.github/workflows/e2e-tests.yml
									
									
									
									
										vendored
									
									
								
							| @ -192,83 +192,83 @@ jobs: | |||||||
|         run: __tests__/verify-dotnet.ps1 2.2 3.1 |         run: __tests__/verify-dotnet.ps1 2.2 3.1 | ||||||
| 
 | 
 | ||||||
|   test-setup-with-dotnet-quality: |   test-setup-with-dotnet-quality: | ||||||
|       runs-on: ${{ matrix.operating-system }} |     runs-on: ${{ matrix.operating-system }} | ||||||
|       strategy: |     strategy: | ||||||
|         fail-fast: false |       fail-fast: false | ||||||
|         matrix: |       matrix: | ||||||
|           operating-system: [ubuntu-latest, windows-latest, macOS-latest] |         operating-system: [ubuntu-latest, windows-latest, macOS-latest] | ||||||
|       steps: |     steps: | ||||||
|         - name: Checkout |       - name: Checkout | ||||||
|           uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
|         - name: Clear toolcache |       - name: Clear toolcache | ||||||
|           shell: pwsh |         shell: pwsh | ||||||
|           run: __tests__/clear-toolcache.ps1 ${{ runner.os }} |         run: __tests__/clear-toolcache.ps1 ${{ runner.os }} | ||||||
| 
 | 
 | ||||||
|         - name: Setup dotnet 7.0 with preview quality |       - name: Setup dotnet 7.0 with preview quality | ||||||
|           uses: ./ |         uses: ./ | ||||||
|           with: |         with: | ||||||
|             dotnet-version: "7.0" |           dotnet-version: '7.0' | ||||||
|             dotnet-quality: "preview" |           dotnet-quality: 'preview' | ||||||
|         - name: Verify preview version |       - name: Verify preview version | ||||||
|           shell: pwsh |         shell: pwsh | ||||||
|           run: | |         run: | | ||||||
|             $version = & dotnet --version |           $version = & dotnet --version | ||||||
|             Write-Host "Installed version: $version" |           Write-Host "Installed version: $version" | ||||||
|             if (-not ($version.Contains("preview") -or $version.Contains("rc"))) { throw "Unexpected version" } |           if (-not ($version.Contains("preview") -or $version.Contains("rc"))) { throw "Unexpected version" } | ||||||
| 
 | 
 | ||||||
|   test-dotnet-version-output-during-single-version-installation: |   test-dotnet-version-output-during-single-version-installation: | ||||||
|       runs-on: ${{ matrix.operating-system }} |     runs-on: ${{ matrix.operating-system }} | ||||||
|       strategy: |     strategy: | ||||||
|         fail-fast: false |       fail-fast: false | ||||||
|         matrix: |       matrix: | ||||||
|           operating-system: [ubuntu-latest, windows-latest, macOS-latest] |         operating-system: [ubuntu-latest, windows-latest, macOS-latest] | ||||||
|       steps: |     steps: | ||||||
|         - name: Checkout |       - name: Checkout | ||||||
|           uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
|         - name: Clear toolcache |       - name: Clear toolcache | ||||||
|           shell: pwsh |         shell: pwsh | ||||||
|           run: __tests__/clear-toolcache.ps1 ${{ runner.os }} |         run: __tests__/clear-toolcache.ps1 ${{ runner.os }} | ||||||
| 
 | 
 | ||||||
|         - name: Setup dotnet 6.0.401 |       - name: Setup dotnet 6.0.401 | ||||||
|           uses: ./ |         uses: ./ | ||||||
|           id: step1 |         id: step1 | ||||||
|           with: |         with: | ||||||
|             dotnet-version: "6.0.401" |           dotnet-version: '6.0.401' | ||||||
| 
 | 
 | ||||||
|         - name: Verify value of the dotnet-version output |       - name: Verify value of the dotnet-version output | ||||||
|           shell: pwsh |         shell: pwsh | ||||||
|           run: | |         run: | | ||||||
|             $version = & dotnet --version |           $version = & dotnet --version | ||||||
|             Write-Host "Installed version: $version" |           Write-Host "Installed version: $version" | ||||||
|             if (-not ($version -eq '${{steps.step1.outputs.dotnet-version}}')) { throw "Unexpected output value" } |           if (-not ($version -eq '${{steps.step1.outputs.dotnet-version}}')) { throw "Unexpected output value" } | ||||||
| 
 | 
 | ||||||
|   test-dotnet-version-output-during-multiple-version-installation: |   test-dotnet-version-output-during-multiple-version-installation: | ||||||
|       runs-on: ${{ matrix.operating-system }} |     runs-on: ${{ matrix.operating-system }} | ||||||
|       strategy: |     strategy: | ||||||
|         fail-fast: false |       fail-fast: false | ||||||
|         matrix: |       matrix: | ||||||
|           operating-system: [ubuntu-latest, windows-latest, macOS-latest] |         operating-system: [ubuntu-latest, windows-latest, macOS-latest] | ||||||
|       steps: |     steps: | ||||||
|         - name: Checkout |       - name: Checkout | ||||||
|           uses: actions/checkout@v3 |         uses: actions/checkout@v3 | ||||||
|         - name: Clear toolcache |       - name: Clear toolcache | ||||||
|           shell: pwsh |         shell: pwsh | ||||||
|           run: __tests__/clear-toolcache.ps1 ${{ runner.os }} |         run: __tests__/clear-toolcache.ps1 ${{ runner.os }} | ||||||
| 
 | 
 | ||||||
|         - name: Setup dotnet 6.0.401, 5.0.408, 7.0.100-rc.1.22431.12 |       - name: Setup dotnet 6.0.401, 5.0.408, 7.0.100-rc.1.22431.12 | ||||||
|           uses: ./ |         uses: ./ | ||||||
|           id: step2 |         id: step2 | ||||||
|           with: |         with: | ||||||
|             dotnet-version: | |           dotnet-version: | | ||||||
|               7.0.100-rc.1.22431.12 |             7.0.100-rc.1.22431.12 | ||||||
|               6.0.401 |             6.0.401 | ||||||
|               5.0.408 |             5.0.408 | ||||||
| 
 | 
 | ||||||
|         - name: Verify value of the dotnet-version output |       - name: Verify value of the dotnet-version output | ||||||
|           shell: pwsh |         shell: pwsh | ||||||
|           run: | |         run: | | ||||||
|             $version = "7.0.100-rc.1.22431.12" |           $version = "7.0.100-rc.1.22431.12" | ||||||
|             if (-not ($version -eq '${{steps.step2.outputs.dotnet-version}}')) { throw "Unexpected output value" } |           if (-not ($version -eq '${{steps.step2.outputs.dotnet-version}}')) { throw "Unexpected output value" } | ||||||
| 
 | 
 | ||||||
|   test-proxy: |   test-proxy: | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|  | |||||||
							
								
								
									
										12
									
								
								.github/workflows/release-new-action-version.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/release-new-action-version.yml
									
									
									
									
										vendored
									
									
								
							| @ -21,9 +21,9 @@ jobs: | |||||||
|       name: releaseNewActionVersion |       name: releaseNewActionVersion | ||||||
|     runs-on: ubuntu-latest |     runs-on: ubuntu-latest | ||||||
|     steps: |     steps: | ||||||
|     - name: Update the ${{ env.TAG_NAME }} tag |       - name: Update the ${{ env.TAG_NAME }} tag | ||||||
|       id: update-major-tag |         id: update-major-tag | ||||||
|       uses: actions/publish-action@v0.2.2 |         uses: actions/publish-action@v0.2.2 | ||||||
|       with: |         with: | ||||||
|         source-tag: ${{ env.TAG_NAME }} |           source-tag: ${{ env.TAG_NAME }} | ||||||
|         slack-webhook: ${{ secrets.SLACK_WEBHOOK }} |           slack-webhook: ${{ secrets.SLACK_WEBHOOK }} | ||||||
|  | |||||||
| @ -2,3 +2,4 @@ | |||||||
| . "$(dirname -- "$0")/_/husky.sh" | . "$(dirname -- "$0")/_/husky.sh" | ||||||
| 
 | 
 | ||||||
| npm run format | npm run format | ||||||
|  | npm run lint:fix | ||||||
|  | |||||||
| @ -3,3 +3,4 @@ | |||||||
| 
 | 
 | ||||||
| # Tests are not run at push time since they can take 2-4 minutes to complete | # Tests are not run at push time since they can take 2-4 minutes to complete | ||||||
| npm run format-check | npm run format-check | ||||||
|  | npm run lint | ||||||
|  | |||||||
							
								
								
									
										7
									
								
								.prettierignore
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										7
									
								
								.prettierignore
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,7 @@ | |||||||
|  | # Ignore list | ||||||
|  | /* | ||||||
|  | 
 | ||||||
|  | # Do not ignore these folders: | ||||||
|  | !__tests__/ | ||||||
|  | !.github/ | ||||||
|  | !src/ | ||||||
							
								
								
									
										10
									
								
								.prettierrc.js
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										10
									
								
								.prettierrc.js
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,10 @@ | |||||||
|  | module.exports = { | ||||||
|  |   printWidth: 80, | ||||||
|  |   tabWidth: 2, | ||||||
|  |   useTabs: false, | ||||||
|  |   semi: true, | ||||||
|  |   singleQuote: true, | ||||||
|  |   trailingComma: 'none', | ||||||
|  |   bracketSpacing: false, | ||||||
|  |   arrowParens: 'avoid' | ||||||
|  | }; | ||||||
| @ -1,12 +0,0 @@ | |||||||
| { |  | ||||||
|     "printWidth": 80, |  | ||||||
|     "tabWidth": 2, |  | ||||||
|     "useTabs": false, |  | ||||||
|     "semi": true, |  | ||||||
|     "singleQuote": true, |  | ||||||
|     "trailingComma": "none", |  | ||||||
|     "bracketSpacing": false, |  | ||||||
|     "arrowParens": "avoid", |  | ||||||
|     "parser": "typescript", |  | ||||||
|     "endOfLine": "auto" |  | ||||||
|   } |  | ||||||
| @ -9,20 +9,20 @@ const fakeSourcesDirForTesting = path.join( | |||||||
|   's' |   's' | ||||||
| ); | ); | ||||||
| 
 | 
 | ||||||
| const invalidNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>`; | const invalidNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>`; | ||||||
| 
 | 
 | ||||||
| const emptyNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const emptyNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const nugetorgNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const nugetorgNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> |     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" /> | ||||||
|   </packageSources> |   </packageSources> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const gprnugetorgNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const gprnugetorgNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="GPR" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> |     <add key="GPR" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> | ||||||
| @ -30,14 +30,14 @@ const gprnugetorgNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?> | |||||||
|   </packageSources> |   </packageSources> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const gprNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const gprNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="GPR" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> |     <add key="GPR" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> | ||||||
|   </packageSources> |   </packageSources> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const twogprNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const twogprNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="GPR-GitHub" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> |     <add key="GPR-GitHub" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> | ||||||
| @ -45,21 +45,21 @@ const twogprNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?> | |||||||
|   </packageSources> |   </packageSources> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const spaceNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const spaceNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="GPR GitHub" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> |     <add key="GPR GitHub" value="https://nuget.pkg.github.com/OwnerName/index.json" protocolVersion="3" /> | ||||||
|   </packageSources> |   </packageSources> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const azureartifactsNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const azureartifactsNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="AzureArtifacts" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json" protocolVersion="3" /> |     <add key="AzureArtifacts" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json" protocolVersion="3" /> | ||||||
|   </packageSources> |   </packageSources> | ||||||
| </configuration>`;
 | </configuration>`;
 | ||||||
| 
 | 
 | ||||||
| const azureartifactsnugetorgNuGetConfig: string = `<?xml version="1.0" encoding="utf-8"?>
 | const azureartifactsnugetorgNuGetConfig = `<?xml version="1.0" encoding="utf-8"?>
 | ||||||
| <configuration> | <configuration> | ||||||
|   <packageSources> |   <packageSources> | ||||||
|     <add key="AzureArtifacts" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json" protocolVersion="3" /> |     <add key="AzureArtifacts" value="https://pkgs.dev.azure.com/amullans/_packaging/GitHubBuilds/nuget/v3/index.json" protocolVersion="3" /> | ||||||
|  | |||||||
| @ -1,19 +1,19 @@ | |||||||
|  | import cscFile from '../.github/csc.json'; | ||||||
| describe('csc tests', () => { | describe('csc tests', () => { | ||||||
|   it('Valid regular expression', async () => { |   it('Valid regular expression', async () => { | ||||||
|     var cscFile = require('../.github/csc.json'); |     const regex = cscFile['problemMatcher'][0]['pattern'][0]['regexp']; | ||||||
|     var regex = cscFile['problemMatcher'][0]['pattern'][0]['regexp']; |  | ||||||
| 
 | 
 | ||||||
|     console.log(regex); |     console.log(regex); | ||||||
|     var re = new RegExp(regex); |     const re = new RegExp(regex); | ||||||
| 
 | 
 | ||||||
|     // Ideally we would verify that this
 |     // Ideally we would verify that this
 | ||||||
|     var stringsToMatch = [ |     const stringsToMatch = [ | ||||||
|       'Program.cs(10,79): error CS1002: ; expected [/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj]', |       'Program.cs(10,79): error CS1002: ; expected [/Users/zacharyeisinger/Documents/repo/setup-dotnet/__tests__/sample-broken-csproj/sample.csproj]', | ||||||
|       "S:\\Msbuild\\src\\Build\\Evaluation\\ExpressionShredder.cs(33,7): error CS1003: Syntax error, ',' expected [S:\\msbuild\\src\\Build\\Microsoft.Build.csproj > Properties:prop]" |       "S:\\Msbuild\\src\\Build\\Evaluation\\ExpressionShredder.cs(33,7): error CS1003: Syntax error, ',' expected [S:\\msbuild\\src\\Build\\Microsoft.Build.csproj > Properties:prop]" | ||||||
|     ]; |     ]; | ||||||
| 
 | 
 | ||||||
|     stringsToMatch.forEach(string => { |     stringsToMatch.forEach(string => { | ||||||
|       var matchStr = string.match(re); |       const matchStr = string.match(re); | ||||||
|       console.log(matchStr); |       console.log(matchStr); | ||||||
|       expect(matchStr).toEqual(expect.anything()); |       expect(matchStr).toEqual(expect.anything()); | ||||||
|     }); |     }); | ||||||
|  | |||||||
| @ -68,8 +68,8 @@ describe('DotnetCoreInstaller tests', () => { | |||||||
|       expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true); |       expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     expect(process.env.DOTNET_ROOT).toBeDefined; |     expect(process.env.DOTNET_ROOT).toBeDefined(); | ||||||
|     expect(process.env.PATH).toBeDefined; |     expect(process.env.PATH).toBeDefined(); | ||||||
|     expect(process.env.DOTNET_ROOT).toBe(toolDir); |     expect(process.env.DOTNET_ROOT).toBe(toolDir); | ||||||
|     expect(process.env.PATH?.startsWith(toolDir)).toBe(true); |     expect(process.env.PATH?.startsWith(toolDir)).toBe(true); | ||||||
|   }, 600000); |   }, 600000); | ||||||
| @ -83,15 +83,15 @@ describe('DotnetCoreInstaller tests', () => { | |||||||
|       expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true); |       expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     expect(process.env.DOTNET_ROOT).toBeDefined; |     expect(process.env.DOTNET_ROOT).toBeDefined(); | ||||||
|     expect(process.env.PATH).toBeDefined; |     expect(process.env.PATH).toBeDefined(); | ||||||
|     expect(process.env.DOTNET_ROOT).toBe(toolDir); |     expect(process.env.DOTNET_ROOT).toBe(toolDir); | ||||||
|     expect(process.env.PATH?.startsWith(toolDir)).toBe(true); |     expect(process.env.PATH?.startsWith(toolDir)).toBe(true); | ||||||
|   }, 600000); //This needs some time to download on "slower" internet connections
 |   }, 600000); //This needs some time to download on "slower" internet connections
 | ||||||
| 
 | 
 | ||||||
|   it('Acquires generic version of dotnet if no matching version is installed', async () => { |   it('Acquires generic version of dotnet if no matching version is installed', async () => { | ||||||
|     await getDotnet('3.1'); |     await getDotnet('3.1'); | ||||||
|     var directory = fs |     const directory = fs | ||||||
|       .readdirSync(path.join(toolDir, 'sdk')) |       .readdirSync(path.join(toolDir, 'sdk')) | ||||||
|       .filter(fn => fn.startsWith('3.1.')); |       .filter(fn => fn.startsWith('3.1.')); | ||||||
|     expect(directory.length > 0).toBe(true); |     expect(directory.length > 0).toBe(true); | ||||||
| @ -101,17 +101,16 @@ describe('DotnetCoreInstaller tests', () => { | |||||||
|       expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true); |       expect(fs.existsSync(path.join(toolDir, 'dotnet'))).toBe(true); | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     expect(process.env.DOTNET_ROOT).toBeDefined; |     expect(process.env.DOTNET_ROOT).toBeDefined(); | ||||||
|     expect(process.env.PATH).toBeDefined; |     expect(process.env.PATH).toBeDefined(); | ||||||
|     expect(process.env.DOTNET_ROOT).toBe(toolDir); |     expect(process.env.DOTNET_ROOT).toBe(toolDir); | ||||||
|     expect(process.env.PATH?.startsWith(toolDir)).toBe(true); |     expect(process.env.PATH?.startsWith(toolDir)).toBe(true); | ||||||
|   }, 600000); //This needs some time to download on "slower" internet connections
 |   }, 600000); //This needs some time to download on "slower" internet connections
 | ||||||
| 
 | 
 | ||||||
|   it('Returns string with installed SDK version', async () => { |   it('Returns string with installed SDK version', async () => { | ||||||
|     const version = '3.1.120'; |     const version = '3.1.120'; | ||||||
|     let installedVersion: string; |  | ||||||
| 
 | 
 | ||||||
|     installedVersion = await getDotnet(version); |     const installedVersion = await getDotnet(version); | ||||||
| 
 | 
 | ||||||
|     expect(installedVersion).toBe('3.1.120'); |     expect(installedVersion).toBe('3.1.120'); | ||||||
|   }, 600000); |   }, 600000); | ||||||
| @ -143,7 +142,7 @@ describe('DotnetCoreInstaller tests', () => { | |||||||
|   }, 30000); |   }, 30000); | ||||||
| 
 | 
 | ||||||
|   it('Uses an up to date powershell download script', async () => { |   it('Uses an up to date powershell download script', async () => { | ||||||
|     var httpCallbackClient = new hc.HttpClient('setup-dotnet-test', [], { |     const httpCallbackClient = new hc.HttpClient('setup-dotnet-test', [], { | ||||||
|       allowRetries: true, |       allowRetries: true, | ||||||
|       maxRetries: 3 |       maxRetries: 3 | ||||||
|     }); |     }); | ||||||
| @ -180,7 +179,7 @@ describe('DotnetVersionResolver tests', () => { | |||||||
|       ); |       ); | ||||||
|       const versionObject = await dotnetVersionResolver.createDotNetVersion(); |       const versionObject = await dotnetVersionResolver.createDotNetVersion(); | ||||||
| 
 | 
 | ||||||
|       expect(!!versionObject.value).toBeTruthy; |       expect(!!versionObject.value).toBe(true); | ||||||
|     } |     } | ||||||
|   ); |   ); | ||||||
| 
 | 
 | ||||||
| @ -223,15 +222,27 @@ describe('DotnetVersionResolver tests', () => { | |||||||
|   ); |   ); | ||||||
| 
 | 
 | ||||||
|   each(['3.1', '3.1.x', '3.1.*', '3.1.X']).test( |   each(['3.1', '3.1.x', '3.1.*', '3.1.X']).test( | ||||||
|     "if version: '%s' that can be resolved to 'channel' option is supplied, it should set quality flag to 'true' and type to 'channel' in version object", |     "if version: '%s' that can be resolved to 'channel' option is supplied, it should set type to 'channel' in version object", | ||||||
|     async version => { |     async version => { | ||||||
|       const dotnetVersionResolver = new installer.DotnetVersionResolver( |       const dotnetVersionResolver = new installer.DotnetVersionResolver( | ||||||
|         version |         version | ||||||
|       ); |       ); | ||||||
|       const versionObject = await dotnetVersionResolver.createDotNetVersion(); |       const versionObject = await dotnetVersionResolver.createDotNetVersion(); | ||||||
| 
 | 
 | ||||||
|       expect(versionObject.type.toLowerCase().includes('channel')).toBeTruthy; |       expect(versionObject.type.toLowerCase().includes('channel')).toBe(true); | ||||||
|       expect(versionObject.qualityFlag).toBeTruthy; |     } | ||||||
|  |   ); | ||||||
|  | 
 | ||||||
|  |   each(['6.0', '6.0.x', '6.0.*', '6.0.X']).test( | ||||||
|  |     "if version: '%s' that can be resolved to 'channel' option is supplied and its major tag is >= 6, it should set type to 'channel' and qualityFlag to 'true' in version object", | ||||||
|  |     async version => { | ||||||
|  |       const dotnetVersionResolver = new installer.DotnetVersionResolver( | ||||||
|  |         version | ||||||
|  |       ); | ||||||
|  |       const versionObject = await dotnetVersionResolver.createDotNetVersion(); | ||||||
|  | 
 | ||||||
|  |       expect(versionObject.type.toLowerCase().includes('channel')).toBe(true); | ||||||
|  |       expect(versionObject.qualityFlag).toBe(true); | ||||||
|     } |     } | ||||||
|   ); |   ); | ||||||
| 
 | 
 | ||||||
| @ -243,8 +254,8 @@ describe('DotnetVersionResolver tests', () => { | |||||||
|       ); |       ); | ||||||
|       const versionObject = await dotnetVersionResolver.createDotNetVersion(); |       const versionObject = await dotnetVersionResolver.createDotNetVersion(); | ||||||
| 
 | 
 | ||||||
|       expect(versionObject.type.toLowerCase().includes('version')).toBeTruthy; |       expect(versionObject.type.toLowerCase().includes('version')).toBe(true); | ||||||
|       expect(versionObject.qualityFlag).toBeFalsy; |       expect(versionObject.qualityFlag).toBe(false); | ||||||
|     } |     } | ||||||
|   ); |   ); | ||||||
| 
 | 
 | ||||||
| @ -259,11 +270,11 @@ describe('DotnetVersionResolver tests', () => { | |||||||
|       const nonWindowsRegEx = new RegExp(/^--[vc]/); |       const nonWindowsRegEx = new RegExp(/^--[vc]/); | ||||||
| 
 | 
 | ||||||
|       if (IS_WINDOWS) { |       if (IS_WINDOWS) { | ||||||
|         expect(windowsRegEx.test(versionObject.type)).toBeTruthy; |         expect(windowsRegEx.test(versionObject.type)).toBe(true); | ||||||
|         expect(nonWindowsRegEx.test(versionObject.type)).toBeFalsy; |         expect(nonWindowsRegEx.test(versionObject.type)).toBe(false); | ||||||
|       } else { |       } else { | ||||||
|         expect(nonWindowsRegEx.test(versionObject.type)).toBeTruthy; |         expect(nonWindowsRegEx.test(versionObject.type)).toBe(true); | ||||||
|         expect(windowsRegEx.test(versionObject.type)).toBeFalsy; |         expect(windowsRegEx.test(versionObject.type)).toBe(false); | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|   ); |   ); | ||||||
| @ -276,10 +287,7 @@ function normalizeFileContents(contents: string): string { | |||||||
|     .replace(new RegExp('\r', 'g'), '\n'); |     .replace(new RegExp('\r', 'g'), '\n'); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| async function getDotnet( | async function getDotnet(version: string, quality = ''): Promise<string> { | ||||||
|   version: string, |  | ||||||
|   quality: string = '' |  | ||||||
| ): Promise<string> { |  | ||||||
|   const dotnetInstaller = new installer.DotnetCoreInstaller( |   const dotnetInstaller = new installer.DotnetCoreInstaller( | ||||||
|     version, |     version, | ||||||
|     quality as QualityOptions |     quality as QualityOptions | ||||||
|  | |||||||
| @ -21,11 +21,11 @@ if (IS_WINDOWS) { | |||||||
| const tempDir = path.join(__dirname, 'runner', 'temp2'); | const tempDir = path.join(__dirname, 'runner', 'temp2'); | ||||||
| 
 | 
 | ||||||
| describe('setup-dotnet tests', () => { | describe('setup-dotnet tests', () => { | ||||||
|   let getInputSpy = jest.spyOn(core, 'getInput'); |   const getInputSpy = jest.spyOn(core, 'getInput'); | ||||||
|   let getMultilineInputSpy = jest.spyOn(core, 'getMultilineInput'); |   const getMultilineInputSpy = jest.spyOn(core, 'getMultilineInput'); | ||||||
|   let setOutputSpy = jest.spyOn(core, 'setOutput'); |   const setOutputSpy = jest.spyOn(core, 'setOutput'); | ||||||
| 
 | 
 | ||||||
|   let inputs = {} as any; |   const inputs = {} as any; | ||||||
| 
 | 
 | ||||||
|   beforeAll(async () => { |   beforeAll(async () => { | ||||||
|     process.env.RUNNER_TOOL_CACHE = toolDir; |     process.env.RUNNER_TOOL_CACHE = toolDir; | ||||||
| @ -74,7 +74,7 @@ describe('setup-dotnet tests', () => { | |||||||
| 
 | 
 | ||||||
|     await setup.run(); |     await setup.run(); | ||||||
| 
 | 
 | ||||||
|     expect(setOutputSpy).toBeCalledWith('dotnet-version', '6.0.401'); |     expect(setOutputSpy).toHaveBeenCalledWith('dotnet-version', '6.0.401'); | ||||||
|   }, 400000); |   }, 400000); | ||||||
| 
 | 
 | ||||||
|   it("Sets output with the version specified in global.json, if it's present", async () => { |   it("Sets output with the version specified in global.json, if it's present", async () => { | ||||||
| @ -93,6 +93,6 @@ describe('setup-dotnet tests', () => { | |||||||
| 
 | 
 | ||||||
|     await setup.run(); |     await setup.run(); | ||||||
| 
 | 
 | ||||||
|     expect(setOutputSpy).toBeCalledWith('dotnet-version', '3.0.103'); |     expect(setOutputSpy).toHaveBeenCalledWith('dotnet-version', '3.0.103'); | ||||||
|   }, 400000); |   }, 400000); | ||||||
| }); | }); | ||||||
|  | |||||||
							
								
								
									
										18
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							| @ -45,7 +45,7 @@ function configAuthentication(feedUrl, existingFileLocation = '', processRoot = | |||||||
| } | } | ||||||
| exports.configAuthentication = configAuthentication; | exports.configAuthentication = configAuthentication; | ||||||
| function isValidKey(key) { | function isValidKey(key) { | ||||||
|     return /^[\w\-\.]+$/i.test(key); |     return /^[\w\-.]+$/i.test(key); | ||||||
| } | } | ||||||
| function getExistingNugetConfig(processRoot) { | function getExistingNugetConfig(processRoot) { | ||||||
|     const defaultConfigName = 'nuget.config'; |     const defaultConfigName = 'nuget.config'; | ||||||
| @ -60,9 +60,9 @@ function getExistingNugetConfig(processRoot) { | |||||||
| function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) { | function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) { | ||||||
|     var _a, _b; |     var _a, _b; | ||||||
|     core.info(`dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}`); |     core.info(`dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}`); | ||||||
|     let sourceKeys = []; |     const sourceKeys = []; | ||||||
|     let owner = core.getInput('owner'); |     let owner = core.getInput('owner'); | ||||||
|     let sourceUrl = feedUrl; |     const sourceUrl = feedUrl; | ||||||
|     if (!owner) { |     if (!owner) { | ||||||
|         owner = github.context.repo.owner; |         owner = github.context.repo.owner; | ||||||
|     } |     } | ||||||
| @ -132,7 +132,7 @@ function writeFeedToFile(feedUrl, existingFileLocation, tempFileLocation) { | |||||||
|         } |         } | ||||||
|     ]; |     ]; | ||||||
|     if (!sourceKeys.length) { |     if (!sourceKeys.length) { | ||||||
|         let keystring = 'Source'; |         const keystring = 'Source'; | ||||||
|         xmlSource[1].configuration.push({ |         xmlSource[1].configuration.push({ | ||||||
|             packageSources: [ |             packageSources: [ | ||||||
|                 { |                 { | ||||||
| @ -300,9 +300,9 @@ class DotnetVersionResolver { | |||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             const response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl); |             const response = yield httpClient.getJson(DotnetVersionResolver.DotNetCoreIndexUrl); | ||||||
|             const result = response.result || {}; |             const result = response.result || {}; | ||||||
|             let releasesInfo = result['releases-index']; |             const releasesInfo = result['releases-index']; | ||||||
|             let releaseInfo = releasesInfo.find(info => { |             const releaseInfo = releasesInfo.find(info => { | ||||||
|                 let sdkParts = info['channel-version'].split('.'); |                 const sdkParts = info['channel-version'].split('.'); | ||||||
|                 return sdkParts[0] === versionParts[0]; |                 return sdkParts[0] === versionParts[0]; | ||||||
|             }); |             }); | ||||||
|             if (!releaseInfo) { |             if (!releaseInfo) { | ||||||
| @ -408,8 +408,8 @@ class DotnetCoreInstaller { | |||||||
|     outputDotnetVersion(version) { |     outputDotnetVersion(version) { | ||||||
|         return __awaiter(this, void 0, void 0, function* () { |         return __awaiter(this, void 0, void 0, function* () { | ||||||
|             const installationPath = process.env['DOTNET_INSTALL_DIR']; |             const installationPath = process.env['DOTNET_INSTALL_DIR']; | ||||||
|             let versionsOnRunner = yield (0, promises_1.readdir)(path_1.default.join(installationPath.replace(/'/g, ''), 'sdk')); |             const versionsOnRunner = yield (0, promises_1.readdir)(path_1.default.join(installationPath.replace(/'/g, ''), 'sdk')); | ||||||
|             let installedVersion = semver_1.default.maxSatisfying(versionsOnRunner, version, { |             const installedVersion = semver_1.default.maxSatisfying(versionsOnRunner, version, { | ||||||
|                 includePrerelease: true |                 includePrerelease: true | ||||||
|             }); |             }); | ||||||
|             return installedVersion; |             return installedVersion; | ||||||
|  | |||||||
| @ -61,6 +61,7 @@ Pull requests are the easiest way to contribute changes to git repos at GitHub. | |||||||
| 
 | 
 | ||||||
| - To implement new features or fix bugs, you need to make changes to the `.ts` files, which are located in the `src` folder | - To implement new features or fix bugs, you need to make changes to the `.ts` files, which are located in the `src` folder | ||||||
| - To comply with the code style, **you need to run the `format` script** | - To comply with the code style, **you need to run the `format` script** | ||||||
|  | - To lint the code, **you need to run the `lint:fix` script** | ||||||
| - To transpile source code to `javascript` we use [NCC](https://github.com/vercel/ncc). **It is very important to run the `build` script after making changes**, otherwise your changes will not get into the final `javascript` build | - To transpile source code to `javascript` we use [NCC](https://github.com/vercel/ncc). **It is very important to run the `build` script after making changes**, otherwise your changes will not get into the final `javascript` build | ||||||
| 
 | 
 | ||||||
| **Learn more about how to implement tests:** | **Learn more about how to implement tests:** | ||||||
|  | |||||||
							
								
								
									
										2137
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										2137
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										14
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								package.json
									
									
									
									
									
								
							| @ -6,9 +6,10 @@ | |||||||
|   "main": "lib/setup-dotnet.js", |   "main": "lib/setup-dotnet.js", | ||||||
|   "scripts": { |   "scripts": { | ||||||
|     "build": "tsc && ncc build", |     "build": "tsc && ncc build", | ||||||
|     "format": "prettier --write **/*.ts", |     "format": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --write **/*.{ts,yml,yaml}", | ||||||
|     "format-check": "prettier --check **/*.ts", |     "format-check": "prettier --no-error-on-unmatched-pattern --config ./.prettierrc.js --check **/*.{ts,yml,yaml}", | ||||||
|     "lint": "echo \"Fake command that does nothing. It is used in reusable workflows\"", |     "lint": "eslint --config ./.eslintrc.js **/*.ts", | ||||||
|  |     "lint:fix": "eslint --config ./.eslintrc.js **/*.ts --fix", | ||||||
|     "prepare": "husky install", |     "prepare": "husky install", | ||||||
|     "test": "jest --coverage --config ./jest.config.js", |     "test": "jest --coverage --config ./jest.config.js", | ||||||
|     "update-installers": "nwget https://dot.net/v1/dotnet-install.ps1 -O externals/install-dotnet.ps1 && nwget https://dot.net/v1/dotnet-install.sh -O externals/install-dotnet.sh" |     "update-installers": "nwget https://dot.net/v1/dotnet-install.ps1 -O externals/install-dotnet.ps1 && nwget https://dot.net/v1/dotnet-install.sh -O externals/install-dotnet.sh" | ||||||
| @ -37,11 +38,16 @@ | |||||||
|     "@types/jest": "^27.0.2", |     "@types/jest": "^27.0.2", | ||||||
|     "@types/node": "^16.11.25", |     "@types/node": "^16.11.25", | ||||||
|     "@types/semver": "^6.2.2", |     "@types/semver": "^6.2.2", | ||||||
|  |     "@typescript-eslint/eslint-plugin": "^5.54.0", | ||||||
|  |     "@typescript-eslint/parser": "^5.54.0", | ||||||
|     "@vercel/ncc": "^0.33.4", |     "@vercel/ncc": "^0.33.4", | ||||||
|  |     "eslint": "^8.35.0", | ||||||
|  |     "eslint-config-prettier": "^8.6.0", | ||||||
|  |     "eslint-plugin-jest": "^27.2.1", | ||||||
|     "husky": "^8.0.1", |     "husky": "^8.0.1", | ||||||
|     "jest": "^27.2.5", |     "jest": "^27.2.5", | ||||||
|     "jest-circus": "^27.2.5", |     "jest-circus": "^27.2.5", | ||||||
|     "prettier": "^2.7.1", |     "prettier": "^2.8.4", | ||||||
|     "ts-jest": "^27.0.5", |     "ts-jest": "^27.0.5", | ||||||
|     "typescript": "^4.8.4", |     "typescript": "^4.8.4", | ||||||
|     "wget-improved": "^3.2.1" |     "wget-improved": "^3.2.1" | ||||||
|  | |||||||
| @ -6,7 +6,7 @@ import {XMLParser, XMLBuilder} from 'fast-xml-parser'; | |||||||
| 
 | 
 | ||||||
| export function configAuthentication( | export function configAuthentication( | ||||||
|   feedUrl: string, |   feedUrl: string, | ||||||
|   existingFileLocation: string = '', |   existingFileLocation = '', | ||||||
|   processRoot: string = process.cwd() |   processRoot: string = process.cwd() | ||||||
| ) { | ) { | ||||||
|   const existingNuGetConfig: string = path.resolve( |   const existingNuGetConfig: string = path.resolve( | ||||||
| @ -26,7 +26,7 @@ export function configAuthentication( | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function isValidKey(key: string): boolean { | function isValidKey(key: string): boolean { | ||||||
|   return /^[\w\-\.]+$/i.test(key); |   return /^[\w\-.]+$/i.test(key); | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function getExistingNugetConfig(processRoot: string) { | function getExistingNugetConfig(processRoot: string) { | ||||||
| @ -48,9 +48,9 @@ function writeFeedToFile( | |||||||
|   core.info( |   core.info( | ||||||
|     `dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}` |     `dotnet-auth: Finding any source references in ${existingFileLocation}, writing a new temporary configuration file with credentials to ${tempFileLocation}` | ||||||
|   ); |   ); | ||||||
|   let sourceKeys: string[] = []; |   const sourceKeys: string[] = []; | ||||||
|   let owner: string = core.getInput('owner'); |   let owner: string = core.getInput('owner'); | ||||||
|   let sourceUrl: string = feedUrl; |   const sourceUrl: string = feedUrl; | ||||||
|   if (!owner) { |   if (!owner) { | ||||||
|     owner = github.context.repo.owner; |     owner = github.context.repo.owner; | ||||||
|   } |   } | ||||||
| @ -130,7 +130,7 @@ function writeFeedToFile( | |||||||
|   ]; |   ]; | ||||||
| 
 | 
 | ||||||
|   if (!sourceKeys.length) { |   if (!sourceKeys.length) { | ||||||
|     let keystring = 'Source'; |     const keystring = 'Source'; | ||||||
| 
 | 
 | ||||||
|     xmlSource[1].configuration.push({ |     xmlSource[1].configuration.push({ | ||||||
|       packageSources: [ |       packageSources: [ | ||||||
|  | |||||||
| @ -88,10 +88,10 @@ export class DotnetVersionResolver { | |||||||
|       DotnetVersionResolver.DotNetCoreIndexUrl |       DotnetVersionResolver.DotNetCoreIndexUrl | ||||||
|     ); |     ); | ||||||
|     const result = response.result || {}; |     const result = response.result || {}; | ||||||
|     let releasesInfo: any[] = result['releases-index']; |     const releasesInfo: any[] = result['releases-index']; | ||||||
| 
 | 
 | ||||||
|     let releaseInfo = releasesInfo.find(info => { |     const releaseInfo = releasesInfo.find(info => { | ||||||
|       let sdkParts: string[] = info['channel-version'].split('.'); |       const sdkParts: string[] = info['channel-version'].split('.'); | ||||||
|       return sdkParts[0] === versionParts[0]; |       return sdkParts[0] === versionParts[0]; | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
| @ -106,7 +106,7 @@ export class DotnetVersionResolver { | |||||||
|     return releaseInfo['channel-version']; |     return releaseInfo['channel-version']; | ||||||
|   } |   } | ||||||
| 
 | 
 | ||||||
|   static DotNetCoreIndexUrl: string = |   static DotNetCoreIndexUrl = | ||||||
|     'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json'; |     'https://dotnetcli.azureedge.net/dotnet/release-metadata/releases-index.json'; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| @ -252,11 +252,11 @@ export class DotnetCoreInstaller { | |||||||
| 
 | 
 | ||||||
|   private async outputDotnetVersion(version): Promise<string> { |   private async outputDotnetVersion(version): Promise<string> { | ||||||
|     const installationPath = process.env['DOTNET_INSTALL_DIR']!; |     const installationPath = process.env['DOTNET_INSTALL_DIR']!; | ||||||
|     let versionsOnRunner: string[] = await readdir( |     const versionsOnRunner: string[] = await readdir( | ||||||
|       path.join(installationPath.replace(/'/g, ''), 'sdk') |       path.join(installationPath.replace(/'/g, ''), 'sdk') | ||||||
|     ); |     ); | ||||||
| 
 | 
 | ||||||
|     let installedVersion = semver.maxSatisfying(versionsOnRunner, version, { |     const installedVersion = semver.maxSatisfying(versionsOnRunner, version, { | ||||||
|       includePrerelease: true |       includePrerelease: true | ||||||
|     })!; |     })!; | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -13,7 +13,7 @@ const qualityOptions = [ | |||||||
|   'ga' |   'ga' | ||||||
| ] as const; | ] as const; | ||||||
| 
 | 
 | ||||||
| export type QualityOptions = typeof qualityOptions[number]; | export type QualityOptions = (typeof qualityOptions)[number]; | ||||||
| 
 | 
 | ||||||
| export async function run() { | export async function run() { | ||||||
|   try { |   try { | ||||||
| @ -100,7 +100,7 @@ export async function run() { | |||||||
| } | } | ||||||
| 
 | 
 | ||||||
| function getVersionFromGlobalJson(globalJsonPath: string): string { | function getVersionFromGlobalJson(globalJsonPath: string): string { | ||||||
|   let version: string = ''; |   let version = ''; | ||||||
|   const globalJson = JSON.parse( |   const globalJson = JSON.parse( | ||||||
|     // .trim() is necessary to strip BOM https://github.com/nodejs/node/issues/20649
 |     // .trim() is necessary to strip BOM https://github.com/nodejs/node/issues/20649
 | ||||||
|     fs.readFileSync(globalJsonPath, {encoding: 'utf8'}).trim() |     fs.readFileSync(globalJsonPath, {encoding: 'utf8'}).trim() | ||||||
|  | |||||||
| @ -49,7 +49,8 @@ | |||||||
|     // "typeRoots": [],                       /* List of folders to include type definitions from. */ |     // "typeRoots": [],                       /* List of folders to include type definitions from. */ | ||||||
|     // "types": [],                           /* Type declaration files to be included in compilation. */ |     // "types": [],                           /* Type declaration files to be included in compilation. */ | ||||||
|     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ |     // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */ | ||||||
|     "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ |     "esModuleInterop": true,                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */ | ||||||
|  |     "resolveJsonModule": true,                /* Allows importing modules with a '.json' extension, which is a common practice in node projects. */ | ||||||
|     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */ |     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */ | ||||||
|     // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */ |     // "allowUmdGlobalAccess": true,          /* Allow accessing UMD globals from modules. */ | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user