Skip to content

Commit 973f3d7

Browse files
wasabiiwasabii
committed
Change versioning mode.
Fix publish stuff.
1 parent a7213f4 commit 973f3d7

File tree

2 files changed

+15
-90
lines changed

2 files changed

+15
-90
lines changed

‎Directory.Build.targets

+2-89
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,5 @@
11
<Project>
2-
3-
<Target Name="AssignPublishProjectConfiguration" Condition=" '@(PublishProjectReference)' != '' " Inputs="@(PublishProjectReference)" Outputs="dummy">
4-
<PropertyGroup>
5-
<OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration Condition="'$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)' == ''">true</OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration>
6-
<ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == '' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildingSolutionFile)' == 'true')">true</ShouldUnsetParentConfigurationAndPlatform>
7-
<ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == ''">false</ShouldUnsetParentConfigurationAndPlatform>
8-
<AddSyntheticProjectReferencesForSolutionDependencies Condition="'$(AddSyntheticProjectReferencesForSolutionDependencies)' == '' and '$(TargetFrameworkIdentifier)' == 'Silverlight'">false</AddSyntheticProjectReferencesForSolutionDependencies>
9-
<AddSyntheticProjectReferencesForSolutionDependencies Condition="'$(AddSyntheticProjectReferencesForSolutionDependencies)' == '' and '$(BuildingInsideVisualStudio)' != 'true'">true</AddSyntheticProjectReferencesForSolutionDependencies>
10-
</PropertyGroup>
11-
<AssignProjectConfiguration
12-
ProjectReferences="@(PublishProjectReference)"
13-
CurrentProject="$(MSBuildProjectFullPath)"
14-
CurrentProjectConfiguration="$(Configuration)"
15-
CurrentProjectPlatform="$(Platform)"
16-
DefaultToVcxPlatformMapping="$(DefaultToVcxPlatformMapping)"
17-
VcxToDefaultPlatformMapping="$(VcxToDefaultPlatformMapping)"
18-
OutputType="$(OutputType)"
19-
ResolveConfigurationPlatformUsingMappings="false"
20-
SolutionConfigurationContents="$(CurrentSolutionConfigurationContents)"
21-
AddSyntheticProjectReferencesForSolutionDependencies="$(AddSyntheticProjectReferencesForSolutionDependencies)"
22-
OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration = "$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)"
23-
ShouldUnsetParentConfigurationAndPlatform = "$(ShouldUnsetParentConfigurationAndPlatform)" >
24-
<Output TaskParameter="AssignedProjects" ItemName="_PublishProjectReferenceWithConfiguration"/>
25-
<Output TaskParameter="UnassignedProjects" ItemName="_PublishProjectReferenceWithConfiguration"/>
26-
</AssignProjectConfiguration>
27-
</Target>
28-
29-
<Target Name="GetPublishProjectReferences" DependsOnTargets="AssignPublishProjectConfiguration" Inputs="@(_PublishProjectReferenceWithConfiguration)" Outputs="dummy">
30-
<ItemGroup>
31-
<_PublishProjectReference Include="@(_PublishProjectReferenceWithConfiguration)">
32-
<ProjectName>$([System.IO.Path]::GetFileNameWithoutExtension('%(Identity)'))</ProjectName>
33-
<PublishTargetPath Condition=" '%(_PublishProjectReferenceWithConfiguration.PublishTargetPath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_PublishProjectReferenceWithConfiguration.PublishTargetPath)'))</PublishTargetPath>
34-
<PublishPackagePath Condition=" '%(_PublishProjectReferenceWithConfiguration.PublishPackagePath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_PublishProjectReferenceWithConfiguration.PublishPackagePath)'))</PublishPackagePath>
35-
</_PublishProjectReference>
36-
</ItemGroup>
37-
</Target>
38-
39-
<Target Name="GetPublishProjectReferenceItems" DependsOnTargets="GetPublishProjectReferences" Inputs="@(_PublishProjectReference)" Outputs="dummy">
40-
<MSBuild Projects="@(_PublishProjectReference)" Targets="Publish;PublishItemsOutputGroup" BuildInParallel="$(BuildInParallel)" Properties="%(_PublishProjectReference.SetConfiguration);%(_PublishProjectReference.SetPlatform);%(_PublishProjectReference.SetTargetFramework);%(_PublishProjectReference.PublishProperties)" RemoveProperties="%(_PublishProjectReference.GlobalPropertiesToRemove);%(_PublishProjectReference.PublishPropertiesToRemove);" RebaseOutputs="true">
41-
<Output TaskParameter="TargetOutputs" ItemName="_PublishProjectReferenceItems" />
42-
</MSBuild>
43-
</Target>
44-
45-
<Target Name="GetPublishProjectReferenceCopyToOutputDirectoryItems" DependsOnTargets="GetPublishProjectReferenceItems">
46-
<ItemGroup>
47-
<ContentWithTargetPath Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.PublishTargetPath)' != '' ">
48-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49-
<TargetPath>%(_PublishProjectReferenceItems.PublishTargetPath)%(_PublishProjectReferenceItems.TargetPath)</TargetPath>
50-
<Pack Condition=" '%(_PublishProjectReferenceItems.PublishPackagePath)' != '' ">true</Pack>
51-
<PackagePath Condition=" '%(_PublishProjectReferenceItems.PublishPackagePath)' != '' ">%(_PublishProjectReferenceItems.PublishPackagePath)%(_PublishProjectReferenceOutputItems.TargetPath)</PackagePath>
52-
</ContentWithTargetPath>
53-
</ItemGroup>
54-
</Target>
55-
56-
<PropertyGroup>
57-
<GetCopyToOutputDirectoryItemsDependsOn>
58-
AssignPublishProjectConfiguration;
59-
GetPublishProjectReferences;
60-
GetPublishProjectReferenceItems;
61-
GetPublishProjectReferenceCopyToOutputDirectoryItems;
62-
$(GetCopyToOutputDirectoryItemsDependsOn);
63-
</GetCopyToOutputDirectoryItemsDependsOn>
64-
</PropertyGroup>
65-
66-
<Target Name="GetPublishProjectReferencePackageItems" DependsOnTargets="GetPublishProjectReferenceItems">
67-
<ItemGroup>
68-
<_PackageFiles Include="@(_PublishProjectReferenceItems->Distinct())" Condition=" '%(_PublishProjectReferenceItems.PublishPackagePath)' != '' ">
69-
<PackagePath>%(_PublishProjectReferenceItems.PublishPackagePath)%(_PublishProjectReferenceItems.TargetPath)</PackagePath>
70-
</_PackageFiles>
71-
</ItemGroup>
72-
</Target>
73-
74-
<PropertyGroup>
75-
<GetPublishProjectReferenceItemsBeforePackageFilesDependsOn>
76-
AssignPublishProjectConfiguration;
77-
GetPublishProjectReferences;
78-
GetPublishProjectReferenceItems;
79-
GetPublishProjectReferencePackageItems;
80-
$(GetPublishProjectReferenceItemsBeforePackageFilesDependsOn);
81-
</GetPublishProjectReferenceItemsBeforePackageFilesDependsOn>
82-
</PropertyGroup>
83-
84-
<Target Name="GetPublishProjectReferencePackageItemsBeforeGetPackageFiles" DependsOnTargets="$(GetPublishProjectReferenceItemsBeforePackageFilesDependsOn)" BeforeTargets="_GetPackageFiles">
85-
86-
</Target>
87-
88-
<Target Name="GetPackageOutputPath" DependsOnTargets="_GetAbsoluteOutputPathsForPack" Returns="$(PackageOutputAbsolutePath)">
89-
90-
</Target>
2+
3+
914

925
</Project>

‎GitVersion.yml

+13-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,13 @@
1-
mode: Mainline
1+
major-version-bump-message: '\+semver:\s?(major)'
2+
minor-version-bump-message: '\+semver:\s?(minor)'
3+
patch-version-bump-message: '\+semver:\s?(patch)'
4+
branches:
5+
develop:
6+
regex: ^dev(elop)?(ment)?$
7+
tag: develop
8+
release:
9+
regex: ^release?[/-]
10+
tag: prerelease
11+
hotfix:
12+
regex: ^hotfix?[/-]
13+
tag: prerelease

0 commit comments

Comments
 (0)