Port AbstractUpdateProjectTest and derived to the new integration tes…

…t project Closes #44301
dotnet · Feb 11, 2022 · 203c33e · 203c33e
1 parent 99f097c
commit 203c33e
Show file tree

Hide file tree

Showing 7 changed files with 210 additions and 193 deletions.
diff --git a/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs b/src/VisualStudio/IntegrationTest/IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs
diff --git a/...grationTests/AbstractUpdateProjectTest.cs → ...rationTests/AbstractUpgradeProjectTest.cs b/...grationTests/AbstractUpdateProjectTest.cs → ...rationTests/AbstractUpgradeProjectTest.cs
@@ -2,31 +2,23 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#nullable disable
-
 using System.IO;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Xml.Linq;
-using Microsoft.VisualStudio.IntegrationTest.Utilities;
 using Xunit;
-using Xunit.Abstractions;
-using ProjectUtils = Microsoft.VisualStudio.IntegrationTest.Utilities.Common.ProjectUtils;
 
 namespace Roslyn.VisualStudio.IntegrationTests
 {
-    public abstract class AbstractUpdateProjectTest : AbstractIntegrationTest
+    public abstract class AbstractUpgradeProjectTest : AbstractIntegrationTest
     {
-        protected AbstractUpdateProjectTest(VisualStudioInstanceFactory instanceFactory)
-            : base(instanceFactory)
-        {
-        }
-
-        protected XElement GetProjectFileElement(ProjectUtils.Project project)
+        protected async Task<XElement> GetProjectFileElementAsync(string projectName, CancellationToken cancellationToken)
         {
             // Save the project file.
-            VisualStudio.SolutionExplorer.SaveAll();
+            await TestServices.SolutionExplorer.SaveAllAsync(cancellationToken);
 
-            var projectFileContent = VisualStudio.SolutionExplorer.GetFileContents(project, Path.GetFileName(project.RelativePath));
+            var projectFileContent = await TestServices.SolutionExplorer.GetFileContentsAsync(projectName, $"{ProjectName}.csproj", cancellationToken);
             return XElement.Parse(projectFileContent);
         }
 
@@ -50,7 +42,7 @@ static bool IsConditionalPropertyGroup(XElement element)
                 => element.Name.LocalName == "PropertyGroup" && element.Attributes().Any(a => a.Name.LocalName == "Condition");
         }
 
-        private static string GetPropertyValue(XElement propertyGroup, string propertyName)
+        private static string? GetPropertyValue(XElement propertyGroup, string propertyName)
             => propertyGroup.Elements().SingleOrDefault(e => e.Name.LocalName == propertyName)?.Value;
     }
 }
diff --git a/...ualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs b/...ualStudio/IntegrationTest/New.IntegrationTests/CSharp/CSharpUpdateProjectToAllowUnsafe.cs
@@ -0,0 +1,114 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.VisualStudio.IntegrationTest.Utilities;
+using Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Roslyn.VisualStudio.IntegrationTests.CSharp
+{
+    [Trait(Traits.Feature, Traits.Features.CodeActionsUpdateProjectToAllowUnsafe)]
+    public class CSharpUpdateProjectToAllowUnsafe : AbstractUpgradeProjectTest
+    {
+        private async Task InvokeFixAsync(CancellationToken cancellationToken)
+        {
+            await TestServices.Editor.SetTextAsync(@"
+unsafe class C
+{
+}", cancellationToken);
+            await TestServices.Editor.ActivateAsync(cancellationToken);
+
+            await TestServices.Editor.PlaceCaretAsync("C", charsOffset: 0, cancellationToken);
+
+            // Suspend file change notification during code action application, since spurious file change notifications
+            // can cause silent failure to apply the code action if they occur within this block.
+            await using (var fileChangeRestorer = await TestServices.Shell.PauseFileChangesAsync(HangMitigatingCancellationToken))
+            {
+                await TestServices.Editor.InvokeCodeActionListAsync(cancellationToken);
+                await TestServices.EditorVerifier.CodeActionAsync("Allow unsafe code in this project", applyFix: true, cancellationToken: cancellationToken);
+            }
+        }
+
+        [IdeFact]
+        public async Task CPSProject_GeneralPropertyGroupUpdated()
+        {
+            var project = ProjectName;
+
+            await TestServices.SolutionExplorer.CreateSolutionAsync(SolutionName, HangMitigatingCancellationToken);
+            await TestServices.SolutionExplorer.AddProjectAsync(project, WellKnownProjectTemplates.CSharpNetStandardClassLibrary, LanguageNames.CSharp, HangMitigatingCancellationToken);
+            await TestServices.SolutionExplorer.RestoreNuGetPackagesAsync(project, HangMitigatingCancellationToken);
+
+            await InvokeFixAsync(HangMitigatingCancellationToken);
+            VerifyPropertyOutsideConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "AllowUnsafeBlocks", "true");
+        }
+
+        [IdeFact]
+        public async Task LegacyProject_AllConfigurationsUpdated()
+        {
+            var project = ProjectName;
+
+            await TestServices.SolutionExplorer.CreateSolutionAsync(SolutionName, HangMitigatingCancellationToken);
+            await TestServices.SolutionExplorer.AddProjectAsync(project, WellKnownProjectTemplates.ClassLibrary, LanguageNames.CSharp, HangMitigatingCancellationToken);
+
+            await InvokeFixAsync(HangMitigatingCancellationToken);
+            VerifyPropertyInEachConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "AllowUnsafeBlocks", "true");
+        }
+
+        [IdeFact]
+        [WorkItem(23342, "https://github.com/dotnet/roslyn/issues/23342")]
+        public async Task LegacyProject_MultiplePlatforms_AllConfigurationsUpdated()
+        {
+            var project = ProjectName;
+
+            await TestServices.SolutionExplorer.CreateSolutionAsync(SolutionName, HangMitigatingCancellationToken);
+            await TestServices.SolutionExplorer.AddCustomProjectAsync(
+                project,
+                ".csproj",
+                $@"<?xml version=""1.0"" encoding=""utf-8""?>
+<Project ToolsVersion=""15.0"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
+  <Import Project=""$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props"" Condition=""Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')"" />
+  <PropertyGroup>
+    <Configuration Condition=""'$(Configuration)' == ''"">Debug</Configuration>
+    <Platform Condition=""'$(Platform)' == ''"">x64</Platform>
+    <ProjectGuid>{{F4233BA4-A4CB-498B-BBC1-65A42206B1BA}}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>{ProjectName}</RootNamespace>
+    <AssemblyName>{ProjectName}</AssemblyName>
+    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=""'$(Configuration)|$(Platform)' == 'Debug|x86'"">
+    <OutputPath>bin\x86\Debug\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
+  <PropertyGroup Condition=""'$(Configuration)|$(Platform)' == 'Release|x86'"">
+    <OutputPath>bin\x86\Release\</OutputPath>
+    <PlatformTarget>x86</PlatformTarget>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=""'$(Configuration)|$(Platform)' == 'Debug|x64'"">
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <PropertyGroup Condition=""'$(Configuration)|$(Platform)' == 'Release|x64'"">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <PlatformTarget>x64</PlatformTarget>
+  </PropertyGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <Import Project=""$(MSBuildToolsPath)\Microsoft.CSharp.targets"" />
+</Project>",
+                HangMitigatingCancellationToken);
+
+            await TestServices.SolutionExplorer.AddFileAsync(project, "C.cs", open: true, cancellationToken: HangMitigatingCancellationToken);
+
+            await InvokeFixAsync(HangMitigatingCancellationToken);
+            VerifyPropertyInEachConfiguration(await GetProjectFileElementAsync(project, HangMitigatingCancellationToken), "AllowUnsafeBlocks", "true");
+        }
+    }
+}