Skip to content

Convert /tools and /build-tools projects from net472 to $(DotNetStableTargetFramework) #7943

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
merged 4 commits into from
Apr 12, 2023
Merged

Convert /tools and /build-tools projects from net472 to $(DotNetStableTargetFramework) #7943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14cf2c6
Convert `/tools` and `/build-tools` projects from `net472` to `$(DotN…
jpobst Apr 6, 2023
3bfffd5
Fix 'conjure-xamarin-android-cecil'
jpobst Apr 11, 2023
2de9b18
'.exe' -> '.dll'
jpobst Apr 11, 2023
b0cfa94
Use $(DotNetPreviewTool) instead of 'dotnet'
jpobst Apr 12, 2023
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
2 changes: 1 addition & 1 deletion Configuration.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
<AndroidSupportedTargetAotAbisSplit>$(AndroidSupportedTargetAotAbis.Split(':'))</AndroidSupportedTargetAotAbisSplit>
</PropertyGroup>
<PropertyGroup>
<RemapAssemblyRefToolExecutable>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\remap-assembly-ref\remap-assembly-ref.exe</RemapAssemblyRefToolExecutable>
<RemapAssemblyRefToolExecutable>$(MSBuildThisFileDirectory)bin\Build$(Configuration)\remap-assembly-ref\remap-assembly-ref.dll</RemapAssemblyRefToolExecutable>
<RemapAssemblyRefTool>$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;$(RemapAssemblyRefToolExecutable)&quot;</RemapAssemblyRefTool>
</PropertyGroup>

Expand Down
2 changes: 1 addition & 1 deletion build-tools/api-merge/api-merge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\..\bin\Build$(Configuration)</OutputPath>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/api-xml-adjuster/api-xml-adjuster.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\..\bin\Build$(Configuration)</OutputPath>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/check-boot-times/check-boot-times.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" >
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputType>Exe</OutputType>
<RootNamespace>Xamarin.Android.Tools</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/conjure-xamarin-android-cecil/conjure-xamarin-android-cecil.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk" >
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputType>Exe</OutputType>
<RootNamespace>Xamarin.Android.Prepare</RootNamespace>
Expand Down
28 changes: 12 additions & 16 deletions build-tools/create-android-api/create-android-api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ProjectReference Include="..\..\external\Java.Interop\tools\class-parse\class-parse.csproj" ReferenceOutputAssembly="False" />
<ProjectReference Include="..\api-xml-adjuster\api-xml-adjuster.csproj" ReferenceOutputAssembly="False" />
<ProjectReference Include="..\api-merge\api-merge.csproj" ReferenceOutputAssembly="False" />
<ProjectReference Include="..\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="False" SkipGetTargetFrameworkProperties="True" AdditionalProperties="TargetFramework=net472" />
<ProjectReference Include="..\jnienv-gen\jnienv-gen.csproj" ReferenceOutputAssembly="False" SkipGetTargetFrameworkProperties="True" />
</ItemGroup>

<PropertyGroup>
Expand Down Expand Up @@ -52,24 +52,22 @@
Outputs="@(ApiFileDefinition->'%(ClassParseXml)')">

<PropertyGroup>
<ClassParse>$(XamarinAndroidSourcePath)\bin\$(Configuration)\lib\xamarin.android\xbuild\Xamarin\Android\class-parse.exe</ClassParse>
<ClassParse>$(MicrosoftAndroidSdkOutDir)class-parse.dll</ClassParse>
</PropertyGroup>

<ItemGroup>
<_ClassParseCommands
Condition="Exists('$(XamarinAndroidSourcePath)\src\Mono.Android\Profiles\api-%(ApiFileDefinition.Id).params.txt')"
Include="@(ApiFileDefinition)">
<Command>$(ClassParse)</Command>
<Arguments>$(AndroidSdkDirectory)\platforms\android-%(ApiFileDefinition.Id)\android.jar -platform=%(ApiFileDefinition.Id) -parameter-names=&quot;%(ApiFileDefinition.ParameterDescription)&quot; -o=&quot;%(ApiFileDefinition.ClassParseXml)&quot;</Arguments>
<Command>$(DotNetPreviewTool)</Command>
<Arguments>$(ClassParse) $(AndroidSdkDirectory)\platforms\android-%(ApiFileDefinition.Id)\android.jar -platform=%(ApiFileDefinition.Id) -parameter-names=&quot;%(ApiFileDefinition.ParameterDescription)&quot; -o=&quot;%(ApiFileDefinition.ClassParseXml)&quot;</Arguments>
</_ClassParseCommands>
</ItemGroup>

<MakeDir Directories="$(_OutputPath)api" />

<RunParallelCmds
Commands="@(_ClassParseCommands)"
ManagedRuntime="$(ManagedRuntime)"
ManagedRuntimeArguments="$(ManagedRuntimeArgs)"
/>
</Target>

Expand All @@ -81,22 +79,20 @@
Outputs="@(ApiFileDefinition->'%(ApiAdjustedXml)')">

<PropertyGroup>
<ApiXmlAdjuster>$(XamarinAndroidSourcePath)\bin\Build$(Configuration)\api-xml-adjuster.exe</ApiXmlAdjuster>
<ApiXmlAdjuster>$(XamarinAndroidSourcePath)\bin\Build$(Configuration)\api-xml-adjuster.dll</ApiXmlAdjuster>
</PropertyGroup>

<ItemGroup>
<_AdjustApiXmlPrepareCommands
Condition="Exists('$(XamarinAndroidSourcePath)\src\Mono.Android\Profiles\api-%(ApiFileDefinition.Id).params.txt')"
Include="@(ApiFileDefinition)">
<Command>$(ApiXmlAdjuster)</Command>
<Arguments>%(ApiFileDefinition.ClassParseXml) %(ApiFileDefinition.ApiAdjustedXml)</Arguments>
<Command>$(DotNetPreviewTool)</Command>
<Arguments>$(ApiXmlAdjuster) %(ApiFileDefinition.ClassParseXml) %(ApiFileDefinition.ApiAdjustedXml)</Arguments>
</_AdjustApiXmlPrepareCommands>
</ItemGroup>

<RunParallelCmds
Commands="@(_AdjustApiXmlPrepareCommands)"
ManagedRuntime="$(ManagedRuntime)"
ManagedRuntimeArguments="$(ManagedRuntimeArgs)"
/>
</Target>

Expand All @@ -108,24 +104,24 @@
Outputs="@(_MergedXmlFiles->'%(MergedXml)')">

<PropertyGroup>
<ApiMerge>..\..\bin\Build$(Configuration)\api-merge.exe</ApiMerge>
<ApiMerge>..\..\bin\Build$(Configuration)\api-merge.dll</ApiMerge>
<_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="&quot;$(DotNetPreviewTool)&quot; $(ApiMerge) -config=$(_ConfigurationFile) -config-input-dir=$(_ConfigurationInputBaseDirectory) -config-output-dir=$(_ConfigurationOutputBaseDirectory)" />

</Target>

<!-- Generates 'JNIEnv.g.cs' file. We do this here because it should only run once, not per-TF. -->
<Target Name="_BuildJNIEnv"
BeforeTargets="Build"
Inputs="..\..\bin\Build$(Configuration)\jnienv-gen.exe"
Inputs="..\..\bin\Build$(Configuration)\jnienv-gen.dll"
Outputs="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs">
<Exec
Command="$(ManagedRuntime) $(ManagedRuntimeArgs) &quot;../../bin/Build$(Configuration)/jnienv-gen.exe&quot; -o ../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs --use-java-interop"
Command="&quot;$(DotNetPreviewTool)&quot; &quot;../../bin/Build$(Configuration)/jnienv-gen.dll&quot; -o ../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs --use-java-interop"
/>
<Touch Files="../../src/Mono.Android/Android.Runtime/JNIEnv.g.cs" />
</Target>
Expand All @@ -140,4 +136,4 @@
<Delete Files="%(_MergedXmlFiles.MergedXml)" />
</Target>

</Project>
</Project>
2 changes: 1 addition & 1 deletion build-tools/jnienv-gen/jnienv-gen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\..\bin\Build$(Configuration)</OutputPath>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/plots-to-appinsights/ProcessPlotCSVFile.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace>Xamarin.Android.Tools.Plots</RootNamespace>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion build-tools/remap-assembly-ref/remap-assembly-ref.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputType>Exe</OutputType>
<RootNamespace>remapassemblyref</RootNamespace>
Expand Down
20 changes: 20 additions & 0 deletions build-tools/xaprepare/xaprepare/Application/Utilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Net;
using System.Net.Http;
using System.Reflection;
Expand Down Expand Up @@ -796,6 +797,25 @@ public static bool RunCommand (string command, string? workingDirectory, bool ec
return runner.Run ();
}

public static bool RunManagedCommand (string command, string workingDirectory, bool ignoreEmptyArguments, params string [] arguments)
{
return RunManagedCommand (command, workingDirectory, echoStderr: true, ignoreEmptyArguments: ignoreEmptyArguments, arguments: arguments);
}

// This is a managed assembly that needs to be run as 'dotnet foo.dll'
public static bool RunManagedCommand (string command, string? workingDirectory, bool echoStderr, bool ignoreEmptyArguments, params string [] arguments)
{
if (string.IsNullOrEmpty (command))
throw new ArgumentException ("must not be null or empty", nameof (command));

var runner = new ProcessRunner ("dotnet", ignoreEmptyArguments, new [] { command }.Concat (arguments).ToArray ()) {
EchoStandardError = echoStderr,
WorkingDirectory = workingDirectory,
};

return runner.Run ();
}

public static string GetStringFromStdout (string command, params string?[] arguments)
{
return GetStringFromStdout (command, throwOnErrors: false, trimTrailingWhitespace: true, arguments: arguments);
Expand Down
14 changes: 5 additions & 9 deletions build-tools/xaprepare/xaprepare/Steps/Step_InstallMonoRuntimes.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,17 +106,14 @@ async Task<bool> ConjureXamarinCecilAndRemapRef (Context context, bool haveManag
}

StatusStep (context, "Conjuring Xamarin.Android.Cecil and Xamari.Android.Cecil.Mdb");
string conjurer = Path.Combine (Configurables.Paths.BuildBinDir, "conjure-xamarin-android-cecil.exe");
string conjurerSourceDir = Configurables.Paths.MonoProfileToolsDir;
string conjurerDestDir = Configurables.Paths.BuildBinDir;
string conjurer = Path.Combine (Configurables.Paths.BuildBinDir, "conjure-xamarin-android-cecil.dll");

result = Utilities.RunCommand (
haveManagedRuntime ? managedRuntime : conjurer, // command
result = Utilities.RunManagedCommand (
conjurer, // command
BuildPaths.XamarinAndroidSourceRoot, // workingDirectory
true, // ignoreEmptyArguments

// arguments
haveManagedRuntime ? conjurer : String.Empty,
Configurables.Paths.MonoProfileToolsDir, // source dir
Configurables.Paths.BuildBinDir // destination dir
);
Expand Down Expand Up @@ -174,13 +171,12 @@ bool InstallUtilities (Context context, bool haveManagedRuntime, string managedR

string relDestFilePath = Utilities.GetRelativePath (BuildPaths.XamarinAndroidSourceRoot, destFilePath);
StatusSubStep (context, $"Remapping Cecil references for {relDestFilePath}");
bool result = Utilities.RunCommand (
haveManagedRuntime ? managedRuntime : remapper, // command
bool result = Utilities.RunManagedCommand (
remapper, // command
BuildPaths.XamarinAndroidSourceRoot, // workingDirectory
true, // ignoreEmptyArguments

// arguments
haveManagedRuntime ? remapper : String.Empty,
Utilities.GetRelativePath (BuildPaths.XamarinAndroidSourceRoot, muf.SourcePath),
relDestFilePath,
"Mono.Cecil",
Expand Down
2 changes: 1 addition & 1 deletion tools/decompress-assemblies/decompress-assemblies.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>2021 Microsoft Corporation</Copyright>
<Version>0.0.1</Version>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<RootNamespace>Xamarin.Android.Tools.DecompressAssemblies</RootNamespace>
<AssemblyName>decompress-assemblies</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion tools/javadoc2mdoc/javadoc2mdoc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>$(DotNetStableTargetFramework)</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputType>Exe</OutputType>
<RootNamespace>Xamarin.Android.Tools.JavadocToMDoc</RootNamespace>
Expand Down
2 changes: 1 addition & 1 deletion tools/jit-times/jit-times.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<OutputType>Exe</OutputType>
<TargetFramework>net472</TargetFramework>
<TargetFramework>$(DotNetStableTargetFramework)</TargetFramework>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
</PropertyGroup>
<Import Project="..\..\Configuration.props" />
Expand Down
2 changes: 1 addition & 1 deletion tools/msbuild-fuzzer/msbuild-fuzzer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>$(DotNetStableTargetFramework)</TargetFrameworks>
<ProjectGuid>{A3671983-ABC2-4693-8872-463427B57117}</ProjectGuid>
<OutputType>Exe</OutputType>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/setup-windows/setup-windows.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\Configuration.props" />

<PropertyGroup>
<TargetFrameworks>net472</TargetFrameworks>
<TargetFrameworks>$(DotNetStableTargetFramework)</TargetFrameworks>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputType>Exe</OutputType>
<RootNamespace>setupwindows</RootNamespace>
Expand Down