Convert /tools and /build-tools projects from net472 to $(DotNetStableTargetFramework)
#7943
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…etStableTargetFramework)`
jpobst
force-pushed
the
net-tools
branch
3 times, most recently
from
0ae1cb0
to
4d21fb7
Compare
jpobst
requested review from
jonathanpeppers,
jonpryor and
grendello
as code owners
pjcollins
approved these changes
Apr 11, 2023
grendello
approved these changes
Apr 12, 2023
| <_ConfigurationFile>..\..\bin\Build$(Configuration)\merge-configuration.xml</_ConfigurationFile> | ||
| <_ConfigurationInputBaseDirectory>..\..\bin\Build$(Configuration)\api\</_ConfigurationInputBaseDirectory> | ||
| <_ConfigurationOutputBaseDirectory>..\..\bin\Build$(Configuration)\api\</_ConfigurationOutputBaseDirectory> | ||
| </PropertyGroup> | ||
|
|
||
| <Exec | ||
| Command="$(ManagedRuntime) $(ManagedRuntimeArgs) $(ApiMerge) -config=$(_ConfigurationFile) -config-input-dir=$(_ConfigurationInputBaseDirectory) -config-output-dir=$(_ConfigurationOutputBaseDirectory)" /> | ||
| Command="dotnet $(ApiMerge) -config=$(_ConfigurationFile) -config-input-dir=$(_ConfigurationInputBaseDirectory) -config-output-dir=$(_ConfigurationOutputBaseDirectory)" /> |
There was a problem hiding this comment.
Should this use the dotnet we provision? "$(DotNetPreviewTool)"
There was a problem hiding this comment.
Both api-merge and jnienv-gen are built with $(DotNetStableTargetFramework) instead of $(DotNetTargetFramework) so I think dotnet is correct? Although $(DotNetPreviewTool) would work too.
There was a problem hiding this comment.
TargetFramework=net7.0 wouldn't make it to be built with the system dotnet. Do we want to run it with the same dotnet it was built with?
| Outputs="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs"> | ||
| <Exec | ||
| Command="$(ManagedRuntime) $(ManagedRuntimeArgs) "../../bin/Build$(Configuration)/jnienv-gen.exe" -o ../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs --use-java-interop" | ||
| Command="dotnet "../../bin/Build$(Configuration)/jnienv-gen.dll" -o ../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs --use-java-interop" |
grendello
added a commit
to grendello/xamarin-android
that referenced
this pull request
Apr 13, 2023
* main: Convert `/tools` and `/build-tools` projects from `net472` to `$(DotNetStableTargetFramework)` (dotnet#7943)
grendello
added a commit
to grendello/xamarin-android
that referenced
this pull request
Apr 14, 2023
* main: Bump to xamarin/Java.Interop/main@554d819 (dotnet#7951) [Microsoft.Android.Sdk.ILLink] fix crash when TZ changes (dotnet#7956) [tests] Port 'Xamarin.Android.JcwGen-Tests.JcwGen-Tests' to .NET (dotnet#7949) [Xamarin.Android.Build.Tasks] remove `pdb2mdb` (dotnet#7950) [ci] Add some extra params to configure the test templates (dotnet#7955) Convert `/tools` and `/build-tools` projects from `net472` to `$(DotNetStableTargetFramework)` (dotnet#7943) [Xamarin.Android.Build.Tasks] fix cases of missing `@(Reference)` (dotnet#7947) Bump com.android.tools:r8 from 4.0.52 to 8.0.40 (dotnet#7934) Bump to xamarin/Java.Interop/main@a172402 (dotnet#7944) [Xamarin.Android] Remove OpenTK, sqlite-xamarin, System.EnterpriseServices. (dotnet#7940) [ci] Stop building classic test suites. (dotnet#7938) Bumping to the correct monodroid commit Trying to bump monodroid to run debugger-tests Pass timeout to runtime
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many of our projects in
/toolsand/build-toolstargetnet472. Update them to instead target$(DotNetStableTargetFramework).A side-effect of this is that there is no longer an
.exebuilt, so we also need to update everything in our build system that calls these tools to usedotnet foo.dllinstead ofmono foo.exe.