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

Merge branch 'feature/installer-merge-update-main' into feature/installer-merge-update

Browse source 
# Conflicts:
#	eng/Version.Details.xml
#	eng/Versions.props
#	global.json
#	src/redist/targets/Crossgen.targets
#	src/redist/targets/GenerateBundledVersions.targets
#	src/redist/targets/GenerateLayout.targets
#	src/redist/targets/GenerateMSIs.targets
This commit is contained in:
Michael Yanni 2024-01-29 14:04:18 -08:00
commit 69787b8b88
193 changed files with 3492 additions and 3317 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/EndToEnd/ProjectBuildTests.cs
View file

@ -210,7 +210,7 @@ namespace EndToEnd.Tests
string expectedOutput =
@"[\-\s]+
[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+
[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+
[\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+
[\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+
";