Skip to content

Commit 07ca923

Browse files
kieronlanningkieronlanning
committed
chore: updated some build components
1 parent 12d4181 commit 07ca923

3 files changed

Lines changed: 60 additions & 36 deletions

File tree

‎Makefile‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,45 @@ CONFIGURATION = Release
99
PACK_VERSION = 1.1.0
1010
ARTIFACT_FOLDER = p:/sync-projects/.local-nuget/
1111

12+
# Common variables
13+
COLOUR_RESET = \033[0m
14+
15+
COLOUR_BLACK = \033[30m
16+
COLOUR_RED = \033[31m
17+
COLOUR_GREEN = \033[32m
18+
COLOUR_ORANGE = \033[33m
19+
COLOUR_BLUE = \033[34m
20+
COLOUR_PURPLE = \033[35m
21+
COLOUR_CYAN = \033[36m
22+
COLOUR_WHITE = \033[37m
23+
24+
COLOUR_GREY = \033[90m
25+
1226
# Targets
1327
build: ## Builds the project.
14-
dotnet build $(SOLUTION_FILE) --configuration $(CONFIGURATION)
28+
@echo -e "Building $(COLOUR_BLUE)$(SOLUTION_FILE)$(COLOUR_RESET) with $(COLOUR_ORANGE)$(CONFIGURATION)$(COLOUR_RESET)..."
29+
@dotnet build $(SOLUTION_FILE) --configuration $(CONFIGURATION)
1530

1631
test: ## Runs the tests for the project.
17-
dotnet test $(TEST_PROJECT) --configuration $(CONFIGURATION)
32+
@echo -e "Running tests for $(COLOUR_BLUE)$(TEST_PROJECT)$(COLOUR_RESET) with $(COLOUR_ORANGE)$(CONFIGURATION)$(COLOUR_RESET)..."
33+
@dotnet test $(TEST_PROJECT) --configuration $(CONFIGURATION)
1834

1935
pack: ## Packs the project into a nuget package using PACK_VERSION argument.
20-
dotnet pack -c $(CONFIGURATION) -o $(ARTIFACT_FOLDER) $(ROOT_FOLDER)Purview.Telemetry.SourceGenerator/Purview.Telemetry.SourceGenerator.csproj --property:Version=$(PACK_VERSION) --include-symbols
36+
@echo -e "Packing $(COLOUR_BLUE)Source Generator$(COLOUR_RESET) with $(COLOUR_ORANGE)$(PACK_VERSION)$(COLOUR_RESET)..."
37+
@dotnet pack -c $(CONFIGURATION) -o $(ARTIFACT_FOLDER) $(ROOT_FOLDER)Purview.Telemetry.SourceGenerator/Purview.Telemetry.SourceGenerator.csproj --property:Version=$(PACK_VERSION) --include-symbols
2138

2239
format: ## Formats the code according to the rules of the src/.editorconfig file.
23-
dotnet format $(ROOT_FOLDER)
40+
@echo -e "Formatting $(COLOUR_BLUE)$(SOLUTION_FILE)$(COLOUR_RESET)..."
41+
@dotnet format $(ROOT_FOLDER)
2442

2543
act:
44+
@echo -e "Running $(COLOUR_BLUE)act$(COLOUR_RESET)..."
2645
act -P ubuntu-latest=-self-hosted
2746

2847
vs: ## Opens the project in Visual Studio.
48+
@echo -e "Opening $(COLOUR_BLUE)$(SOLUTION_FILE)$(COLOUR_RESET) in $(COLOUR_ORANGE)Visual Studio$(COLOUR_RESET)..."
2949
@start $(SOLUTION_FILE)
3050

3151
code: ## Opens the project in Visual Studio Code.
52+
@echo -e "Opening $(COLOUR_BLUE)Visual Studio Code$(COLOUR_RESET)..."
3253
@code .

‎src/.build-system/Directory.Build.props‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<None Remove="Resources/**/*" />
4848
<EmbeddedResource Include="Resources/**/*" />
4949
</ItemGroup>
50-
50+
5151
<ItemGroup Label="Dynamic Versioning" Condition="'$(IsCSharpProject)' == 'true'">
5252
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleToAttribute">
5353
<_Parameter1>"DynamicProxyGenAssembly2"</_Parameter1>
@@ -88,12 +88,15 @@
8888

8989
<!-- Test Projects. -->
9090
<PropertyGroup Label="Testing Project Properties" Condition="'$(IsTestProject)' == 'true'">
91-
<NoWarn>$(NoWarn);CA1707</NoWarn>
91+
<OutputType>Exe</OutputType>
92+
93+
<UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
94+
<TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
95+
96+
<NoWarn>$(NoWarn);CA1707;CA1822</NoWarn>
9297

9398
<CollectCoverage>true</CollectCoverage>
94-
<CoverletOutput Condition=" '$(OutputPath)' != '' ">$(OutputPath)/</CoverletOutput>
95-
<CoverletOutputFormat>cobertura,json</CoverletOutputFormat>
96-
<Exclude>[NSubstitute*]*,[xunit.*]*</Exclude>
99+
<Exclude>[NSubstitute*]*,[xunit.*]*,[TUnit.*]*</Exclude>
97100
<ExcludeByAttribute>System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute</ExcludeByAttribute>
98101

99102
<Packable>false</Packable>
@@ -104,42 +107,42 @@
104107
<EnableDynamicNativeInstrumentation>False</EnableDynamicNativeInstrumentation>
105108
</PropertyGroup>
106109

107-
<ItemGroup Label="Test AssemblyInfo and Runner Properties" Condition="'$(IsTestProject)' == 'true'">
108-
<AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
109-
110-
<AssemblyAttribute Include="Xunit.AssemblyTrait">
110+
<ItemGroup Label="Testing NuGet Packages" Condition="'$(IsTestProject)' == 'true'">
111+
<Using Include="Shouldly" />
112+
<Using Include="Xunit" />
113+
<Using Include="NSubstitute" />
114+
115+
<Content Include="$(MSBuildThisFileDirectory)xunit/xunit.runner.json" Link="Properties/shared-xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
116+
117+
<AssemblyAttribute Include="Xunit.Trait">
111118
<_Parameter1>Category</_Parameter1>
112119
<_Parameter2>$(TestingType)</_Parameter2>
113120
</AssemblyAttribute>
114121

115-
<Content Include="$(MSBuildThisFileDirectory)xunit/xunit.runner.json" Link="Properties/shared-xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
116-
</ItemGroup>
117-
118-
<ItemGroup Label="Testing NuGet Packages" Condition="'$(IsTestProject)' == 'true'">
119-
<!-- Implicit usings for tests. -->
120-
<Using Include="FluentAssertions" />
121-
<Using Include="NSubstitute" />
122-
<Using Include="Xunit" />
122+
<AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
123123

124-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
125124
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" />
126125
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" />
126+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
127127

128-
<PackageReference Include="FluentAssertions" />
129-
<PackageReference Include="NCrunch.Framework" />
130-
<PackageReference Include="NSubstitute" />
128+
<PackageReference Include="Shouldly" />
131129

130+
<PackageReference Include="NSubstitute" />
132131
<PackageReference Include="NSubstitute.Analyzers.CSharp">
133132
<PrivateAssets>all</PrivateAssets>
134133
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
135134
</PackageReference>
136135

137-
<PackageReference Include="xunit" />
138-
<PackageReference Include="xunit.analyzers" />
136+
<PackageReference Include="NCrunch.Framework" />
137+
138+
<PackageReference Include="xunit.v3" />
139+
<PackageReference Include="xunit.analyzers">
140+
<PrivateAssets>all</PrivateAssets>
141+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
142+
</PackageReference>
139143
<PackageReference Include="xunit.runner.visualstudio">
140144
<PrivateAssets>all</PrivateAssets>
141145
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
142146
</PackageReference>
143-
144147
</ItemGroup>
145148
</Project>

‎src/Directory.Packages.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
<PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(MSCodeAnalysisCSharpVersion)" />
1212
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="$(MSCodeAnalysisCSharpVersion)" />
1313
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
14-
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
15-
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
14+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.1" />
15+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.1" />
1616
</ItemGroup>
1717
<ItemGroup Label="Testing">
18-
<PackageVersion Include="FluentAssertions" Version="7.0.0" />
18+
<PackageVersion Include="Shouldly" Version="4.3.0" />
1919
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
2020
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.13.1" />
21-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.4.3" />
21+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="1.5.3" />
2222
<PackageVersion Include="NCrunch.Framework" Version="5.11.0" />
2323
<PackageVersion Include="NSubstitute" Version="5.3.0" />
2424
<PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
25-
<PackageVersion Include="xunit" Version="2.9.2" />
26-
<PackageVersion Include="xunit.analyzers" Version="1.17.0" />
27-
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
25+
<PackageVersion Include="xunit.v3" Version="1.0.1" />
26+
<PackageVersion Include="xunit.analyzers" Version="1.19.0" />
27+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
2828
<PackageVersion Include="Verify.SourceGenerators" Version="2.5.0" />
29-
<PackageVersion Include="Verify.Xunit" Version="28.4.0" />
29+
<PackageVersion Include="Verify.Xunit" Version="28.9.0" />
3030
</ItemGroup>
3131
</Project>

0 commit comments

Comments
 (0)