From 3a835a325c7a288fb24721eaab602e3feec9914b Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 5 May 2022 13:10:27 -0400 Subject: [PATCH] [build] `main` targets .NET 7 Fixes: https://github.com/xamarin/java.interop/issues/962 Context: 3851b1ac782a5d3e47767bc52774058ba1a0f61c Context: https://github.com/xamarin/java.interop/pull/936 Context: https://github.com/xamarin/java.interop/pull/975 We have several PRs which impact public API, and we want to land as part of .NET 7, and *not* as part of .NET 6, e.g. #936. Update `GitInfo.txt` to `7.0`, and update `$(_NetCoreLibVersion)` to be `$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0` -- reverting commit 3851b1ac -- as an indicator that from this point onward, all work on `main` is targeting .NET 7. --- GitInfo.txt | 2 +- .../Java.Interop.BootstrapTasks.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GitInfo.txt b/GitInfo.txt index e0ea36fee..4fedf1d20 100644 --- a/GitInfo.txt +++ b/GitInfo.txt @@ -1 +1 @@ -6.0 +7.0 diff --git a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets index da5e7391b..51cb25fa1 100644 --- a/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets +++ b/build-tools/Java.Interop.BootstrapTasks/Java.Interop.BootstrapTasks.targets @@ -113,7 +113,7 @@ <_NetToolVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits) <_OldToolVersion>0.2.$(GitBaseVersionPatch).$(GitCommits) - <_NetCoreLibVersion>0.1.0.0 + <_NetCoreLibVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).0.0 <_OldCoreLibVersion>0.1.0.0 <_FileVersion>$(GitBaseVersionMajor).$(GitBaseVersionMinor).$(GitBaseVersionPatch).$(GitCommits)