PR Feedback: Formatting, move/add conditions, output diffs to csv in logs

This commit is contained in:
Jackson Schuster 2024-03-06 11:41:32 -08:00
parent 3c848d51a3
commit 97fc3b8342
3 changed files with 13 additions and 8 deletions

View file

@ -20,6 +20,7 @@
</Target>
<Import Project="$(RepositoryEngineeringDir)build.sourcebuild.targets" Condition="'$(DotNetBuildSourceOnly)' == 'true'" />
<Import Project="$(RepositoryEngineeringDir)build.targets" />
<!-- ShortStack doesn't produce an SDK, and GetClosestOfficialSdk doesn't support finding non-portable SDKs -->
<Import Project="$(RepositoryEngineeringDir)sdkArchiveDiff.targets" Condition="'$(ShortStack)' != 'true' and '$(PortableBuild)' == 'true'" />
</Project>

View file

@ -1,13 +1,12 @@
<Project>
<UsingTask AssemblyFile="$(SdkArchiveDiffTasksAssembly)" TaskName="GetValidArchiveItems" />
<UsingTask AssemblyFile="$(SdkArchiveDiffTasksAssembly)" TaskName="GetClosestOfficialSdk" />
<UsingTask AssemblyFile="$(SdkArchiveDiffTasksAssembly)" TaskName="FindArchiveDiffs" />
<Target Name="ReportSdkArchiveDiffs"
AfterTargets="Build"
DependsOnTargets="DetermineSourceBuiltSdkVersion"
Condition="'$(ShortStack)' != 'true' AND '$(PortableBuild)' == 'true'" >
<!-- ShortStack doesn't produce an SDK, and GetClosestOfficialSdk doesn't support finding non-portable SDKs -->
DependsOnTargets="DetermineSourceBuiltSdkVersion">
<Message Text="Comparing built SDK against closest official build"
Importance="High"/>
@ -37,6 +36,12 @@
<_changedFiles Include="@(_ContentDifferences)" Condition="'%(_contentDifferences.Kind)' != 'Unchanged'" />
</ItemGroup>
<PropertyGroup>
<SdkArchiveDiffsReport>$(ArtifactsLogDir)\SdkArchiveDiffs\SdkArchiveDiffs.csv</SdkArchiveDiffsReport>
</PropertyGroup>
<WriteLinesToFile File="$(SdkArchiveDiffsReport)" Lines="%(_ContentDifference.Kind), %(_ContentDifferences.Identity)" />
<Message Text="Difference in sdk archive: %(_changedFiles.Kind): %(_changedFiles.Identity)"
Importance="High"
Condition="'@(_changedFiles->Count())' != '0'"/>
@ -44,9 +49,7 @@
Importance="High"
Condition="'@(_changedFiles->Count())' == '0'" />
<Delete Files="$(_ClosestOfficialSdkPath)"
Condition="'$(_ClosestOfficialSdkPath)' == ''"/>
<Delete Files="$(_ClosestOfficialSdkPath)" />
</Target>
</Project>

View file

@ -117,7 +117,8 @@
</Touch>
</Target>
<Target Name="BuildSdkArchiveDiff" >
<Target Name="BuildSdkArchiveDiff"
Condition="'$(ShortStack)' != 'true' and '$(PortableBuild)' == 'true'" >
<MSBuild Projects="tasks\Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff\Microsoft.DotNet.SourceBuild.Tasks.SdkArchiveDiff.csproj"
Targets="Restore"
Properties="MSBuildRestoreSessionId=$([System.Guid]::NewGuid())" />