Skip to content

Commit d436b59

Browse files
committed
Bump net6 version to 6.0.100-preview.1.21109.8
1 parent 7189f77 commit d436b59

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Configuration.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<DotNetPreviewTool Condition=" '$(DotNetPreviewTool)' == '' ">$(DotNetPreviewPath)dotnet</DotNetPreviewTool>
7777
<!-- Version number from: https://github.com/dotnet/installer#installers-and-binaries -->
7878
<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>
8080
<WixToolPath Condition=" '$(WixToolPath)' == '' ">$(AndroidToolchainDirectory)\wix\</WixToolPath>
8181
<AndroidCmakeVersion Condition=" '$(AndroidCmakeVersion)' == '' ">3.10.2</AndroidCmakeVersion>
8282
<AndroidCmakeVersionPath Condition=" '$(AndroidCmakeVersionPath)' == '' ">$(AndroidCmakeVersion).4988404</AndroidCmakeVersionPath>

src/Microsoft.Android.Sdk.ILLink/SetupStep.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ protected override void Process ()
4343
subSteps2.Add (new PreserveRegistrations (cache));
4444
subSteps2.Add (new PreserveJavaInterfaces ());
4545

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");
4949

5050
string proguardPath;
5151
if (Context.TryGetCustomData ("ProguardConfiguration", out proguardPath))

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ This file contains the .NET 5-specific targets to customize ILLink
6666
<ItemGroup>
6767
<!-- add our custom steps -->
6868
<_TrimmerCustomSteps Include="$(MSBuildThisFileDirectory)..\tools\Microsoft.Android.Sdk.ILLink.dll">
69-
<BeforeStep>LoadReferencesStep</BeforeStep>
69+
<BeforeStep>MarkStep</BeforeStep>
7070
<Type>Microsoft.Android.Sdk.ILLink.SetupStep</Type>
7171
</_TrimmerCustomSteps>
7272
</ItemGroup>

0 commit comments

Comments
 (0)