Skip to content

Fix for ClickOnce publish test failure #29399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 6, 2022
Merged

Fix for ClickOnce publish test failure #29399

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 34 additions & 34 deletions src/Tests/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishToClickOnce.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public GivenThatWeWantToPublishAClickOnceProject(ITestOutputHelper log) : base(l
{
}

[FullMSBuildOnlyTheory(Skip = "https://github.com/dotnet/sdk/issues/27766")]
[FullMSBuildOnlyTheory]
[InlineData(false)]
[InlineData(true)]
public void PublishClickOnceWithPublishProfile(bool? publishSingleFile)
Expand All @@ -44,12 +44,24 @@ public void PublishClickOnceWithPublishProfile(bool? publishSingleFile)

var projectDirectory = Path.Combine(testProjectInstance.Path, testProject.Name);
var publishProfilesDirectory = Path.Combine(projectDirectory, "Properties", "PublishProfiles");
Directory.CreateDirectory(publishProfilesDirectory);

var command = new PublishCommand(testProjectInstance);
DirectoryInfo outputDirectory = null;
if (publishSingleFile == true)
{
outputDirectory = command.GetOutputDirectory(targetFramework: tfm, runtimeIdentifier: rid);
}
else
{
outputDirectory = command.GetOutputDirectory(targetFramework: tfm);
}

Directory.CreateDirectory(publishProfilesDirectory);
File.WriteAllText(Path.Combine(publishProfilesDirectory, "test.pubxml"), $@"
<Project>
<PropertyGroup>
<PublishUrl>publish\</PublishUrl>
<PublishDir>{outputDirectory}</PublishDir>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
<ApplicationRevision>4</ApplicationRevision>
Expand All @@ -63,55 +75,43 @@ public void PublishClickOnceWithPublishProfile(bool? publishSingleFile)
<PublishWizardCompleted>true</PublishWizardCompleted>
<SelfContained>false</SelfContained>
{(publishSingleFile.HasValue ? $"<PublishSingleFile>{publishSingleFile}</PublishSingleFile>" : "")}
{(publishSingleFile ?? false ? $"<RuntimeIdentifier>{rid}</RuntimeIdentifier>" : "")}
{(publishSingleFile == true ? $"<RuntimeIdentifier>{rid}</RuntimeIdentifier>" : "")}
</PropertyGroup>
</Project>
");

var command = new PublishCommand(testProjectInstance);
command
.Execute("/p:PublishProfile=test")
.Should()
.Pass();

DirectoryInfo output = null;
if (publishSingleFile ?? false)
{
output = command.GetOutputDirectory(targetFramework: tfm, runtimeIdentifier: rid);
}
else
{
output = command.GetOutputDirectory(targetFramework: tfm);
}
output = output.Parent;

output.Should().HaveFiles(new[] {
$"app.Publish\\setup.exe",
$"app.Publish\\{testProject.Name}.application",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\launcher{Constants.ExeSuffix}",
outputDirectory.Should().HaveFiles(new[] {
$"setup.exe",
$"{testProject.Name}.application",
$"application files\\{testProject.Name}_1_2_3_4\\launcher{Constants.ExeSuffix}",
});

if (publishSingleFile ?? false)
if (publishSingleFile == true)
{
output.Should().HaveFiles(new[] {
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}{Constants.ExeSuffix}",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll.manifest",
outputDirectory.Should().HaveFiles(new[] {
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}{Constants.ExeSuffix}",
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll.manifest",
});
output.Should().NotHaveFiles(new[] {
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\Newtonsoft.Json.dll",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.deps.json",
outputDirectory.Should().NotHaveFiles(new[] {
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll",
$"application files\\{testProject.Name}_1_2_3_4\\Newtonsoft.Json.dll",
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.deps.json",
});
}
else
{
output.Should().HaveFiles(new[] {
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll.manifest",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\Newtonsoft.Json.dll",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.deps.json",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.runtimeconfig.json",
$"app.Publish\\application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}{Constants.ExeSuffix}",
outputDirectory.Should().HaveFiles(new[] {
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll",
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.dll.manifest",
$"application files\\{testProject.Name}_1_2_3_4\\Newtonsoft.Json.dll",
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.deps.json",
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}.runtimeconfig.json",
$"application files\\{testProject.Name}_1_2_3_4\\{testProject.Name}{Constants.ExeSuffix}",
});
}
}
Expand Down