Skip to content

Commit 0e8a05e

Browse files
paulmedynskipaulmedynski
committed
Added greater fidelity to build messages.
1 parent 8aa59ca commit 0e8a05e

1 file changed

Lines changed: 59 additions & 30 deletions

File tree

‎build.proj‎

Lines changed: 59 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,8 @@
405405
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
406406
</PropertyGroup>
407407

408-
<Message Text=">>> Building GenAPI project via command: '$(DotnetCommand)'"/>
408+
<Message Importance="High" Text=">>> Building GenAPI project"/>
409+
<Message Text=" Command: $(DotnetCommand)"/>
409410
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
410411

411412
<!-- Get the path to the GenAPI artifact -->
@@ -434,7 +435,8 @@
434435
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
435436
</PropertyGroup>
436437

437-
<Message Text=">>> Building not supported binaries project via command: '$(DotnetCommand)'"/>
438+
<Message Importance="High" Text=">>> Building not supported binaries project"/>
439+
<Message Text=" Command: $(DotnetCommand)"/>
438440
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
439441
</Target>
440442

@@ -459,7 +461,8 @@
459461
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
460462
</PropertyGroup>
461463

462-
<Message Text=">>> Building SqlClient ref binaries via command: $(DotnetCommand)"/>
464+
<Message Importance="High" Text=">>> Building SqlClient ref binaries"/>
465+
<Message Text=" Command: $(DotnetCommand)"/>
463466
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
464467
</Target>
465468

@@ -486,7 +489,8 @@
486489
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
487490
</PropertyGroup>
488491

489-
<Message Text=">>> Building SqlClient for Unix via command: $(DotnetCommand)"/>
492+
<Message Importance="High" Text=">>> Building SqlClient for Unix"/>
493+
<Message Text=" Command: $(DotnetCommand)"/>
490494
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
491495
</Target>
492496

@@ -512,7 +516,8 @@
512516
<!-- Convert more than one whitespace character into one space -->
513517
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
514518
</PropertyGroup>
515-
<Message Text=">>> Building SqlClient for Windows via command: $(DotnetCommand)" />
519+
<Message Importance="High" Text=">>> Building SqlClient for Windows"/>
520+
<Message Text=" Command: $(DotnetCommand)"/>
516521
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
517522
</Target>
518523

@@ -557,7 +562,8 @@
557562
<!-- Convert more than one whitespace character into one space -->
558563
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
559564
</PropertyGroup>
560-
<Message Text=">>> Packing SqlClient via command: $(DotnetCommand)" />
565+
<Message Importance="High" Text=">>> Packing SqlClient"/>
566+
<Message Text=" Command: $(DotnetCommand)"/>
561567
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
562568
</Target>
563569

@@ -591,7 +597,8 @@
591597
<!-- Convert more than one whitespace character into one space -->
592598
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
593599
</PropertyGroup>
594-
<Message Text=">>> Running functional tests for SqlClient via command: $(DotnetCommand)" />
600+
<Message Importance="High" Text=">>> Running functional tests for SqlClient"/>
601+
<Message Text=" Command: $(DotnetCommand)"/>
595602
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
596603
</Target>
597604

@@ -622,7 +629,8 @@
622629
<!-- Convert more than one whitespace character into one space -->
623630
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
624631
</PropertyGroup>
625-
<Message Text=">>> Running manual tests for SqlClient via command: $(DotnetCommand)" />
632+
<Message Importance="High" Text=">>> Running manual tests for SqlClient"/>
633+
<Message Text=" Command: $(DotnetCommand)"/>
626634
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
627635
</Target>
628636

@@ -650,7 +658,8 @@
650658
<!-- Convert more than one whitespace character into one space -->
651659
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
652660
</PropertyGroup>
653-
<Message Text=">>> Running unit tests for SqlClient via command: $(DotnetCommand)" />
661+
<Message Importance="High" Text=">>> Running unit tests for SqlClient"/>
662+
<Message Text=" Command: $(DotnetCommand)"/>
654663
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
655664
</Target>
656665

@@ -684,7 +693,8 @@
684693
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
685694
</PropertyGroup>
686695

687-
<Message Text=">>> Building Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
696+
<Message Importance="High" Text=">>> Building AKV Provider"/>
697+
<Message Text=" Command: $(DotnetCommand)"/>
688698
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
689699
</Target>
690700

@@ -712,7 +722,8 @@
712722
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
713723
</PropertyGroup>
714724

715-
<Message Text=">>> Packaging Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider via command: $(DotnetCommand)" />
725+
<Message Importance="High" Text=">>> Packaging AKV Provider"/>
726+
<Message Text=" Command: $(DotnetCommand)"/>
716727
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
717728
</Target>
718729

@@ -745,7 +756,8 @@
745756
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
746757
</PropertyGroup>
747758

748-
<Message Text=">>> Building Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
759+
<Message Importance="High" Text=">>> Building Abstractions"/>
760+
<Message Text=" Command: $(DotnetCommand)"/>
749761
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
750762
</Target>
751763

@@ -771,7 +783,8 @@
771783
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
772784
</PropertyGroup>
773785

774-
<Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Abstractions via command: $(DotnetCommand)" />
786+
<Message Importance="High" Text=">>> Packaging Abstractions"/>
787+
<Message Text=" Command: $(DotnetCommand)"/>
775788
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
776789
</Target>
777790

@@ -799,7 +812,8 @@
799812
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
800813
</PropertyGroup>
801814

802-
<Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
815+
<Message Importance="High" Text=">>> Running tests for Abstractions"/>
816+
<Message Text=" Command: $(DotnetCommand)"/>
803817
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
804818
</Target>
805819

@@ -832,7 +846,8 @@
832846
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
833847
</PropertyGroup>
834848

835-
<Message Text=">>> Building Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
849+
<Message Importance="High" Text=">>> Building Azure"/>
850+
<Message Text=" Command: $(DotnetCommand)"/>
836851
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
837852
</Target>
838853

@@ -858,7 +873,8 @@
858873
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
859874
</PropertyGroup>
860875

861-
<Message Text=">>> Packaging Microsoft.Data.SqlClient.Extensions.Azure via command: $(DotnetCommand)" />
876+
<Message Importance="High" Text=">>> Packaging Azure"/>
877+
<Message Text=" Command: $(DotnetCommand)"/>
862878
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
863879
</Target>
864880

@@ -887,7 +903,8 @@
887903
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
888904
</PropertyGroup>
889905

890-
<Message Text=">>> Running tests for Abstractions via command: $(DotnetCommand)" />
906+
<Message Importance="High" Text=">>> Running tests for Azure"/>
907+
<Message Text=" Command: $(DotnetCommand)"/>
891908
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
892909
</Target>
893910

@@ -915,7 +932,8 @@
915932
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
916933
</PropertyGroup>
917934

918-
<Message Text=">>> Building Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
935+
<Message Importance="High" Text=">>> Building Logging"/>
936+
<Message Text=" Command: $(DotnetCommand)"/>
919937
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
920938
</Target>
921939

@@ -937,7 +955,8 @@
937955
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
938956
</PropertyGroup>
939957

940-
<Message Text=">>> Packaging Microsoft.Data.SqlClient.Internal.Logging via command: $(DotnetCommand)" />
958+
<Message Importance="High" Text=">>> Packaging Logging"/>
959+
<Message Text=" Command: $(DotnetCommand)"/>
941960
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
942961
</Target>
943962

@@ -965,7 +984,8 @@
965984
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
966985
</PropertyGroup>
967986

968-
<Message Text=">>> Building Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
987+
<Message Importance="High" Text=">>> Building SqlServer"/>
988+
<Message Text=" Command: $(DotnetCommand)"/>
969989
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
970990
</Target>
971991

@@ -987,7 +1007,8 @@
9871007
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
9881008
</PropertyGroup>
9891009

990-
<Message Text=">>> Packaging Microsoft.SqlServer.Server via command: $(DotnetCommand)" />
1010+
<Message Importance="High" Text=">>> Packaging SqlServer"/>
1011+
<Message Text=" Command: $(DotnetCommand)"/>
9911012
<Exec ConsoleToMsBuild="true" Command="$(DotnetCommand)" />
9921013
</Target>
9931014

@@ -1052,37 +1073,43 @@
10521073
<!-- Logging has no tests to build. -->
10531074

10541075
<!-- Build Abstractions tests, which don't have conditional TFMs. -->
1055-
<Message Text=">>> Building Abstractions.Tests with arguments: $(_DotnetArguments)"/>
1076+
<Message Importance="High" Text=">>> Building Abstractions.Tests"/>
1077+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10561078
<Exec ConsoleToMsBuild="true"
10571079
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(AbstractionsTestsProjectPath)&quot; $(_DotnetArguments)" />
10581080

10591081
<!-- Build SqlClient UnitTests (project references only, no ReferenceType). -->
1060-
<Message Text=">>> Building SqlClient UnitTests for %(_OsValues.Identity)"/>
1082+
<Message Importance="High" Text=">>> Building SqlClient UnitTests for %(_OsValues.Identity)"/>
10611083
<Exec ConsoleToMsBuild="true"
10621084
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(UnitTestsProjectPath)&quot; -p:Configuration=$(Configuration) -p:OS=%(_OsValues.Identity)" />
10631085

10641086
<!-- Build SqlClient FunctionalTests. -->
1065-
<Message Text=">>> Building SqlClient FunctionalTests for %(_OsValues.Identity) with arguments: $(_DotnetArguments)"/>
1087+
<Message Importance="High" Text=">>> Building SqlClient FunctionalTests for %(_OsValues.Identity)"/>
1088+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10661089
<Exec ConsoleToMsBuild="true"
10671090
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(FunctionalTestsProjectPath)&quot; $(_DotnetArguments) -p:OS=%(_OsValues.Identity)" />
10681091

10691092
<!-- Build SqlClient ManualTests. -->
1070-
<Message Text=">>> Building SqlClient ManualTests for %(_OsValues.Identity) with arguments: $(_DotnetArguments)"/>
1093+
<Message Importance="High" Text=">>> Building SqlClient ManualTests for %(_OsValues.Identity)"/>
1094+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10711095
<Exec ConsoleToMsBuild="true"
10721096
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(ManualTestsProjectPath)&quot; $(_DotnetArguments) -p:OS=%(_OsValues.Identity)" />
10731097

10741098
<!-- Build SqlClient PerformanceTests. -->
1075-
<Message Text=">>> Building SqlClient PerformanceTests for %(_OsValues.Identity) with arguments: $(_DotnetArguments)"/>
1099+
<Message Importance="High" Text=">>> Building SqlClient PerformanceTests for %(_OsValues.Identity)"/>
1100+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10761101
<Exec ConsoleToMsBuild="true"
10771102
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(PerformanceTestsProjectPath)&quot; $(_DotnetArguments) -p:OS=%(_OsValues.Identity)" />
10781103

10791104
<!-- Build SqlClient StressTests. -->
1080-
<Message Text=">>> Building SqlClient StressTests for %(_OsValues.Identity) with arguments: $(_DotnetArguments)"/>
1105+
<Message Importance="High" Text=">>> Building SqlClient StressTests for %(_OsValues.Identity)"/>
1106+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10811107
<Exec ConsoleToMsBuild="true"
10821108
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(StressTestsProjectPath)&quot; $(_DotnetArguments) -p:OS=%(_OsValues.Identity)" />
10831109

10841110
<!-- Build Azure tests. -->
1085-
<Message Text=">>> Building Azure.Tests for %(_OsValues.Identity) with arguments: $(_DotnetArguments)"/>
1111+
<Message Importance="High" Text=">>> Building Azure.Tests for %(_OsValues.Identity)"/>
1112+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10861113
<Exec ConsoleToMsBuild="true"
10871114
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(AzureTestsProjectPath)&quot; $(_DotnetArguments) -p:OS=%(_OsValues.Identity)" />
10881115

@@ -1092,14 +1119,16 @@
10921119

10931120
<!-- Build all sample projects. -->
10941121
<Target Name="BuildSamples">
1095-
<Message Text=">>> Building Samples with arguments: $(_DotnetArguments)"/>
1122+
<Message Importance="High" Text=">>> Building Samples"/>
1123+
<Message Text=" Arguments: $(_DotnetArguments)"/>
10961124
<Exec ConsoleToMsBuild="true"
10971125
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(SamplesProjectPath)&quot; $(_DotnetArguments)" />
10981126
</Target>
10991127

11001128
<!-- Build all tools projects. -->
11011129
<Target Name="BuildTools">
1102-
<Message Text=">>> Building GenAPI with arguments: $(_DotnetArguments)"/>
1130+
<Message Importance="High" Text=">>> Building GenAPI"/>
1131+
<Message Text=" Arguments: $(_DotnetArguments)"/>
11031132
<Exec ConsoleToMsBuild="true"
11041133
Command="&quot;$(DotnetPath)dotnet&quot; build &quot;$(GenApiProjectPath)&quot; $(_DotnetArguments)" />
11051134
</Target>

0 commit comments

Comments
 (0)