Skip to content

Commit 8cad3bf

Browse files
CZEMacLeodCZEMacLeod
committed
Use newer change build detection and re-enable tests
1 parent c602413 commit 8cad3bf

7 files changed

Lines changed: 65 additions & 58 deletions

File tree

‎C3D.Extensions.Logging.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logging", "Logging", "{89F0
4444
EndProject
4545
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Xunit", "Xunit", "{74840659-1377-4364-8CB0-09D50519E7C0}"
4646
EndProject
47-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "C3D.Extensions.Logging.Xunit.Test", "test\C3D\Extensions\Logging\Xunit\Test\C3D.Extensions.Logging.Xunit.Test.csproj", "{1DD05E2C-7167-42A7-8892-3A9A14C0984F}"
47+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "C3D.Extensions.Logging.Xunit.Tests", "test\C3D\Extensions\Logging\Xunit\Test\C3D.Extensions.Logging.Xunit.Tests.csproj", "{1DD05E2C-7167-42A7-8892-3A9A14C0984F}"
4848
EndProject
4949
Global
5050
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎Directory.Build.props‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<GitProjectDirectory>$(MSBuildProjectDirectory)</GitProjectDirectory>
4-
<GitTestProjectDirectory />
53
<IsTestProject>false</IsTestProject>
64
<SolutionDir Condition="'$(SolutionDir)'==''">$(MSBuildThisFileDirectory)</SolutionDir>
75
</PropertyGroup>

‎Directory.Build.targets‎

Lines changed: 38 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,61 @@
4848

4949
<Target Name="PackIfChanged">
5050
<ItemGroup>
51-
<_Temporary Remove="@_Temporary)" />
51+
<_Temporary Remove="@(_Temporary)" />
5252
<_Temporary Include="$(git_commit_ids)" />
5353
</ItemGroup>
54+
<ItemGroup>
55+
<GitProjectDirectory Include="$(MSBuildProjectDirectory)" />
56+
<GitProjectDirectory Include="@(ProjectReference->DirectoryName())" />
57+
</ItemGroup>
58+
<Message Importance="high" Text="Project: $(MSBuildProjectName)" />
5459
<Message Importance="high" Text="Git Commit IDs: %(_Temporary.Identity)" />
55-
<Message Importance="high" Text="GitProjectDirectory: $(GitProjectDirectory)" />
56-
<Message Importance="high" Text="GitTestProjectDirectory: $(GitTestProjectDirectory)" Condition="'$(GitTestProjectDirectory)'!=''" />
60+
<Message Importance="high" Text="GitProjectDirectory: $([MSBuild]::MakeRelative($(SolutionDir),'%(GitProjectDirectory.Identity)'))" />
61+
5762
<PropertyGroup>
5863
<_GitCommand>git log --pretty=tformat:"%%H" -n1 .</_GitCommand>
5964
</PropertyGroup>
60-
<Exec Command="$(_GitCommand)" WorkingDirectory="$(GitProjectDirectory)" ConsoleToMSBuild="true" Condition="'$(ProjectCommitID)'==''">
61-
<Output TaskParameter="ConsoleOutput" PropertyName="ProjectCommitID" />
62-
</Exec>
63-
<Exec Command="$(_GitCommand)" WorkingDirectory="$(GitTestProjectDirectory)" ConsoleToMSBuild="true" Condition="'$(TestProjectCommitID)'=='' AND '$(GitTestProjectDirectory)'!=''">
64-
<Output TaskParameter="ConsoleOutput" PropertyName="TestProjectCommitID" />
65+
<Exec Command="$(_GitCommand)" WorkingDirectory="%(GitProjectDirectory.Identity)" ConsoleToMSBuild="true">
66+
<Output TaskParameter="ConsoleOutput" ItemName="ProjectCommitID" />
6567
</Exec>
66-
<Message Importance="high" Text="ProjectCommitID: $(ProjectCommitID)" />
67-
<Message Importance="high" Text="TestProjectCommitID: $(TestProjectCommitID)" Condition="'$(TestProjectCommitID)'!=''" />
68+
<ItemGroup>
69+
<ProjectCommitID Condition="'%(Identity)' != '' AND
70+
'@(ProjectCommitID)' != '' AND
71+
'@(_Temporary)' != ''">
72+
<CommitIDFound>true</CommitIDFound>
73+
</ProjectCommitID>
74+
</ItemGroup>
75+
<Message Importance="high" Text="ProjectCommitID: %(ProjectCommitID.Identity) %(ProjectCommitID.CommitIDFound)" />
76+
6877
<Message Importance="high" Text="IsPackable: $(IsPackable)" />
6978
<Message Importance="high" Text="IsTestProject: $(IsTestProject)" />
79+
7080
<PropertyGroup>
71-
<CommitIDFound Condition="'$(ProjectCommitID)'=='%(_Temporary.Identity)'">true</CommitIDFound>
72-
<CommitIDFound Condition="'$(TestProjectCommitID)'!='' AND '$(TestProjectCommitID)'=='%(_Temporary.Identity)'">true</CommitIDFound>
73-
<CommitIDFound Condition="'$(ProjectToBuild)'=='$(MSBuildProjectName)'">true</CommitIDFound>
81+
<CommitIDFound Condition="'%(ProjectCommitID.CommitIDFound)'=='true'">true</CommitIDFound>
7482
<CommitIDFound Condition="'$(CommitIDFound)'==''">false</CommitIDFound>
7583
</PropertyGroup>
84+
<Message Importance="high" Text="CommitIDFound: $(CommitIDFound)" />
7685
<ItemGroup>
77-
<_Temporary Remove="@_Temporary)" />
86+
<_Temporary Remove="@(_Temporary)" />
87+
<_Temporary Include="$(ProjectToBuild)" />
88+
</ItemGroup>
89+
<Message Importance="high" Text="Projects To Build: %(_Temporary.Identity)" />
90+
<PropertyGroup>
91+
<BuildProject>$(CommitIDFound)</BuildProject>
92+
<BuildProject Condition="'$(MSBuildProjectName)'=='%(_Temporary.Identity)'">true</BuildProject>
93+
</PropertyGroup>
94+
<Message Importance="high" Text="BuildProject: $(BuildProject)" />
95+
96+
<ItemGroup>
97+
<_Temporary Remove="@(_Temporary)" />
7898
</ItemGroup>
79-
<Message Importance="high" Text="CommitIDFound: $(CommitIDFound)" />
8099

81100
<!-- Pack libraries -->
82-
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Pack" Condition="'$(IsPackable)'=='true' AND '$(CommitIDFound)'=='true'" />
101+
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Pack" Condition="'$(IsPackable)'=='true' AND '$(BuildProject)'=='true'" />
83102
<!-- Build sample and test projects to ensure they can build correctly -->
84-
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Build" Condition="'$(IsPackable)'=='false' AND '$(CommitIDFound)'=='true'" />
103+
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Build" Condition="'$(IsPackable)'=='false' AND '$(BuildProject)'=='true'" />
85104
<!-- Rebuild test projects with project references for code coverage -->
86-
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Build" Condition="'$(IsTestProject)'=='true' AND '$(CommitIDFound)'=='true'" />
87-
<Message Importance="high" Text="##vso[build.addbuildtag]$(MSBuildProjectName)" Condition="'$(IsPackable)'=='true' AND '$(CommitIDFound)'=='true'" />
105+
<MSBuild Projects="$(MSBuildProjectFile)" Targets="Build" Condition="'$(IsTestProject)'=='true' AND '$(BuildProject)'=='true'" />
106+
<Message Importance="high" Text="##vso[build.addbuildtag]$(MSBuildProjectName)" Condition="'$(IsPackable)'=='true' AND '$(BuildProject)'=='true'" />
88107
</Target>
89108
</Project>

‎build/azure-pipelines.yml‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,11 @@ steps:
118118
versionSpec: '>=6.6.1'
119119
checkLatest: true
120120

121+
- task: VisualStudioTestPlatformInstaller@1
122+
inputs:
123+
packageFeedSelector: 'nugetOrg'
124+
versionSelector: 'latestStable'
125+
121126
- task: NuGetCommand@2
122127
inputs:
123128
command: 'restore'
@@ -134,27 +139,25 @@ steps:
134139
clean: true
135140
msbuildArgs: '/t:$(target) /p:ProjectToBuild=$(project_to_build) /p:ContinuousIntegrationBuild=true /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)" /p:BuildUser="$(buildUser)" /p:BuildMachine="$(buildMachine)" /p:AssemblyOriginatorKeyFile="$(snk.secureFilePath)"'
136141

137-
# This is failing at present...
138-
139-
#- task: VSTest@2
140-
# inputs:
141-
# testSelector: 'testAssemblies'
142-
# testAssemblyVer2: |
143-
# **\*.Test.dll
144-
# !**\*TestAdapter.dll
145-
# !**\*TestCentric*.dll
146-
# !**\*TestHost*.dll
147-
# !**\*TestPlatform*.dll
148-
# !**\obj\**
149-
# searchFolder: '$(System.DefaultWorkingDirectory)\test'
150-
# vstestLocationMethod: 'location'
151-
# vstestLocation: $(VSTestPath)
152-
# platform: '$(buildPlatform)'
153-
# configuration: '$(buildConfiguration)'
154-
# codeCoverageEnabled: true
155-
# minimumExpectedTests: 0
156-
# failOnMinTestsNotRunFail: false
157-
# failIfCoverageEmpty: false
142+
- task: VSTest@2
143+
inputs:
144+
testSelector: 'testAssemblies'
145+
testAssemblyVer2: |
146+
**\*.Tests.dll
147+
!**\*TestAdapter.dll
148+
!**\*TestCentric*.dll
149+
!**\*TestHost*.dll
150+
!**\*TestPlatform*.dll
151+
!**\obj\**
152+
searchFolder: 'test'
153+
vstestLocationMethod: 'version'
154+
vsTestVersion: 'toolsInstaller'
155+
platform: '$(buildPlatform)'
156+
configuration: '$(buildConfiguration)'
157+
codeCoverageEnabled: true
158+
minimumExpectedTests: 0
159+
failOnMinTestsNotRunFail: false
160+
failIfCoverageEmpty: false
158161

159162
- task: PublishBuildArtifacts@1
160163
inputs:

‎src/Directory.Build.Targets‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,6 @@
66
<DebugType Condition=" '$(Configuration)' == 'Debug' ">Full</DebugType>
77
</PropertyGroup>
88

9-
<PropertyGroup Condition="'$(SignType)' == 'Test'">
10-
<SignAssembly>true</SignAssembly>
11-
<AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)Test.snk</AssemblyOriginatorKeyFile>
12-
</PropertyGroup>
13-
14-
<PropertyGroup Condition="'$(SignType)' == 'Real'">
15-
<SignAssembly>true</SignAssembly>
16-
<DelaySign Condition="'$(IsTestProject)' != 'true'">true</DelaySign>
17-
<AssemblyOriginatorKeyFile Condition="'$(IsTestProject)' != 'true'">$(MSBuildThisFileDirectory)..\build\cloud3d-codesign.snk</AssemblyOriginatorKeyFile>
18-
<AssemblyOriginatorKeyFile Condition="'$(IsTestProject)' == 'true'">$(MSBuildThisFileDirectory)..\build\Test.snk</AssemblyOriginatorKeyFile>
19-
</PropertyGroup>
20-
219
<PropertyGroup>
2210
<Authors>CZEMacLeod</Authors>
2311
<Company>Cloud3D Ltd.</Company>

test/C3D/Extensions/Logging/Xunit/Test/C3D.Extensions.Logging.Xunit.Test.csproj renamed to test/C3D/Extensions/Logging/Xunit/Test/C3D.Extensions.Logging.Xunit.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<LangVersion>10.0</LangVersion>
88
<IsTestProject>true</IsTestProject>
99

10-
<GitProjectDirectory>$(SolutionDir)\src\C3D\Extensions\Logging\Xunit\</GitProjectDirectory>
10+
<PUTDirectory>$(SolutionDir)\src\C3D\Extensions\Logging\Xunit\</PUTDirectory>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
@@ -27,7 +27,7 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<ProjectReference Include="$(GitProjectDirectory)C3D.Extensions.Logging.Xunit.csproj" />
30+
<ProjectReference Include="$(PUTDirectory)C3D.Extensions.Logging.Xunit.csproj" />
3131
</ItemGroup>
3232

3333
</Project>

‎test/Directory.Build.Props‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33

44
<PropertyGroup>
55
<IsPackable>false</IsPackable>
6-
<GitTestProjectDirectory>$(MSBuildProjectDirectory)</GitTestProjectDirectory>
76
</PropertyGroup>
87
</Project>

0 commit comments

Comments
 (0)