File tree Expand file tree Collapse file tree 3 files changed +5
-5
lines changed
Microsoft.Android.Sdk.ILLink
Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets Expand file tree Collapse file tree 3 files changed +5
-5
lines changed Original file line number Diff line number Diff line change 76
76
<DotNetPreviewTool Condition =" '$(DotNetPreviewTool)' == '' " >$(DotNetPreviewPath)dotnet</DotNetPreviewTool >
77
77
<!-- Version number from: https://github.com/dotnet/installer#installers-and-binaries -->
78
78
<DotNetPreviewVersionBand Condition =" '$(DotNetPreviewVersionBand)' == '' " >6.0.100</DotNetPreviewVersionBand >
79
- <DotNetPreviewVersionFull Condition =" '$(DotNetPreviewVersionFull)' == '' " >$(DotNetPreviewVersionBand)-preview.1.21103.13 </DotNetPreviewVersionFull >
79
+ <DotNetPreviewVersionFull Condition =" '$(DotNetPreviewVersionFull)' == '' " >$(DotNetPreviewVersionBand)-preview.1.21109.8 </DotNetPreviewVersionFull >
80
80
<WixToolPath Condition =" '$(WixToolPath)' == '' " >$(AndroidToolchainDirectory)\wix\</WixToolPath >
81
81
<AndroidCmakeVersion Condition =" '$(AndroidCmakeVersion)' == '' " >3.10.2</AndroidCmakeVersion >
82
82
<AndroidCmakeVersionPath Condition =" '$(AndroidCmakeVersionPath)' == '' " >$(AndroidCmakeVersion).4988404</AndroidCmakeVersionPath >
Original file line number Diff line number Diff line change @@ -43,9 +43,9 @@ protected override void Process ()
43
43
subSteps2 . Add ( new PreserveRegistrations ( cache ) ) ;
44
44
subSteps2 . Add ( new PreserveJavaInterfaces ( ) ) ;
45
45
46
- InsertAfter ( new FixAbstractMethodsStep ( cache ) , "RemoveUnreachableBlocksStep " ) ;
47
- InsertAfter ( subSteps2 , "RemoveUnreachableBlocksStep " ) ;
48
- InsertAfter ( subSteps1 , "RemoveUnreachableBlocksStep " ) ;
46
+ InsertAfter ( new FixAbstractMethodsStep ( cache ) , "SetupStep " ) ;
47
+ InsertAfter ( subSteps2 , "SetupStep " ) ;
48
+ InsertAfter ( subSteps1 , "SetupStep " ) ;
49
49
50
50
string proguardPath ;
51
51
if ( Context . TryGetCustomData ( "ProguardConfiguration" , out proguardPath ) )
Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ This file contains the .NET 5-specific targets to customize ILLink
66
66
<ItemGroup >
67
67
<!-- add our custom steps -->
68
68
<_TrimmerCustomSteps Include =" $(MSBuildThisFileDirectory)..\tools\Microsoft.Android.Sdk.ILLink.dll" >
69
- <BeforeStep >LoadReferencesStep </BeforeStep >
69
+ <BeforeStep >MarkStep </BeforeStep >
70
70
<Type >Microsoft.Android.Sdk.ILLink.SetupStep</Type >
71
71
</_TrimmerCustomSteps >
72
72
</ItemGroup >
You can’t perform that action at this time.
0 commit comments