Skip to content

[Java.Interop] $(Version) depends on TargetFramework #952

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

Merged
jonpryor merged 1 commit into from
Feb 11, 2022
Merged

[Java.Interop] $(Version) depends on TargetFramework #952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,13 +62,17 @@
<UtilityOutputFullPath Condition=" '$(UtilityOutputFullPathCoreApps)' != '' ">$(UtilityOutputFullPathCoreApps)</UtilityOutputFullPath>
<UtilityOutputFullPath Condition=" '$(UtilityOutputFullPathCoreApps)' == '' ">$(ToolOutputFullPath)</UtilityOutputFullPath>
<RollForward>Major</RollForward>
<JIUtilityVersion>$(JINetToolVersion)</JIUtilityVersion>
<JICoreLibVersion>$(JINetCoreLibVersion)</JICoreLibVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(JIBuildingForNetCoreApp)' != 'True' ">
<IntermediateOutputPath>$(BaseIntermediateOutputPath)\$(Configuration)</IntermediateOutputPath>
<BuildToolOutputFullPath>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\</BuildToolOutputFullPath>
<ToolOutputFullPath>$(MSBuildThisFileDirectory)bin\$(Configuration)\</ToolOutputFullPath>
<TestOutputFullPath>$(MSBuildThisFileDirectory)bin\Test$(Configuration)\</TestOutputFullPath>
<UtilityOutputFullPath Condition=" '$(UtilityOutputFullPath)' == '' ">$(ToolOutputFullPath)</UtilityOutputFullPath>
<JIUtilityVersion>$(JIOldToolVersion)</JIUtilityVersion>
<JICoreLibVersion>$(JIOldCoreLibVersion)</JICoreLibVersion>
</PropertyGroup>
<PropertyGroup>
<XamarinAndroidToolsDirectory Condition=" '$(XamarinAndroidToolsDirectory)' == '' ">$(MSBuildThisFileDirectory)external\xamarin-android-tools</XamarinAndroidToolsDirectory>
Expand Down Expand Up @@ -119,4 +123,8 @@
<NoWarn>$(NoWarn);CA1307;CA1309;CA1310</NoWarn>
</PropertyGroup>

<PropertyGroup>
<Version>$(JIUtilityVersion)</Version>
</PropertyGroup>

</Project>
2 changes: 2 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,6 @@
<PackageReference Update="XliffTasks" Version="1.0.0-beta.20420.1" />
</ItemGroup>

<Import Project="build-tools\scripts\VersionInfo.targets" />

</Project>
2 changes: 1 addition & 1 deletion GitInfo.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1
6.0
6 changes: 6 additions & 0 deletions build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,13 @@
<OutputPath>$(BuildToolOutputFullPath)</OutputPath>
</PropertyGroup>

<PropertyGroup>
<GitDefaultBranch>main</GitDefaultBranch>
<GitThisAssembly>false</GitThisAssembly>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitInfo" />
<PackageReference Include="Microsoft.Build.Framework" />
<PackageReference Include="Microsoft.Build.Utilities.Core" />
<PackageReference Include="NUnit.ConsoleRunner" GeneratePathProperty="True" />
Expand Down
33 changes: 33 additions & 0 deletions build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,4 +105,37 @@
<Touch Files="$(_OutputPath)PackagePaths.props" />
</Target>

<Target Name="_CreateVersionProps"
AfterTargets="Build"
DependsOnTargets="GitVersion"
Inputs="$(MSBuildThisFileFullPath);$(MSBuildThisFileDirectory)Java.Interop.BootstrapTasks.csproj"
Outputs="$(_OutputPath)Versions.props">
<PropertyGroup>
<_NetToolVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</_NetToolVersion>
<_OldToolVersion>0.2.$(GitBaseVersionPatch).$(GitCommits)</_OldToolVersion>
<_NetCoreLibVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0</_NetCoreLibVersion>
<_OldCoreLibVersion>0.1.0.0</_OldCoreLibVersion>
<_FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)</_FileVersion>
</PropertyGroup>
<ItemGroup>
<_VersionsLine Include="&lt;Project&gt;" />
<_VersionsLine Include=" &lt;PropertyGroup&gt;" />
<_VersionsLine Include=" &lt;FileVersion&gt;$(_FileVersion)&lt;/FileVersion&gt;" />
<_VersionsLine Include=" &lt;JINetToolVersion&gt;$(_NetToolVersion)&lt;/JINetToolVersion&gt;" />
<_VersionsLine Include=" &lt;JIOldToolVersion&gt;$(_OldToolVersion)&lt;/JIOldToolVersion&gt;" />
<_VersionsLine Include=" &lt;JINetCoreLibVersion&gt;$(_NetCoreLibVersion)&lt;/JINetCoreLibVersion&gt;" />
<_VersionsLine Include=" &lt;JIOldCoreLibVersion&gt;$(_OldCoreLibVersion)&lt;/JIOldCoreLibVersion&gt;" />
<_VersionsLine Include=" &lt;JIBuildBranch&gt;$(GitBranch)&lt;/JIBuildBranch&gt;" />
<_VersionsLine Include=" &lt;JIBuildCommit&gt;$(GitCommit)&lt;/JIBuildCommit&gt;" />
<_VersionsLine Include=" &lt;/PropertyGroup&gt;" />
<_VersionsLine Include="&lt;/Project&gt;" />
</ItemGroup>
<WriteLinesToFile
File="$(_OutputPath)Version.props"
Lines="@(_VersionsLine)"
Overwrite="True"
/>
<Touch Files="$(_OutputPath)Version.props" />
</Target>

</Project>
8 changes: 0 additions & 8 deletions build-tools/scripts/Version.props.in
View file
Open in desktop

This file was deleted.

32 changes: 7 additions & 25 deletions build-tools/scripts/VersionInfo.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project>

<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Java.Interop.BootstrapTasks.dll"
TaskName="Java.Interop.BootstrapTasks.ReplaceFileContents" />
<PropertyGroup>
<GitDefaultBranch>main</GitDefaultBranch>
<GitThisAssembly>false</GitThisAssembly>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitInfo" PrivateAssets="all" />
</ItemGroup>

<Target Name="GenerateVersionInfo"
AfterTargets="Build"
DependsOnTargets="GitVersion"
Condition="!Exists ('$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props')">
<ItemGroup>
<Replacements Include="@VERSION@" Replacement="$(GitSemVerMajor).$(GitSemVerMinor).$(GitSemVerPatch).0"/>
<Replacements Include="@COMMIT@" Replacement="$(GitCommit)"/>
<Replacements Include="@BRANCH@" Replacement="$(GitBranch)"/>
</ItemGroup>
<ReplaceFileContents
TemplateFile="$(MSBuildThisFileDirectory)Version.props.in"
OutputFile="$(MSBuildThisFileDirectory)..\..\bin\Build$(Configuration)\Version.props"
Replacements="@(Replacements)"
/>
<Target Name="_SetInformationalVersion"
BeforeTargets="GetAssemblyVersion;GetPackageVersion">
<PropertyGroup>
<InformationalVersion>$(Version) git-rev-head:$(JIBuildCommit) git-branch:$(JIBuildBranch)</InformationalVersion>
</PropertyGroup>
</Target>

</Project>
1 change: 1 addition & 0 deletions src/Java.Base/Java.Base.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Nullable>enable</Nullable>
<NoWarn>$(NoWarn);8764</NoWarn>
<Version>$(JICoreLibVersion)</Version>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<AssemblyTitle>Java.Interop.Dynamic</AssemblyTitle>
<Version>0.1.0.0</Version>
<Version>$(JICoreLibVersion)</Version>
</PropertyGroup>
<PropertyGroup>
<OutputPath>$(ToolOutputFullPath)</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop.Export/Java.Interop.Export.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<AssemblyTitle>Java.Interop.Export</AssemblyTitle>
<Version>0.1.0.0</Version>
<Version>$(JICoreLibVersion)</Version>
</PropertyGroup>
<PropertyGroup>
<OutputPath>$(ToolOutputFullPath)</OutputPath>
Expand Down
1 change: 1 addition & 0 deletions src/Java.Interop.GenericMarshaler/Java.Interop.GenericMarshaler.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
</PropertyGroup>
<PropertyGroup>
<OutputPath>$(ToolOutputFullPath)</OutputPath>
<Version>$(JICoreLibVersion)</Version>
</PropertyGroup>
<ItemGroup>
<None Include="Java.Interop.GenericMarshaler\JniPeerInstanceMethodsExtensions.tt">
Expand Down
2 changes: 1 addition & 1 deletion src/Java.Interop/Java.Interop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<Nullable>enable</Nullable>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
<Version>0.1.0.0</Version>
<Version>$(JICoreLibVersion)</Version>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
Expand Down
1 change: 1 addition & 0 deletions src/Java.Runtime.Environment/Java.Runtime.Environment.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<PropertyGroup>
<OutputPath>$(TestOutputFullPath)</OutputPath>
<Version>$(JICoreLibVersion)</Version>
</PropertyGroup>

<ItemGroup>
Expand Down