Skip to content

Commit

Permalink
[Java.Interop{,.Dynamic,.Export}] Set Version to 0.1.0.0 (#894)
Browse files Browse the repository at this point in the history
Commit 3e6a623
Context: https://discord.com/channels/732297728826277939/732297837953679412/898675755779768330

An unfortunate unexpected breakage occurred due to commit 3e6a623:
the version of `Java.Interop.dll` changed -- which we *should* have
expected but completely overlooked & forgot -- which in turn meant
that *everything* which depends upon it -- which is everything --
started breaking due to the version change, e.g.

	error CS1705: Assembly 'Microsoft.Maui' with identity 'Microsoft.Maui, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null'
	uses 'Java.Interop, Version=0.1.6.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065'
	which has a higher version than referenced assembly
	'Java.Interop' with identity 'Java.Interop, Version=0.1.2.0, Culture=neutral, PublicKeyToken=84e04ff9cfb79065'

As the primary motivation with 3e6a623 was to improve the use of
*MSBuild* task assemblies -- which `Java.Interop.dll` is *not* --
modify the logic of 3e6a623 so that:

 1. `build-tools/scripts/Version.props` allows the `$(Version)`
    property to be *overridden*, and

 2. Override `$(Version)` within `src/Java.Interop`,
    `src/Java.Interop.Dynamic`, and `src/Java.Interop.Export`.

`Java.Interop.Dynamic.dll` and `Java.Interop.Export.dll` aren't
shipped (yet), but we would like them to eventually, and it's "nicer"
if they all share the same assembly version.
  • Loading branch information
jonpryor committed Oct 18, 2021
1 parent 8ccb837 commit 2d5431f
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build-tools/scripts/AssemblyInfo.g.cs.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("@INFORMATIONALVERSION@")]
[assembly: System.Reflection.AssemblyProductAttribute("@PRODUCT@")]
[assembly: System.Reflection.AssemblyTitleAttribute("@TITLE@")]
[assembly: System.Reflection.AssemblyVersionAttribute("@VERSION@.0")]
[assembly: System.Reflection.AssemblyVersionAttribute("@VERSION@")]

// Generated by the MSBuild WriteCodeFragment class.
2 changes: 1 addition & 1 deletion build-tools/scripts/Version.props.in
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>@VERSION@</Version>
<Version Condition=" '$(Version)' == '' ">@VERSION@</Version>
<InformationalVersion>@VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@</InformationalVersion>
<Company>Microsoft Corporation</Company>
<Copyright>Microsoft Corporation</Copyright>
Expand Down
1 change: 1 addition & 0 deletions src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<AssemblyTitle>Java.Interop.Dynamic</AssemblyTitle>
<Version>0.1.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<OutputPath>$(ToolOutputFullPath)</OutputPath>
Expand Down
1 change: 1 addition & 0 deletions src/Java.Interop.Export/Java.Interop.Export.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\product.snk</AssemblyOriginatorKeyFile>
<AssemblyTitle>Java.Interop.Export</AssemblyTitle>
<Version>0.1.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<OutputPath>$(ToolOutputFullPath)</OutputPath>
Expand Down
1 change: 1 addition & 0 deletions src/Java.Interop/Java.Interop-MonoAndroid.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
<LangVersion>8.0</LangVersion>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>0.1.0.0</Version>
</PropertyGroup>
<Import Project="..\..\Directory.Build.props" />
<PropertyGroup>
Expand Down
1 change: 1 addition & 0 deletions src/Java.Interop/Java.Interop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
<Nullable>enable</Nullable>
<ProduceReferenceAssembly>true</ProduceReferenceAssembly>
<MSBuildWarningsAsMessages>NU1702</MSBuildWarningsAsMessages>
<Version>0.1.0.0</Version>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DefineConstants>DEBUG;$(DefineConstants)</DefineConstants>
Expand Down

0 comments on commit 2d5431f

Please sign in to comment.