Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions test/NuGet.Tests.Apex/NuGet.Tests.Apex.Daily/NuGetUITestCase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -908,37 +908,6 @@ public async Task VerifyDeletedAssetsFileIsBackByRestoringPackage()
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
}

[TestMethod]
[Timeout(DefaultTimeout)]
public async Task VerifyDeletedAssetsFileIsBackByReloadingProject()
{
// Arrange
await CommonUtility.CreatePackageInSourceAsync(_pathContext.PackageSource, TestPackageName, TestPackageVersionV1);

NuGetApexTestService nugetTestService = GetNuGetTestService();
_pathContext.Settings.SetPackageFormatToPackageReference();

SolutionService solutionService = VisualStudio.Get<SolutionService>();
solutionService.CreateEmptySolution("TestSolution", _pathContext.SolutionRoot);
ProjectTestExtension project = solutionService.AddProject(ProjectLanguage.CSharp, ProjectTemplate.NetCoreConsoleApp, "TestProject");
VisualStudio.ClearOutputWindow();
solutionService.SaveAll();

CommonUtility.OpenNuGetPackageManagerWithDte(VisualStudio, Logger);
NuGetUIProjectTestExtension uiwindow = nugetTestService.GetUIWindowfromProject(project);
uiwindow.InstallPackageFromUI(TestPackageName, TestPackageVersionV1);

var assetsFilePath = CommonUtility.GetAssetsFilePath(project.FullPath);
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
File.Delete(assetsFilePath);

// Act
CommonUtility.AutoRestorePackageByReloadingProject(VisualStudio, project);

// Assert
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
}

public override void Dispose()
{
_pathContext.Dispose();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ public class IVsServicesTestCase : SharedVisualStudioHostTestClass

[TestMethod]
[Timeout(LongerTimeout)]
[TestCategory("Gate")]
public void SimpleInstallFromIVsInstaller()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,42 @@ public async Task WithSourceMappingEnabled_InstallPackageFromPMUIAndNoSourcesFou
}
}

[TestMethod]
[Timeout(DefaultTimeout)]
[TestCategory("Gate")]
public async Task InstallAndUpdatePackageFromUI_NetCoreProject_Succeeds()
{
using (var testContext = new ApexTestContext(VisualStudio, ProjectTemplate.NetCoreConsoleApp, Logger))
{
// Arrange
var packageName = "NetCoreUpdateTestPackage";
var packageVersion1 = "1.0.0";
var packageVersion2 = "2.0.0";

await CommonUtility.CreatePackageInSourceAsync(testContext.PackageSource, packageName, packageVersion1);
await CommonUtility.CreatePackageInSourceAsync(testContext.PackageSource, packageName, packageVersion2);

VisualStudio.AssertNoErrors();

// Act
CommonUtility.OpenNuGetPackageManagerWithDte(VisualStudio, Logger);
var nugetTestService = GetNuGetTestService();
var uiwindow = nugetTestService.GetUIWindowfromProject(testContext.Project);
uiwindow.InstallPackageFromUI(packageName, packageVersion1);
testContext.SolutionService.Build();
testContext.NuGetApexTestService.WaitForAutoRestore();
CommonUtility.AssertPackageReferenceExists(testContext.Project, packageName, packageVersion1, Logger);

uiwindow.UpdatePackageFromUI(packageName, packageVersion2);
testContext.SolutionService.Build();
testContext.NuGetApexTestService.WaitForAutoRestore();

// Assert
VisualStudio.AssertNuGetOutputDoesNotHaveErrors();
CommonUtility.AssertPackageReferenceExists(testContext.Project, packageName, packageVersion2, Logger);
}
}

// There is a bug with VS or Apex where NetCoreConsoleApp and NetCoreClassLib create netcore 2.1 projects that are not supported by the sdk
// Commenting out any NetCoreConsoleApp or NetCoreClassLib template and swapping it for NetStandardClassLib as both are package ref.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -371,6 +371,37 @@ public async Task UpdatePackageFromUI_PC_PackageSourceMapping_WithMultiFeed_Succ
CommonUtility.AssertPackageInPackagesConfig(VisualStudio, project, TestPackageName, TestPackageVersionV2, Logger);
}

[TestMethod]
[Timeout(DefaultTimeout)]
[TestCategory("Gate")]
public async Task VerifyDeletedAssetsFileIsBackByReloadingProject()
{
// Arrange
await CommonUtility.CreatePackageInSourceAsync(_pathContext.PackageSource, TestPackageName, TestPackageVersionV1);

NuGetApexTestService nugetTestService = GetNuGetTestService();

SolutionService solutionService = VisualStudio.Get<SolutionService>();
solutionService.CreateEmptySolution("TestSolution", _pathContext.SolutionRoot);
ProjectTestExtension project = solutionService.AddProject(ProjectLanguage.CSharp, ProjectTemplate.NetCoreConsoleApp, "TestProject");
VisualStudio.ClearOutputWindow();
solutionService.SaveAll();

CommonUtility.OpenNuGetPackageManagerWithDte(VisualStudio, Logger);
NuGetUIProjectTestExtension uiwindow = nugetTestService.GetUIWindowfromProject(project);
uiwindow.InstallPackageFromUI(TestPackageName, TestPackageVersionV1);

var assetsFilePath = CommonUtility.GetAssetsFilePath(project.FullPath);
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
File.Delete(assetsFilePath);

// Act
CommonUtility.AutoRestorePackageByReloadingProject(VisualStudio, project);

// Assert
CommonUtility.WaitForFileExists(new FileInfo(assetsFilePath));
}

public override void Dispose()
{
_pathContext.Dispose();
Expand Down