From d8b669d60e38da5908d5b5c76b700bd6d8b42c2a Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Mon, 18 Oct 2021 13:25:59 -0400 Subject: [PATCH] [Java.Interop{,.Dynamic,.Export}] Set Version to 0.1.0.0 Commit 3e6a6232d904acfc95017eeae58408787b0f8dc9 Context: https://discord.com/channels/732297728826277939/732297837953679412/898675755779768330 An unfortunate unexpected breakage occurred due to commit 3e6a6232: 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 3e6a6232 was to improve the use of *MSBuild* task assemblies -- which `Java.Interop.dll` is *not* -- modify the logic of 3e6a6232 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. --- build-tools/scripts/Version.props.in | 2 +- src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj | 1 + src/Java.Interop.Export/Java.Interop.Export.csproj | 1 + src/Java.Interop/Java.Interop-MonoAndroid.csproj | 1 + src/Java.Interop/Java.Interop.csproj | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/build-tools/scripts/Version.props.in b/build-tools/scripts/Version.props.in index cbefc19da..a414f3475 100644 --- a/build-tools/scripts/Version.props.in +++ b/build-tools/scripts/Version.props.in @@ -1,6 +1,6 @@ - @VERSION@ + @VERSION@ @VERSION@ git-rev-head:@COMMIT@ git-branch:@BRANCH@ Microsoft Corporation Microsoft Corporation diff --git a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj index 228da5b2a..051223abd 100644 --- a/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj +++ b/src/Java.Interop.Dynamic/Java.Interop.Dynamic.csproj @@ -7,6 +7,7 @@ true ..\..\product.snk Java.Interop.Dynamic + 0.1.0.0 $(ToolOutputFullPath) diff --git a/src/Java.Interop.Export/Java.Interop.Export.csproj b/src/Java.Interop.Export/Java.Interop.Export.csproj index b1dd39bd6..bc3170252 100644 --- a/src/Java.Interop.Export/Java.Interop.Export.csproj +++ b/src/Java.Interop.Export/Java.Interop.Export.csproj @@ -7,6 +7,7 @@ true ..\..\product.snk Java.Interop.Export + 0.1.0.0 $(ToolOutputFullPath) diff --git a/src/Java.Interop/Java.Interop-MonoAndroid.csproj b/src/Java.Interop/Java.Interop-MonoAndroid.csproj index cafa4db40..4aaf58ba6 100644 --- a/src/Java.Interop/Java.Interop-MonoAndroid.csproj +++ b/src/Java.Interop/Java.Interop-MonoAndroid.csproj @@ -17,6 +17,7 @@ 8.0 true true + 0.1.0.0 diff --git a/src/Java.Interop/Java.Interop.csproj b/src/Java.Interop/Java.Interop.csproj index ec061e072..ee91dd585 100644 --- a/src/Java.Interop/Java.Interop.csproj +++ b/src/Java.Interop/Java.Interop.csproj @@ -30,6 +30,7 @@ enable true NU1702 + 0.1.0.0 DEBUG;$(DefineConstants)