CPVM preview message should be visible at minimal verbosity (#3971)

NuGet · Mar 29, 2021 · 87194dd · 87194dd
1 parent 58795a4
commit 87194dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 32 deletions.
diff --git a/src/NuGet.Clients/NuGet.SolutionRestoreManager/RestoreOperationLogger.cs b/src/NuGet.Clients/NuGet.SolutionRestoreManager/RestoreOperationLogger.cs
@@ -439,6 +439,7 @@ private static MSBuildVerbosityLevel GetMSBuildLevel(LogLevel level)
                 case LogLevel.Warning:
                     return MSBuildVerbosityLevel.Quiet;
                 case LogLevel.Minimal:
+                    return MSBuildVerbosityLevel.Minimal;
                 case LogLevel.Information:
                     return MSBuildVerbosityLevel.Normal;
                 case LogLevel.Verbose:

diff --git a/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs b/src/NuGet.Core/NuGet.Commands/RestoreCommand/RestoreCommand.cs
@@ -116,7 +116,7 @@ public async Task<RestoreResult> ExecuteAsync(CancellationToken token)
                 telemetry.TelemetryEvent[IsCentralVersionManagementEnabled] = isCpvmEnabled;
                 if (isCpvmEnabled)
                 {
-                    _logger.LogInformation(string.Format(
+                    _logger.LogMinimal(string.Format(
                           CultureInfo.CurrentCulture,
                           Strings.CentralPackageVersionManagementInPreview,
                           _request.Project.FilePath));

diff --git a/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetRestoreTests.cs b/test/NuGet.Core.FuncTests/Dotnet.Integration.Test/DotnetRestoreTests.cs
@@ -765,7 +765,7 @@ await SimpleTestPackageUtility.CreateFolderFeedV3Async(
         }
 
         [PlatformFact(Platform.Windows)]
-        public void RestoreCommand_DisplaysCPVMInPreviewMessageIfCPVMEnabled()
+        public void RestoreCommand_ProjectUsingCPVM_DisplaysCPVMInPreviewMessage()
         {
             using (var testDirectory = _msbuildFixture.CreateTestDirectory())
             {
@@ -798,42 +798,13 @@ public void RestoreCommand_DisplaysCPVMInPreviewMessageIfCPVMEnabled()
                 File.WriteAllText(directoryPackagesPropsName, directoryPackagesPropsContent);
 
                 // Act
-                var result = _msbuildFixture.RunDotnet(workingDirectory, "restore /v:n");
+                var result = _msbuildFixture.RunDotnet(workingDirectory, "restore");
 
                 // Assert
                 Assert.True(result.Output.Contains($"The project {projectFile} is using CentralPackageVersionManagement, a NuGet preview feature."));
             }
         }
 
-        [PlatformFact(Platform.Windows)]
-        public void RestoreCommand_DoesNotDisplayCPVMInPreviewMessageIfCPVMNotEnabled()
-        {
-            using (var testDirectory = _msbuildFixture.CreateTestDirectory())
-            {
-                // Arrange
-                var projectName = "ClassLibrary1";
-                var workingDirectory = Path.Combine(testDirectory, projectName);
-                var projectFile = Path.Combine(workingDirectory, $"{projectName}.csproj");
-
-                _msbuildFixture.CreateDotnetNewProject(testDirectory.Path, projectName, " classlib", 60000);
-
-                // As long as the project does not have ManagePackageVersionsCentrally == true the project is not opted in
-                var directoryPackagesPropsName = Path.Combine(workingDirectory, $"Directory.Build.props");
-                var directoryPackagesPropsContent = @"<Project>                    
-                        <PropertyGroup>
-                            <CentralPackageVersionsFileImported>true</CentralPackageVersionsFileImported>
-                        </PropertyGroup>
-                    </Project>";
-                File.WriteAllText(directoryPackagesPropsName, directoryPackagesPropsContent);
-
-                // Act
-                var result = _msbuildFixture.RunDotnet(workingDirectory, "restore /v:n");
-
-                // Assert
-                Assert.True(!result.Output.Contains($"The project {projectFile} is using CentralPackageVersionManagement, a NuGet preview feature."));
-            }
-        }
-
         [PlatformFact(Platform.Windows)]
         public async Task DotnetRestore_MultiTargettingWithAliases_Succeeds()
         {