mirror of
				https://github.com/actions/setup-dotnet.git
				synced 2025-10-31 19:33:45 +00:00 
			
		
		
		
	Merge branch 'actions:main' into update-contributors-guide
This commit is contained in:
		
						commit
						2f75d1de25
					
				
							
								
								
									
										2
									
								
								.github/workflows/check-dist.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/check-dist.yml
									
									
									
									
										vendored
									
									
								
							| @ -30,7 +30,7 @@ jobs: | ||||
|           cache: npm | ||||
| 
 | ||||
|       - name: Install dependencies | ||||
|         run: npm ci | ||||
|         run: npm ci --ignore-scripts | ||||
| 
 | ||||
|       - name: Rebuild the dist/ directory | ||||
|         run: npm run build | ||||
|  | ||||
							
								
								
									
										2
									
								
								.github/workflows/licensed.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/licensed.yml
									
									
									
									
										vendored
									
									
								
							| @ -15,7 +15,7 @@ jobs: | ||||
|     name: Check licenses | ||||
|     steps: | ||||
|       - uses: actions/checkout@v3 | ||||
|       - run: npm ci | ||||
|       - run: npm ci --ignore-scripts | ||||
|       - name: Install licensed | ||||
|         run: | | ||||
|           cd $RUNNER_TEMP | ||||
|  | ||||
							
								
								
									
										12
									
								
								.github/workflows/workflow.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										12
									
								
								.github/workflows/workflow.yml
									
									
									
									
										vendored
									
									
								
							| @ -26,14 +26,14 @@ jobs: | ||||
|       with: | ||||
|         node-version: 16.x | ||||
|         cache: npm | ||||
|     - run: npm ci | ||||
|     - run: npm ci --ignore-scripts | ||||
|     - run: npm run build | ||||
|     - run: npm run format-check | ||||
|     - run: npm test | ||||
|     - name: Verify no unstaged changes | ||||
|       if: runner.os != 'windows' | ||||
|       run: __tests__/verify-no-unstaged-changes.sh | ||||
|    | ||||
| 
 | ||||
|   test-setup-multiple-versions: | ||||
|     runs-on: ${{ matrix.operating-system }} | ||||
|     strategy: | ||||
| @ -50,9 +50,9 @@ jobs: | ||||
|         uses: ./ | ||||
|         with: | ||||
|           dotnet-version: | | ||||
|              2.2.402 | ||||
|              3.1.404 | ||||
|              3.0.x | ||||
|             2.2.402 | ||||
|             3.1.404 | ||||
|             3.0.x | ||||
|       - name: Verify dotnet | ||||
|         shell: pwsh | ||||
|         run: __tests__/verify-dotnet.ps1 2.2.402 3.1.404 '3.0' | ||||
| @ -114,7 +114,7 @@ jobs: | ||||
|       - name: Verify dotnet | ||||
|         shell: pwsh | ||||
|         run: __tests__/verify-dotnet.ps1 3.1 2.2 | ||||
|    | ||||
| 
 | ||||
|   test-setup-latest-patch-version: | ||||
|     runs-on: ${{ matrix.operating-system }} | ||||
|     strategy: | ||||
|  | ||||
							
								
								
									
										4
									
								
								.husky/pre-commit
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										4
									
								
								.husky/pre-commit
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,4 @@ | ||||
| #!/usr/bin/env sh | ||||
| . "$(dirname -- "$0")/_/husky.sh" | ||||
| 
 | ||||
| npm run format | ||||
							
								
								
									
										5
									
								
								.husky/pre-push
									
									
									
									
									
										Executable file
									
								
							
							
						
						
									
										5
									
								
								.husky/pre-push
									
									
									
									
									
										Executable file
									
								
							| @ -0,0 +1,5 @@ | ||||
| #!/usr/bin/env sh | ||||
| . "$(dirname -- "$0")/_/husky.sh" | ||||
| 
 | ||||
| # Tests are not run at push time since they can take 2-4 minutes to complete | ||||
| npm run format-check | ||||
| @ -16,6 +16,7 @@ describe('setup-dotnet tests', () => { | ||||
|     process.env.RUNNER_TOOL_CACHE = toolDir; | ||||
|     process.env.DOTNET_INSTALL_DIR = toolDir; | ||||
|     process.env.RUNNER_TEMP = tempDir; | ||||
|     process.env['INPUT_INCLUDE-PRERELEASE'] = 'false'; | ||||
|     await io.rmRF(toolDir); | ||||
|     await io.rmRF(tempDir); | ||||
|   }); | ||||
|  | ||||
| @ -18,6 +18,7 @@ inputs: | ||||
|   include-prerelease: | ||||
|     description: 'Whether prerelease versions should be matched with non-exact versions (for example 5.0.0-preview.6 being matched by 5, 5.0, 5.x or 5.0.x). Defaults to false if not provided.' | ||||
|     required: False | ||||
|     default: 'false' | ||||
| runs: | ||||
|   using: 'node16' | ||||
|   main: 'dist/index.js' | ||||
|  | ||||
							
								
								
									
										3
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								dist/index.js
									
									
									
									
										vendored
									
									
								
							| @ -478,8 +478,7 @@ function run() { | ||||
|                 } | ||||
|             } | ||||
|             if (versions.length) { | ||||
|                 const includePrerelease = (core.getInput('include-prerelease') || 'false').toLowerCase() === | ||||
|                     'true'; | ||||
|                 const includePrerelease = core.getBooleanInput('include-prerelease'); | ||||
|                 let dotnetInstaller; | ||||
|                 for (const version of new Set(versions)) { | ||||
|                     dotnetInstaller = new installer.DotnetCoreInstaller(version, includePrerelease); | ||||
|  | ||||
							
								
								
									
										16
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							
							
						
						
									
										16
									
								
								package-lock.json
									
									
									
										generated
									
									
									
								
							| @ -23,7 +23,7 @@ | ||||
|         "@types/node": "^16.11.25", | ||||
|         "@types/semver": "^6.2.2", | ||||
|         "@vercel/ncc": "^0.33.4", | ||||
|         "husky": "^7.0.2", | ||||
|         "husky": "^8.0.1", | ||||
|         "jest": "^27.2.5", | ||||
|         "jest-circus": "^27.2.5", | ||||
|         "prettier": "^1.19.1", | ||||
| @ -2305,15 +2305,15 @@ | ||||
|       } | ||||
|     }, | ||||
|     "node_modules/husky": { | ||||
|       "version": "7.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz", | ||||
|       "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==", | ||||
|       "version": "8.0.1", | ||||
|       "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", | ||||
|       "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", | ||||
|       "dev": true, | ||||
|       "bin": { | ||||
|         "husky": "lib/bin.js" | ||||
|       }, | ||||
|       "engines": { | ||||
|         "node": ">=12" | ||||
|         "node": ">=14" | ||||
|       }, | ||||
|       "funding": { | ||||
|         "url": "https://github.com/sponsors/typicode" | ||||
| @ -6645,9 +6645,9 @@ | ||||
|       "dev": true | ||||
|     }, | ||||
|     "husky": { | ||||
|       "version": "7.0.2", | ||||
|       "resolved": "https://registry.npmjs.org/husky/-/husky-7.0.2.tgz", | ||||
|       "integrity": "sha512-8yKEWNX4z2YsofXAMT7KvA1g8p+GxtB1ffV8XtpAEGuXNAbCV5wdNKH+qTpw8SM9fh4aMPDR+yQuKfgnreyZlg==", | ||||
|       "version": "8.0.1", | ||||
|       "resolved": "https://registry.npmjs.org/husky/-/husky-8.0.1.tgz", | ||||
|       "integrity": "sha512-xs7/chUH/CKdOCs7Zy0Aev9e/dKOMZf3K1Az1nar3tzlv0jfqnYtu235bstsWTmXOR0EfINrPa97yy4Lz6RiKw==", | ||||
|       "dev": true | ||||
|     }, | ||||
|     "iconv-lite": { | ||||
|  | ||||
							
								
								
									
										10
									
								
								package.json
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								package.json
									
									
									
									
									
								
							| @ -8,16 +8,10 @@ | ||||
|     "build": "tsc && ncc build", | ||||
|     "format": "prettier --write **/*.ts", | ||||
|     "format-check": "prettier --check **/*.ts", | ||||
|     "prepare": "husky install", | ||||
|     "test": "jest", | ||||
|     "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" | ||||
|   }, | ||||
|   "husky": { | ||||
|     "hooks": { | ||||
|       "//": "Tests are not run at push time since they can take 2-4 minutes to complete", | ||||
|       "pre-commit": "npm run format", | ||||
|       "pre-push": "npm run format-check" | ||||
|     } | ||||
|   }, | ||||
|   "repository": { | ||||
|     "type": "git", | ||||
|     "url": "git+https://github.com/actions/setup-dotnet.git" | ||||
| @ -44,7 +38,7 @@ | ||||
|     "@types/node": "^16.11.25", | ||||
|     "@types/semver": "^6.2.2", | ||||
|     "@vercel/ncc": "^0.33.4", | ||||
|     "husky": "^7.0.2", | ||||
|     "husky": "^8.0.1", | ||||
|     "jest": "^27.2.5", | ||||
|     "jest-circus": "^27.2.5", | ||||
|     "prettier": "^1.19.1", | ||||
|  | ||||
| @ -38,9 +38,9 @@ export async function run() { | ||||
|     } | ||||
| 
 | ||||
|     if (versions.length) { | ||||
|       const includePrerelease: boolean = | ||||
|         (core.getInput('include-prerelease') || 'false').toLowerCase() === | ||||
|         'true'; | ||||
|       const includePrerelease: boolean = core.getBooleanInput( | ||||
|         'include-prerelease' | ||||
|       ); | ||||
|       let dotnetInstaller!: installer.DotnetCoreInstaller; | ||||
|       for (const version of new Set<string>(versions)) { | ||||
|         dotnetInstaller = new installer.DotnetCoreInstaller( | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user