Fix informational and debug messages

IvanZosimov · IvanZosimov · commit 38b49fb71788 · 2023-05-18T12:39:22.000+02:00
diff --git a/__tests__/installer.test.ts b/__tests__/installer.test.ts
@@ -119,7 +119,7 @@ describe('installer tests', () => {
         await dotnetInstaller.installDotnet();
 
         expect(warningSpy).toHaveBeenCalledWith(
-          `'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A and A.x formats where the major tag is higher than 5. You specified: ${inputVersion}. 'dotnet-quality' input is ignored.`
+          `The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${inputVersion}. 'dotnet-quality' input is ignored.`
         );
       });
 
@@ -145,7 +145,7 @@ describe('installer tests', () => {
         await dotnetInstaller.installDotnet();
 
         expect(warningSpy).toHaveBeenCalledWith(
-          `'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A and A.x formats where the major tag is higher than 5. You specified: ${inputVersion}. 'dotnet-quality' input is ignored.`
+          `The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${inputVersion}. 'dotnet-quality' input is ignored.`
         );
       });
 
diff --git a/__tests__/setup-dotnet.test.ts b/__tests__/setup-dotnet.test.ts
@@ -59,7 +59,7 @@ describe('setup-dotnet tests', () => {
 
       const expectedDebugMessage =
         'No version found, trying to find version from global.json';
-      const expectedInfoMessage = `global.json wasn't found in the root directory. No .NET version will be installed.`;
+      const expectedInfoMessage = `A global.json wasn't found in the root directory. No .NET version will be installed.`;
 
       await setup.run();
 
@@ -73,7 +73,7 @@ describe('setup-dotnet tests', () => {
       inputs['dotnet-version'] = ['6.0'];
       inputs['dotnet-quality'] = 'fictitiousQuality';
 
-      const expectedErrorMessage = `${inputs['dotnet-quality']} is not a supported value for 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`;
+      const expectedErrorMessage = `Value '${inputs['dotnet-quality']}' is not supported for the 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`;
 
       await setup.run();
       expect(setFailedSpy).toHaveBeenCalledWith(expectedErrorMessage);
@@ -160,7 +160,7 @@ describe('setup-dotnet tests', () => {
 
     it(`shouldn't call setOutput() if actions didn't install .NET`, async () => {
       inputs['dotnet-version'] = [];
-      const warningMessage = `No .NET version was installed. The 'dotnet-version' output will not be set.`;
+      const warningMessage = `The 'dotnet-version' output will not be set.`;
 
       addToPathSpy.mockImplementation(() => {});
 
diff --git a/dist/index.js b/dist/index.js
@@ -255,7 +255,7 @@ class DotnetVersionResolver {
     resolveVersionInput() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!semver_1.default.validRange(this.inputVersion) && !this.isLatestPatchSyntax()) {
-                throw new Error(`'dotnet-version' was supplied in invalid format: ${this.inputVersion}! Supported syntax: A.B.C, A.B, A.B.x, A, A.x, A.B.Cxx`);
+                throw new Error(`The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! Supported syntax: A.B.C, A.B, A.B.x, A, A.x, A.B.Cxx`);
             }
             if (semver_1.default.valid(this.inputVersion)) {
                 this.createVersionArgument();
@@ -274,7 +274,7 @@ class DotnetVersionResolver {
         if (majorTag &&
             parseInt(majorTag) <
                 DotnetInstallerLimits.LatestPatchSyntaxMinimalMajorTag) {
-            throw new Error(`'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`);
+            throw new Error(`The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`);
         }
         return majorTag ? true : false;
     }
@@ -371,7 +371,7 @@ class DotnetCoreInstaller {
             scriptArguments.push(option, this.quality);
         }
         else {
-            core.warning(`'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`);
+            core.warning(`The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`);
         }
     }
     installDotnet() {
@@ -556,13 +556,13 @@ function run() {
                     versions.push(getVersionFromGlobalJson(globalJsonPath));
                 }
                 else {
-                    core.info(`global.json wasn't found in the root directory. No .NET version will be installed.`);
+                    core.info(`A global.json wasn't found in the root directory. No .NET version will be installed.`);
                 }
             }
             if (versions.length) {
                 const quality = core.getInput('dotnet-quality');
                 if (quality && !qualityOptions.includes(quality)) {
-                    throw new Error(`${quality} is not a supported value for 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`);
+                    throw new Error(`Value '${quality}' is not supported for the 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`);
                 }
                 let dotnetInstaller;
                 const uniqueVersions = new Set(versions);
@@ -605,7 +605,7 @@ function getVersionFromGlobalJson(globalJsonPath) {
 }
 function outputInstalledVersion(installedVersions, globalJsonFileInput) {
     if (!installedVersions.length) {
-        core.info(`No .NET version was installed. The 'dotnet-version' output will not be set.`);
+        core.info(`The 'dotnet-version' output will not be set.`);
         return;
     }
     if (installedVersions.includes(null)) {
diff --git a/src/installer.ts b/src/installer.ts
@@ -33,7 +33,7 @@ export class DotnetVersionResolver {
   private async resolveVersionInput(): Promise<void> {
     if (!semver.validRange(this.inputVersion) && !this.isLatestPatchSyntax()) {
       throw new Error(
-        `'dotnet-version' was supplied in invalid format: ${this.inputVersion}! Supported syntax: A.B.C, A.B, A.B.x, A, A.x, A.B.Cxx`
+        `The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! Supported syntax: A.B.C, A.B, A.B.x, A, A.x, A.B.Cxx`
       );
     }
     if (semver.valid(this.inputVersion)) {
@@ -57,7 +57,7 @@ export class DotnetVersionResolver {
         DotnetInstallerLimits.LatestPatchSyntaxMinimalMajorTag
     ) {
       throw new Error(
-        `'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`
+        `The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`
       );
     }
     return majorTag ? true : false;
@@ -192,7 +192,7 @@ export class DotnetCoreInstaller {
       scriptArguments.push(option, this.quality);
     } else {
       core.warning(
-        `'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`
+        `The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`
       );
     }
   }
diff --git a/src/setup-dotnet.ts b/src/setup-dotnet.ts
@@ -48,7 +48,7 @@ export async function run() {
         versions.push(getVersionFromGlobalJson(globalJsonPath));
       } else {
         core.info(
-          `global.json wasn't found in the root directory. No .NET version will be installed.`
+          `A global.json wasn't found in the root directory. No .NET version will be installed.`
         );
       }
     }
@@ -58,7 +58,7 @@ export async function run() {
 
       if (quality && !qualityOptions.includes(quality)) {
         throw new Error(
-          `${quality} is not a supported value for 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`
+          `Value '${quality}' is not supported for the 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`
         );
       }
 
@@ -109,9 +109,7 @@ function outputInstalledVersion(
   globalJsonFileInput: string
 ): void {
   if (!installedVersions.length) {
-    core.info(
-      `No .NET version was installed. The 'dotnet-version' output will not be set.`
-    );
+    core.info(`The 'dotnet-version' output will not be set.`);
     return;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,7 @@ class DotnetVersionResolver {`
`255`	`255`	`resolveVersionInput() {`
`256`	`256`	`return __awaiter(this, void 0, void 0, function* () {`
`257`	`257`	`if (!semver_1.default.validRange(this.inputVersion) && !this.isLatestPatchSyntax()) {`
`258`		- throw new Error(`'dotnet-version' was supplied in invalid format: ${this.inputVersion}! Supported syntax: A.B.C, A.B, A.B.x, A, A.x, A.B.Cxx`);
	`258`	+ throw new Error(`The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! Supported syntax: A.B.C, A.B, A.B.x, A, A.x, A.B.Cxx`);
`259`	`259`	`}`
`260`	`260`	`if (semver_1.default.valid(this.inputVersion)) {`
`261`	`261`	`this.createVersionArgument();`
`@@ -274,7 +274,7 @@ class DotnetVersionResolver {`
`274`	`274`	`if (majorTag &&`
`275`	`275`	`parseInt(majorTag) <`
`276`	`276`	`DotnetInstallerLimits.LatestPatchSyntaxMinimalMajorTag) {`
`277`		- throw new Error(`'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`);
	`277`	+ throw new Error(`The 'dotnet-version' was supplied in invalid format: ${this.inputVersion}! The A.B.Cxx syntax is available since the .NET 5.0 release.`);
`278`	`278`	`}`
`279`	`279`	`return majorTag ? true : false;`
`280`	`280`	`}`
`@@ -371,7 +371,7 @@ class DotnetCoreInstaller {`
`371`	`371`	`scriptArguments.push(option, this.quality);`
`372`	`372`	`}`
`373`	`373`	`else {`
`374`		- core.warning(`'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`);
	`374`	+ core.warning(`The 'dotnet-quality' input can be used only with .NET SDK version in A.B, A.B.x, A, A.x and A.B.Cxx formats where the major tag is higher than 5. You specified: ${this.version}. 'dotnet-quality' input is ignored.`);
`375`	`375`	`}`
`376`	`376`	`}`
`377`	`377`	`installDotnet() {`
`@@ -556,13 +556,13 @@ function run() {`
`556`	`556`	`versions.push(getVersionFromGlobalJson(globalJsonPath));`
`557`	`557`	`}`
`558`	`558`	`else {`
`559`		- core.info(`global.json wasn't found in the root directory. No .NET version will be installed.`);
	`559`	+ core.info(`A global.json wasn't found in the root directory. No .NET version will be installed.`);
`560`	`560`	`}`
`561`	`561`	`}`
`562`	`562`	`if (versions.length) {`
`563`	`563`	`const quality = core.getInput('dotnet-quality');`
`564`	`564`	`if (quality && !qualityOptions.includes(quality)) {`
`565`		- throw new Error(`${quality} is not a supported value for 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`);
	`565`	+ throw new Error(`Value '${quality}' is not supported for the 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`);
`566`	`566`	`}`
`567`	`567`	`let dotnetInstaller;`
`568`	`568`	`const uniqueVersions = new Set(versions);`
`@@ -605,7 +605,7 @@ function getVersionFromGlobalJson(globalJsonPath) {`
`605`	`605`	`}`
`606`	`606`	`function outputInstalledVersion(installedVersions, globalJsonFileInput) {`
`607`	`607`	`if (!installedVersions.length) {`
`608`		- core.info(`No .NET version was installed. The 'dotnet-version' output will not be set.`);
	`608`	+ core.info(`The 'dotnet-version' output will not be set.`);
`609`	`609`	`return;`
`610`	`610`	`}`
`611`	`611`	`if (installedVersions.includes(null)) {`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ export async function run() {`
`48`	`48`	`versions.push(getVersionFromGlobalJson(globalJsonPath));`
`49`	`49`	`} else {`
`50`	`50`	`core.info(`
`51`		- `global.json wasn't found in the root directory. No .NET version will be installed.`
	`51`	+ `A global.json wasn't found in the root directory. No .NET version will be installed.`
`52`	`52`	`);`
`53`	`53`	`}`
`54`	`54`	`}`
`@@ -58,7 +58,7 @@ export async function run() {`
`58`	`58`
`59`	`59`	`if (quality && !qualityOptions.includes(quality)) {`
`60`	`60`	`throw new Error(`
`61`		- `${quality} is not a supported value for 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`
	`61`	+ `Value '${quality}' is not supported for the 'dotnet-quality' option. Supported values are: daily, signed, validated, preview, ga.`
`62`	`62`	`);`
`63`	`63`	`}`
`64`	`64`
`@@ -109,9 +109,7 @@ function outputInstalledVersion(`
`109`	`109`	`globalJsonFileInput: string`
`110`	`110`	`): void {`
`111`	`111`	`if (!installedVersions.length) {`
`112`		`- core.info(`
`113`		- `No .NET version was installed. The 'dotnet-version' output will not be set.`
`114`		`- );`
	`112`	+ core.info(`The 'dotnet-version' output will not be set.`);
`115`	`113`	`return;`
`116`	`114`	`}`
`117`	`115`