Skip to content

Commit 1963f0c

Browse files
dsplaisteddsplaisted
committed
Update tests
1 parent 6e10a24 commit 1963f0c

File tree

30 files changed

+136
-141
lines changed

30 files changed

+136
-141
lines changed

‎src/Assets/TestPackages/PackageLibraryDirectDependency/PackageLibraryDirectDependency/PackageLibraryDirectDependency.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
2-
32
<PropertyGroup>
43
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
84
<TargetFramework>net8.0</TargetFramework>
95
<Copyright>© Microsoft</Copyright>
106
<Product>Razor Test</Product>

‎src/Assets/TestPackages/PackageLibraryDirectDependency/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<TargetFramework>net8.0</TargetFramework>
96
<Copyright>© Microsoft</Copyright>
107
<Product>Razor Test</Product>

‎src/Assets/TestPackages/PackageLibraryNoStaticAssets/PackageLibraryNoStaticAssets.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<TargetFramework>net8.0</TargetFramework>
96
<Copyright>© Microsoft</Copyright>
107
<Product>Razor Test</Product>

‎src/Assets/TestPackages/PackageLibraryTransitiveDependency/PackageLibraryTransitiveDependency.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<TargetFramework>net8.0</TargetFramework>
96
<Copyright>© Microsoft</Copyright>
107
<Product>Razor Test</Product>

‎src/Assets/TestProjects/RazorClassLibrary/ClassLibrary.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22

33
<PropertyGroup>
44
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
5-
</PropertyGroup>
6-
7-
<PropertyGroup>
85
<TargetFramework>$(AspNetTestTfm)</TargetFramework>
96
<Copyright>© Microsoft</Copyright>
107
<Product>Razor Test</Product>

‎src/Tests/EndToEnd.Tests/GivenDotNetUsesMSBuild.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void ItCanNewRestoreBuildRunCleanMSBuildProject()
4343
.Should().Pass()
4444
.And.HaveStdOutContaining("Hello, World!");
4545

46-
var binDirectory = new DirectoryInfo(projectDirectory).Sub("bin");
46+
var binDirectory = new DirectoryInfo(projectDirectory).Sub("artifacts").Sub("bin");
4747
binDirectory.Should().HaveFilesMatching("*.dll", SearchOption.AllDirectories);
4848

4949
new CleanCommand(Log, projectDirectory)

‎src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildANetCoreApp.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,8 @@ public void It_uses_lowercase_form_of_the_target_framework_for_the_output_path(b
626626
var testProject = new TestProject()
627627
{
628628
Name = "OutputPathCasing",
629-
TargetFrameworks = "ignored",
629+
// Force the actual TargetFramework to be included in the artifact pivots
630+
TargetFrameworks = "ignored;ignored2",
630631
IsExe = true
631632
};
632633

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void Build_Works_WithLibraryUsingHintPath()
9393
reference.Name = "Reference";
9494
reference.Add(new XElement(
9595
"HintPath",
96-
Path.Combine("..", "razorclasslibrary", "bin", "Debug", DefaultTfm, "RazorClassLibrary.dll")));
96+
Path.Combine("..", "razorclasslibrary", "artifacts", "bin", "debug", "RazorClassLibrary.dll")));
9797
}
9898
});
9999

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildLazyLoadTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public void Publish_LazyLoadExplicitAssembly_Debug_Works()
135135
});
136136

137137
// Act
138-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
138+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
139139
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
140140
publishCommand.Execute("/bl")
141141
.Should().Pass();
@@ -184,7 +184,7 @@ public void Publish_LazyLoadExplicitAssembly_Release_Works()
184184
});
185185

186186
// Act
187-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
187+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
188188
publishCommand.Execute("/p:Configuration=Release")
189189
.Should().Pass();
190190

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmCompressionTests.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ public void Publish_UpdatesFilesWhenSourcesChange()
2323
var testAppName = "BlazorHosted";
2424
var testInstance = CreateAspNetSdkTestAsset(testAppName);
2525

26-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
26+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
2727
publishCommand.Execute().Should().Pass();
2828

2929
// Act
30-
var mainAppDll = Path.Combine(testInstance.TestRoot, "blazorhosted", "bin", "Debug", DefaultTfm, "publish", "wwwroot", "_framework", "blazorwasm.dll");
30+
var blazorHostedPublishDirectory = publishCommand.GetOutputDirectory().FullName;
31+
var mainAppDll = Path.Combine(blazorHostedPublishDirectory, "wwwroot", "_framework", "blazorwasm.dll");
3132
var mainAppDllThumbPrint = FileThumbPrint.Create(mainAppDll);
32-
var mainAppCompressedDll = Path.Combine(testInstance.TestRoot, "blazorhosted", "bin", "Debug", DefaultTfm, "publish", "wwwroot", "_framework", "blazorwasm.dll.br");
33+
var mainAppCompressedDll = Path.Combine(blazorHostedPublishDirectory, "wwwroot", "_framework", "blazorwasm.dll.br");
3334
var mainAppCompressedDllThumbPrint = FileThumbPrint.Create(mainAppCompressedDll);
3435

3536
var blazorBootJson = Path.Combine(testInstance.TestRoot, publishCommand.GetOutputDirectory(DefaultTfm).ToString(), "wwwroot", "_framework", "blazor.boot.json");
@@ -64,15 +65,15 @@ public void Publish_WithoutLinkerAndCompression_UpdatesFilesWhenSourcesChange()
6465
var testAppName = "BlazorHosted";
6566
var testInstance = CreateAspNetSdkTestAsset(testAppName);
6667

67-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
68+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
6869
publishCommand.Execute("/p:BlazorWebAssemblyEnableLinking=false").Should().Pass();
6970

7071
// Act
71-
var buildOutputDirectory = publishCommand.GetOutputDirectory(DefaultTfm).ToString();
72-
var mainAppDll = Path.Combine(testInstance.TestRoot, "blazorhosted", "bin", "Debug", DefaultTfm, "publish", "wwwroot", "_framework", "blazorwasm.dll");
72+
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm).FullName;
73+
var mainAppDll = Path.Combine(publishDirectory, "wwwroot", "_framework", "blazorwasm.dll");
7374
var mainAppDllThumbPrint = FileThumbPrint.Create(mainAppDll);
7475

75-
var mainAppCompressedDll = Path.Combine(testInstance.TestRoot, "blazorhosted", "bin", "Debug", DefaultTfm, "publish", "wwwroot", "_framework", "blazorwasm.dll.br");
76+
var mainAppCompressedDll = Path.Combine(publishDirectory, "wwwroot", "_framework", "blazorwasm.dll.br");
7677
var mainAppCompressedDllThumbPrint = FileThumbPrint.Create(mainAppCompressedDll);
7778

7879
var programFile = Path.Combine(testInstance.TestRoot, "blazorwasm", "Program.cs");
@@ -161,15 +162,15 @@ public void Publish_CompressesAllFrameworkFiles()
161162
var testAppName = "BlazorWasmWithLibrary";
162163
var testInstance = CreateAspNetSdkTestAsset(testAppName);
163164

164-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
165+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
165166
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
166167
publishCommand.Execute("/bl").Should().Pass();
167168

168169
var extensions = new[] { ".dll", ".js", ".pdb", ".wasm", ".map", ".json", ".dat" };
169170

170171
// Act
171172
var publishOutputDirectory = publishCommand.GetOutputDirectory(DefaultTfm).ToString();
172-
var frameworkFilesPath = Path.Combine(Path.Combine(testInstance.TestRoot, "blazorwasm"), publishOutputDirectory, "wwwroot", "_framework");
173+
var frameworkFilesPath = Path.Combine(publishOutputDirectory, "wwwroot", "_framework");
173174

174175
// Assert
175176
foreach (var file in Directory.EnumerateFiles(frameworkFilesPath, "*", new EnumerationOptions { RecurseSubdirectories = true, }))

‎src/Tests/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public void Publish_MinimalApp_Works()
2929
var testAppName = "BlazorWasmMinimal";
3030
var testInstance = CreateAspNetSdkTestAsset(testAppName);
3131

32-
var publishCommand = new PublishCommand(Log, testInstance.TestRoot);
32+
var publishCommand = new PublishCommand(testInstance);
3333
publishCommand.Execute().Should().Pass()
3434
.And.NotHaveStdOutContaining("warning IL");
3535

@@ -61,7 +61,7 @@ public void Publish_WithDefaultSettings_Works()
6161
var testAppName = "BlazorWasmWithLibrary";
6262
var testInstance = CreateAspNetSdkTestAsset(testAppName);
6363

64-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
64+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
6565
publishCommand.Execute().Should().Pass();
6666

6767
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
@@ -119,7 +119,7 @@ public void Publish_Works_WithLibraryUsingHintPath()
119119
reference.Name = "Reference";
120120
reference.Add(new XElement(
121121
"HintPath",
122-
Path.Combine("..", "razorclasslibrary", "bin", "Debug", DefaultTfm, "RazorClassLibrary.dll")));
122+
Path.Combine("..", "razorclasslibrary", "artifacts", "bin", "debug", "RazorClassLibrary.dll")));
123123
}
124124
});
125125

@@ -128,7 +128,7 @@ public void Publish_Works_WithLibraryUsingHintPath()
128128
buildLibraryCommand.Execute("/bl")
129129
.Should().Pass();
130130

131-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
131+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
132132
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
133133
publishCommand.Execute("/bl").Should().Pass();
134134

@@ -155,7 +155,7 @@ public void Publish_WithScopedCss_Works()
155155
var testInstance = CreateAspNetSdkTestAsset(testAppName);
156156
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "App.razor.css"), "h1 { font-size: 16px; }");
157157

158-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
158+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
159159
publishCommand.Execute().Should().Pass();
160160

161161
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
@@ -197,7 +197,7 @@ public void Publish_InRelease_Works()
197197
var testInstance = CreateAspNetSdkTestAsset(testAppName);
198198
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "App.razor.css"), "h1 { font-size: 16px; }");
199199

200-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
200+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
201201
publishCommand.Execute("/p:Configuration=Release").Should().Pass();
202202

203203
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm, "Release");
@@ -235,14 +235,14 @@ public void Publish_WithExistingWebConfig_Works()
235235
var webConfigContents = "test webconfig contents";
236236
File.WriteAllText(Path.Combine(testInstance.TestRoot, "blazorwasm", "web.config"), webConfigContents);
237237

238-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
238+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
239239
publishCommand.Execute("/p:Configuration=Release").Should().Pass();
240240

241-
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm, "Release");
242-
243241
// Verify web.config
244-
new FileInfo(Path.Combine(publishDirectory.ToString(), "..", "web.config")).Should().Exist();
245-
new FileInfo(Path.Combine(publishDirectory.ToString(), "..", "web.config")).Should().Contain(webConfigContents);
242+
var outputDirectory = new BuildCommand(testInstance, "blazorwasm").GetOutputDirectory(configuration: "Release");
243+
var webConfig = outputDirectory.File("web.config");
244+
webConfig.Should().Exist();
245+
webConfig.Should().Contain(webConfigContents);
246246
}
247247

248248
[Fact]
@@ -256,7 +256,7 @@ public void Publish_WithNoBuild_Works()
256256
buildCommand.Execute()
257257
.Should().Pass();
258258

259-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
259+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
260260
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
261261
publishCommand.Execute("/p:NoBuild=true", "/bl").Should().Pass();
262262

@@ -437,7 +437,7 @@ public void Publish_WithTrimmingdDisabled_Works()
437437

438438
});
439439

440-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
440+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
441441
publishCommand.Execute().Should().Pass();
442442

443443
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
@@ -510,7 +510,7 @@ public void Publish_SatelliteAssemblies_AreCopiedToBuildOutput()
510510
}
511511
});
512512

513-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
513+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
514514
publishCommand.Execute().Should().Pass();
515515

516516
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
@@ -536,7 +536,7 @@ public void Publish_HostedApp_DefaultSettings_Works()
536536
var testAppName = "BlazorHosted";
537537
var testInstance = CreateAspNetSdkTestAsset(testAppName);
538538

539-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
539+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
540540
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
541541
publishCommand.Execute("/bl").Should().Pass();
542542

@@ -624,7 +624,7 @@ public void Publish_HostedApp_ProducesBootJsonDataWithExpectedContent()
624624
File.WriteAllText(Path.Combine(wwwroot, "appsettings.json"), "Default settings");
625625
File.WriteAllText(Path.Combine(wwwroot, "appsettings.development.json"), "Development settings");
626626

627-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
627+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
628628
publishCommand.Execute().Should().Pass();
629629

630630
var buildOutputDirectory = publishCommand.GetOutputDirectory(DefaultTfm).ToString();
@@ -674,7 +674,7 @@ public void Publish_HostedApp_WithSatelliteAssemblies()
674674
var resxfileInProject = Path.Combine(testInstance.TestRoot, "blazorwasm", "Resources.ja.resx.txt");
675675
File.Move(resxfileInProject, Path.Combine(testInstance.TestRoot, "blazorwasm", "Resource.ja.resx"));
676676

677-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
677+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
678678
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
679679
publishCommand.Execute("/bl").Should().Pass();
680680

@@ -805,7 +805,7 @@ public void Publish_HostedApp_WithNoBuild_Works()
805805
var buildCommand = new BuildCommand(testInstance, "blazorhosted");
806806
buildCommand.Execute().Should().Pass();
807807

808-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
808+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
809809
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
810810
publishCommand.Execute("/p:NoBuild=true", "/bl").Should().Pass();
811811

@@ -861,7 +861,7 @@ public void Publish_HostedApp_VisualStudio()
861861
buildCommand.Execute("/p:BuildInsideVisualStudio=true").Should().Pass();
862862

863863
// Publish
864-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
864+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
865865
publishCommand.Execute("/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true").Should().Pass();
866866

867867
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
@@ -945,7 +945,7 @@ public void Publish_HostedAppWithScopedCss_VisualStudio()
945945
buildCommand.Execute("/p:BuildInsideVisualStudio=true /p:Configuration=Release").Should().Pass();
946946

947947
// Publish
948-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
948+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
949949
publishCommand.Execute("/p:BuildProjectReferences=false /p:BuildInsideVisualStudio=true").Should().Pass();
950950

951951
var publishDirectory = publishCommand.GetOutputDirectory(DefaultTfm);
@@ -1051,7 +1051,7 @@ public void Publish_HostedApp_VisualStudio_WithSatelliteAssemblies()
10511051
buildCommand.WithWorkingDirectory(testInstance.TestRoot);
10521052
buildCommand.Execute("/bl:build-msbuild.binlog").Should().Pass();
10531053

1054-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorwasm"));
1054+
var publishCommand = new PublishCommand(testInstance, "blazorwasm");
10551055
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
10561056
publishCommand.Execute("/p:BuildProjectReferences=false", "/bl:publish-msbuild.binlog").Should().Pass();
10571057

@@ -1080,7 +1080,7 @@ public void Publish_HostedApp_WithRidSpecifiedInCLI_Works()
10801080
var testAppName = "BlazorHostedRID";
10811081
var testInstance = CreateAspNetSdkTestAsset(testAppName);
10821082

1083-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
1083+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
10841084
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
10851085
publishCommand.Execute("/p:RuntimeIdentifier=linux-x64", "/bl").Should().Pass();
10861086

@@ -1094,7 +1094,7 @@ public void Publish_HostedApp_WithRid_Works()
10941094
var testAppName = "BlazorHostedRID";
10951095
var testInstance = CreateAspNetSdkTestAsset(testAppName);
10961096

1097-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "blazorhosted"));
1097+
var publishCommand = new PublishCommand(testInstance, "blazorhosted");
10981098
publishCommand.WithWorkingDirectory(testInstance.TestRoot);
10991099
publishCommand.Execute("/bl").Should().Pass();
11001100

@@ -1196,7 +1196,7 @@ public void Publish_WithInvariantGlobalizationEnabled_DoesNotCopyGlobalizationDa
11961196
project.Root.Add(itemGroup);
11971197
});
11981198

1199-
var publishCommand = new PublishCommand(Log, testInstance.TestRoot);
1199+
var publishCommand = new PublishCommand(testInstance);
12001200
publishCommand.Execute().Should().Pass();
12011201

12021202
var publishOutputDirectory = publishCommand.GetOutputDirectory(DefaultTfm).ToString();
@@ -1227,7 +1227,7 @@ public void Publish_HostingMultipleBlazorWebApps_Works()
12271227
var testAppName = "BlazorMultiApp";
12281228
var testInstance = CreateAspNetSdkTestAsset(testAppName);
12291229

1230-
var publishCommand = new PublishCommand(Log, Path.Combine(testInstance.TestRoot, "BlazorMultipleApps.Server"));
1230+
var publishCommand = new PublishCommand(testInstance, "BlazorMultipleApps.Server");
12311231
publishCommand.Execute().Should().Pass();
12321232

12331233
var publishOutputDirectory = publishCommand.GetOutputDirectory(DefaultTfm).ToString();

0 commit comments

Comments
 (0)