Skip to content

Try to fix the branch info in gitInfo #871

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

Closed
wants to merge 2 commits into from
Closed

Try to fix the branch info in gitInfo #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
818b8ab
Try to fix the branch info in gitInfo
dellis1972 Aug 20, 2021
8fbc319
Try to ensure that the version gets set for the Xamarin.Android
dellis1972 Aug 25, 2021
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
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,14 +87,14 @@

<!-- GitInfo Package for Assembly Versioning -->
<ItemGroup>
<PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" />
<PackageReference Include="GitInfo" Version="2.1.2" PrivateAssets="all" GeneratePathProperty="true" />
</ItemGroup>
<PropertyGroup>
<GitDefaultBranch>main</GitDefaultBranch>
<GitThisAssembly>false</GitThisAssembly>
</PropertyGroup>

<Target Name="SetVersion" BeforeTargets="GetAssemblyVersion;GetPackageVersion" DependsOnTargets="GitVersion">
<Target Name="SetVersion" BeforeTargets="GetAssemblyVersion;GetPackageVersion" DependsOnTargets="GitVersion" Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">
<PropertyGroup>
<Version>$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch)</Version>
<InformationalVersion>$(Version); git-rev-head:$(GitCommit); git-branch:$(GitBranch)</InformationalVersion>
Expand Down
2 changes: 2 additions & 0 deletions src/Java.Interop/Java.Interop-MonoAndroid.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<LangVersion>8.0</LangVersion>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
</PropertyGroup>
<Import Project="$(PkgGitInfo)\build\GitInfo.targets" Condition="Exists ('$(PkgGitInfo)\build\GitInfo.targets')" />
<Import Project="..\..\Directory.Build.props" />
<PropertyGroup>
<XAConfigPath>..\..\bin\Build$(Configuration)\XAConfig.props</XAConfigPath>
Expand Down Expand Up @@ -85,6 +86,7 @@
<Import Project="Directory.Build.targets" />
<PropertyGroup>
<BuildDependsOn>
SetVersion;
BuildJniEnvironment_g_cs;
BuildInteropJar;
$(BuildDependsOn)
Expand Down