Skip to content

PMSBuildTasks/{Props,Targets} - apply versions to intermediate or intermediate and source #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: users/hajekj/PcfVersioningSupport
Choose a base branch
from
Open

PMSBuildTasks/{Props,Targets} - apply versions to intermediate or intermediate and source #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2164ad3
Add: Settings.props
Nov 13, 2024
796e401
Add: Intermediate folder paths
Nov 13, 2024
96ee1f4
Update: Apply versions to intermediate or intermediate and source
Nov 13, 2024
8410a37
Remove: Nesting and unused item
Nov 13, 2024
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
5 changes: 5 additions & 0 deletions src/Dataverse/MSBuildTasks/Props/Settings.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<Project>
<PropertyGroup>
<ApplyVersionNumberToSource Condition="'$(ApplyVersionNumberToSource)' == ''">false</ApplyVersionNumberToSource>
</PropertyGroup>
</Project>
6 changes: 6 additions & 0 deletions src/Dataverse/MSBuildTasks/Props/SolutionFileItems.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,10 @@
<EnvironmentVariables Include="$(DataverseSolutionSourceFolderFullPath)\environmentvariabledefinitions\**\environmentvariabledefinition.xml"/>
<ResxFiles Include="$(DataverseSolutionSourceFolderFullPath)\Resources\**\*.resx"/>
</ItemGroup>
<ItemGroup>
<SolutionXmlIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Other\Solution.xml"/>
<PluginAssemblyMetadataFilesIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\PluginAssemblies\**\*.dll.data.xml"/>
<WorkflowMetadataIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\Workflows\**\*.xaml"/>
<SdkMessageProcessingStepsIntermediateOutputPath Include="$(SolutionPackagerMetadataWorkingDirectory)\SdkMessageProcessingSteps\*.xml"/>
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/Dataverse/MSBuildTasks/TALXIS.DevKit.Build.Dataverse.Tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
</PropertyGroup>
<Import Project="..\..\props\ProjectPaths.props" />
<Import Project="..\..\props\SolutionFileItems.props" />
<Import Project="..\..\props\Settings.props" />
<Import Project=".\$(MSBuildThisFileName).tasks" />
<Import Project="..\..\targets\*.targets" />
</Project>
3 changes: 2 additions & 1 deletion src/Dataverse/MSBuildTasks/Targets/ApplyVersionNumber.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project>
<Target Name="ApplyVersionNumber">
<Message Text="Updating version to $(Version) in all references..." Importance="high" />
<ApplyVersionNumber Version="$(Version)" SolutionXml="%(SolutionXml.FullPath)" PluginAssemblies="@(PluginAssemblies)" Workflows="@(WorkflowMetadata)" SdkMessageProcessingSteps="@(SdkMessageProcessingSteps)" CustomControlsFolder="$(SolutionPackagerMetadataWorkingDirectory)" />
<ApplyVersionNumber Version="$(Version)" SolutionXml="%(SolutionXmlIntermediateOutputPath.FullPath)" PluginAssemblies="@(PluginAssemblyMetadataFilesIntermediateOutputPath)" Workflows="@(WorkflowMetadataIntermediateOutputPath)" SdkMessageProcessingSteps="@(SdkMessageProcessingStepsIntermediateOutputPath)" CustomControlsFolder="$(SolutionPackagerMetadataWorkingDirectory)" />
<ApplyVersionNumber Condition="'$(ApplyVersionNumberToSource)' == 'true'" Version="$(Version)" SolutionXml="%(SolutionXml.FullPath)" PluginAssemblies="@(PluginAssemblyMetadataFiles)" Workflows="@(WorkflowMetadata)" SdkMessageProcessingSteps="@(SdkMessageProcessingSteps)" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think Controls can also be present in the source for some people

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See HAJ's solution from comment above

</Target>
</Project>