mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'main' into merge/release/8.0.2xx-to-main

Browse source 
# Conflicts:
#	src/SourceBuild/content/eng/Versions.props
#	src/SourceBuild/content/global.json
This commit is contained in:
Michael Yanni 2023-10-19 13:40:15 -07:00
commit be3df24252
81 changed files with 2011 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/EndToEnd/ProjectBuildTests.cs
View file

@ -213,16 +213,16 @@ namespace EndToEnd.Tests
string expectedOutput =
@"[\-\s]+
[\w \.]+webapp,razor\s+\[C#\][\w\ \/]+
[\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+
[\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+
[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+
[\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+
[\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+
";
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
expectedOutput +=
@"[\w \.]+winforms\s+\[C#\],VB[\w\ \/]+
[\w \.]+\wpf\s+\[C#\],VB[\w\ \/]+
@"[\w \.\(\)]+winforms\s+\[C#\],VB[\w\ \/]+
[\w \.\(\)]+\wpf\s+\[C#\],VB[\w\ \/]+
";
}
//list should end with new line