Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ jobs:
shell: bash
run: >-
dotnet build TUnit.CI.slnx -c Release
-p:DisableGitVersionTask=true
"-p:Version=${{ steps.gitversion.outputs.semVer }}"
"-p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }}"
"-p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }}"
Expand All @@ -143,7 +142,6 @@ jobs:
run: >-
dotnet publish TUnit.TestProject/TUnit.TestProject.csproj -c Release
--use-current-runtime -p:Aot=true -o TESTPROJECT_AOT --framework net10.0
-p:DisableGitVersionTask=true
"-p:Version=${{ steps.gitversion.outputs.semVer }}"
"-p:AssemblyVersion=${{ steps.gitversion.outputs.assemblySemVer }}"
"-p:FileVersion=${{ steps.gitversion.outputs.assemblySemFileVer }}"
Expand Down
6 changes: 4 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>

<PropertyGroup Condition="$(MSBuildProjectName) == 'TUnit.Pipeline'">
<PropertyGroup Condition="'$(MSBuildProjectName)' == 'TUnit.Pipeline'">
<TargetFrameworks>net10.0</TargetFrameworks>
</PropertyGroup>

Expand All @@ -14,7 +14,9 @@
</PropertyGroup>

<PropertyGroup>
<!-- We only need GitVersion.MsBuild for version properties, not the generated class -->
<!-- Disable GitVersion MSBuild task by default - CI computes version once and passes properties explicitly.
This prevents GitVersion from spawning a process per project×TFM (153+ invocations). -->
<DisableGitVersionTask>true</DisableGitVersionTask>
<GenerateGitVersionInformation>false</GenerateGitVersionInformation>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand Down
2 changes: 1 addition & 1 deletion TUnit.Templates/content/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<Using Include="TUnit.Assertions.Extensions" />
</ItemGroup>

<ItemGroup Condition="$(MSBuildProjectName) == 'ExampleNamespace.TestProject' And $(MSBuildProjectDirectory.Contains('TUnit.Aspire.Starter'))">
<ItemGroup Condition="'$(MSBuildProjectName)' == 'ExampleNamespace.TestProject' And $(MSBuildProjectDirectory.Contains('TUnit.Aspire.Starter'))">
<PackageReference Remove="TUnit.Aspire" />
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\TUnit.Aspire\TUnit.Aspire.csproj" />
<Using Include="TUnit.Assertions" />
Expand Down
4 changes: 2 additions & 2 deletions TestProject.props
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

</PropertyGroup>

<Target Name="CleanSourceGeneratedViewer" BeforeTargets="BeforeBuild">
<Message Text="Removing SourceGeneratedViewer directory..." Importance="high" />
<Target Name="CleanSourceGeneratedViewer" BeforeTargets="BeforeBuild"
Condition="'$(ContinuousIntegrationBuild)' != 'true' AND Exists('$(ProjectDir)SourceGeneratedViewer')">
<ItemGroup>
<FilesToDelete Include="$(ProjectDir)SourceGeneratedViewer\**\*" />
</ItemGroup>
Expand Down
Loading