Skip to content

Commit 1ecc140

Browse files
grendellogrendello
committed
Merge branch 'main' into extended-timing
* main: (25 commits) Bump to dotnet/installer@2809943e7a 8.0.100-rc.2.23431.5 (dotnet#8317) [build] Use Microsoft OpenJDK 17.0.8 (dotnet#8309) [Mono.Android] Add missing `[Flags]` attribute for generated enums. (dotnet#8310) Bump to dotnet/installer@c5e45fd659 8.0.100-rc.2.23427.4 (dotnet#8305) [xaprepare] Improve dotnet-install script logging (dotnet#8312) [xaprepare] Fix dotnet-install script size check (dotnet#8311) [Xamarin.Android.Build.Tasks] improve net6.0 "out of support" message (dotnet#8307) [monodroid] Fix the EnableNativeAnalyzers build (dotnet#8293) Bump to dotnet/installer@56d8c6497c 8.0.100-rc.2.23422.31 (dotnet#8291) [Xamarin.Android.Build.Tasks] Fix APT2264 error on Windows. (dotnet#8289) [Mono.Android] Marshal .NET stack trace to Throwable.getStackTrace() (dotnet#8185) [tests] Skip sign check when installing MAUI (dotnet#8288) Bump to xamarin/monodroid@057b17fe (dotnet#8286) [Xamarin.Android.Build.Tasks] add $(AndroidStripILAfterAOT) (dotnet#8172) Bump to dotnet/installer@ec2c1ec1b1 8.0.100-rc.2.23420.6 (dotnet#8281) Bump to dotnet/installer@001d8e4465 8.0.100-rc.2.23417.14 (dotnet#8276) [Mono.Android] [IntentFilter] pathSuffix & pathAdvancedPattern (dotnet#8261) $(AndroidPackVersionSuffix)=rc.2; net8 is 34.0.0-rc.2 (dotnet#8278) Bump to xamarin/xamarin-android-tools/main@52f0866 (dotnet#8241) [build] set file extension for common `ToolExe` values (dotnet#8267) ...
2 parents 5a40ee5 + 52d1570 commit 1ecc140

File tree

50 files changed

+908
-621
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+908
-621
lines changed

‎.external

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
xamarin/monodroid:main@a524859192e6eca6cea45313e5f95b8d04a698bf
1+
xamarin/monodroid:main@057b17fe491f51823eb814f0163bb92686e24991
22
mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d

‎Configuration.props

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,20 +180,22 @@
180180
</PropertyGroup>
181181
<PropertyGroup>
182182
<AdbToolPath Condition=" '$(AdbToolPath)' == '' ">$(AndroidSdkFullPath)\platform-tools\</AdbToolPath>
183-
<AdbToolExe Condition=" '$(AdbToolExe)' == '' ">adb</AdbToolExe>
183+
<AdbToolExe Condition=" '$(AdbToolExe)' == '' and '$(HostOS)' != 'Windows' ">adb</AdbToolExe>
184+
<AdbToolExe Condition=" '$(AdbToolExe)' == '' and '$(HostOS)' == 'Windows' ">adb.exe</AdbToolExe>
184185
<AvdManagerHome Condition=" '$(AvdManagerHome)' == '' ">$(AndroidToolchainDirectory)</AvdManagerHome>
185-
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' ">avdmanager</AvdManagerToolExe>
186+
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' != 'Windows' ">avdmanager</AvdManagerToolExe>
187+
<AvdManagerToolExe Condition=" '$(AvdManagerToolExe)' == '' and '$(HostOS)' == 'Windows' ">avdmanager.bat</AvdManagerToolExe>
186188
<AndroidToolPath Condition=" '$(AndroidToolPath)' == '' ">$(AndroidSdkFullPath)\tools</AndroidToolPath>
187189
<AndroidToolsBinPath Condition=" '$(AndroidToolsBinPath)' == '' ">$(AndroidToolPath)\bin</AndroidToolsBinPath>
188-
<AndroidToolExe Condition=" '$(AndroidToolExe)' == '' ">android</AndroidToolExe>
189190
<CommandLineToolsFolder Condition=" '$(CommandLineToolsFolder)' == '' ">7.0</CommandLineToolsFolder>
190191
<CommandLineToolsVersion Condition=" '$(CommandLineToolsVersion)' == '' ">8512546_latest</CommandLineToolsVersion>
191192
<CommandLineToolsBinPath Condition=" '$(CommandLineToolsBinPath)' == '' ">$(AndroidSdkFullPath)\cmdline-tools\$(CommandLineToolsFolder)\bin</CommandLineToolsBinPath>
192193
<!-- Version numbers and PkgVersion are found in https://dl-ssl.google.com/android/repository/repository2-3.xml -->
193194
<EmulatorVersion Condition=" '$(EmulatorVersion)' == '' ">9364964</EmulatorVersion>
194195
<EmulatorPkgRevision Condition=" '$(EmulatorPkgRevision)' == '' ">32.1.9</EmulatorPkgRevision>
195196
<EmulatorToolPath Condition=" '$(EmulatorToolPath)' == '' ">$(AndroidSdkFullPath)\emulator</EmulatorToolPath>
196-
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' ">emulator</EmulatorToolExe>
197+
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' != 'Windows' ">emulator</EmulatorToolExe>
198+
<EmulatorToolExe Condition=" '$(EmulatorToolExe)' == '' and '$(HostOS)' == 'Windows' ">emulator.exe</EmulatorToolExe>
197199
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' != 'Windows' ">$(AndroidNdkDirectory)\ndk-build</NdkBuildPath>
198200
<NdkBuildPath Condition=" '$(NdkBuildPath)' == '' And '$(HostOS)' == 'Windows' ">$(AndroidNdkDirectory)\ndk-build.cmd</NdkBuildPath>
199201
<BundleToolJarPath Condition=" '$(BundleToolJarPath)' == '' ">$(MicrosoftAndroidSdkOutDir)bundletool.jar</BundleToolJarPath>

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
* Bump first digit of the patch version for feature releases (and reset the first two digits to 0)
3636
-->
3737
<AndroidPackVersion>34.0.0</AndroidPackVersion>
38-
<AndroidPackVersionSuffix>rc.1</AndroidPackVersionSuffix>
38+
<AndroidPackVersionSuffix>rc.2</AndroidPackVersionSuffix>
3939
</PropertyGroup>
4040

4141
<!-- Common <PackageReference/> versions -->

‎Documentation/building/windows/instructions.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,18 @@ MSBuild version 15 or later is required.
2020

2121
5. In a [Developer Command Prompt][developer-prompt], prepare the project:
2222

23-
dotnet msbuild Xamarin.Android.sln -t:Prepare
23+
dotnet msbuild Xamarin.Android.sln -t:Prepare -nodeReuse:false
24+
dotnet msbuild external\Java.Interop\Java.Interop.sln -t:Prepare -nodeReuse:false
2425

2526
This will ensure that the build dependencies are installed, perform
2627
`git submodule update`, download NuGet dependencies, and other
2728
"preparatory" and pre-build tasks that need to be performed.
2829

2930
6. Build the project:
3031

31-
dotnet-local.cmd build Xamarin.Android.sln -m:1
32+
dotnet-local.cmd build Xamarin.Android.sln -nodeReuse:false
3233

33-
7. In order to use the in-tree Xamarin.Android, build xabuild:
34-
35-
msbuild tools/xabuild/xabuild.csproj /restore
36-
37-
8. (For Microsoft team members only - Optional) In a [Developer Command
34+
7. (For Microsoft team members only - Optional) In a [Developer Command
3835
Prompt][developer-prompt], build external proprietary git
3936
dependencies:
4037

‎Documentation/guides/building-apps/build-properties.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1303,6 +1303,20 @@ This is only used when building `system` applications.
13031303

13041304
Support for this property was added in Xamarin.Android 11.3.
13051305

1306+
## AndroidStripILAfterAOT
1307+
1308+
A bool property that specifies whether or not the *method bodies* of AOT compiled methods will be removed.
1309+
1310+
The default value is `false`, and the method bodies of AOT compiled methods will *not* be removed.
1311+
1312+
When set to `true`, [`$(AndroidEnableProfiledAot)`](#androidenableprofiledaot) is set to `false` by default.
1313+
This means that in Release configuration builds -- in which
1314+
[`$(RunAOTCompilation)`](#runaotcompilation) is `true` by default -- AOT is enabled for *everything*.
1315+
This can result in increased app sizes. This behavior can be overridden by explicitly setting
1316+
`$(AndroidEnableProfiledAot)` to `true` within your project file.
1317+
1318+
Support for this property was added in .NET 8.
1319+
13061320
## AndroidSupportedAbis
13071321

13081322
A string property that contains a

‎NuGet.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
<!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
1212
<!-- Android binary, to support delta APK install -->
1313
<add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
14-
<!-- Added manually for dotnet/runtime 6.0.11 -->
15-
<add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
16-
<add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/nuget/v3/index.json" />
14+
<!-- Added manually for dotnet/runtime 7.0.11 -->
15+
<add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-runtime-0ece505" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-0ece5051/nuget/v3/index.json" />
1717
</packageSources>
1818
<disabledPackageSources />
1919
</configuration>

‎build-tools/automation/azure-pipelines-apidocs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ stages:
5959
- checkout: self
6060
submodules: recursive
6161

62-
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11"
62+
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
6363
displayName: set JI_JAVA_HOME
6464

6565
# Set MSBuild property overrides if parameters are set

‎build-tools/automation/azure-pipelines.yaml

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ stages:
112112
restoreNUnitConsole: false
113113
updateMono: false
114114
xaprepareScenario: EmulatorTestDependencies
115-
115+
116116
- task: DownloadPipelineArtifact@2
117117
inputs:
118118
artifactName: $(TestAssembliesArtifactName)
@@ -140,7 +140,7 @@ stages:
140140
arguments: -t:PrepareJavaInterop -c $(XA.Build.Configuration) --no-restore
141141
displayName: prepare java.interop $(XA.Build.Configuration)
142142
continueOnError: false
143-
143+
144144
- template: yaml-templates/start-stop-emulator.yaml
145145

146146
- template: yaml-templates/apk-instrumentation.yaml
@@ -201,7 +201,7 @@ stages:
201201
extraBuildArgs: -p:TestsFlavor=AotLlvm -p:EnableLLVM=true -p:AndroidEnableProfiledAot=false
202202
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Mono.Android.NET_Tests-Signed.aab
203203
artifactFolder: $(DotNetTargetFramework)-AotLlvm
204-
204+
205205
- template: yaml-templates/apk-instrumentation.yaml
206206
parameters:
207207
configuration: $(XA.Build.Configuration)
@@ -220,13 +220,19 @@ stages:
220220
artifactSource: bin/Test$(XA.Build.Configuration)/$(DotNetTargetFramework)-android/Xamarin.Android.JcwGen_Tests-Signed.apk
221221
artifactFolder: $(DotNetTargetFramework)-FastDev_Assemblies_Dexes
222222
extraBuildArgs: /p:AndroidFastDeploymentType=Assemblies:Dexes
223-
223+
224224
- template: yaml-templates/run-nunit-tests.yaml
225225
parameters:
226226
testRunTitle: Xamarin.Android.Tools.Aidl-Tests - macOS
227227
testAssembly: $(System.DefaultWorkingDirectory)/bin/Test$(XA.Build.Configuration)/$(DotNetStableTargetFramework)/Xamarin.Android.Tools.Aidl-Tests.dll
228228
testResultsFile: TestResult-Aidl-Tests-macOS-$(XA.Build.Configuration).xml
229229

230+
- task: ShellScript@2
231+
displayName: Test dotnet-local.sh
232+
inputs:
233+
scriptPath: dotnet-local.sh
234+
args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
235+
230236
- ${{ if ne(parameters.macTestAgentsUseCleanImages, true) }}:
231237
- template: yaml-templates/start-stop-emulator.yaml
232238
parameters:
@@ -276,6 +282,12 @@ stages:
276282
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"
277283
testResultsFile: TestResult-NETSmokeMSBuildTests-Linux-$(XA.Build.Configuration).xml
278284

285+
- task: ShellScript@2
286+
displayName: Test dotnet-local.sh
287+
inputs:
288+
scriptPath: dotnet-local.sh
289+
args: build samples/HelloWorld/HelloWorld/HelloWorld.DotNet.csproj
290+
279291
- template: yaml-templates/upload-results.yaml
280292
parameters:
281293
configuration: $(XA.Build.Configuration)

‎build-tools/automation/yaml-templates/build-windows.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@ stages:
9898
testResultsFile: TestResult-SmokeMSBuildTests-WinDotnetBuild-$(XA.Build.Configuration).xml
9999
dotNetTestExtraArgs: --filter "TestCategory = SmokeTests"
100100

101+
- task: BatchScript@1
102+
displayName: Test dotnet-local.cmd
103+
inputs:
104+
filename: dotnet-local.cmd
105+
arguments: build samples\HelloWorld\HelloWorld\HelloWorld.DotNet.csproj
106+
101107
- template: upload-results.yaml
102108
parameters:
103109
artifactName: ${{ parameters.buildResultArtifactName }}

‎build-tools/automation/yaml-templates/commercial-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
testAssembliesArtifactName: $(TestAssembliesArtifactName)
88

99
steps:
10-
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-11"
10+
- script: echo "##vso[task.setvariable variable=JI_JAVA_HOME]$HOME/android-toolchain/jdk-17"
1111
displayName: set JI_JAVA_HOME
1212

1313
- template: use-dot-net.yaml

‎build-tools/gradle/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎build-tools/manifest-attribute-codegen/manifest-definition.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@
345345
<a name='sspPrefix' format='string' api-level='19' />
346346
<a name='sspPattern' format='string' api-level='19' />
347347
<a name='pathAdvancedPattern' api-level='26' />
348+
<a name='pathSuffix' api-level='31' />
348349
</e>
349350
<e name='category'>
350351
<parent>intent-filter</parent>

‎build-tools/scripts/DotNet.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@
109109
<_NuGetSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
110110
<_NuGetSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
111111
<_InstallArguments Include="--skip-manifest-update" />
112+
<_InstallArguments Include="--skip-sign-check" />
112113
<_InstallArguments Include="--verbosity diag" />
113114
<_InstallArguments Include="--source &quot;%(_NuGetSources.Identity)&quot;" />
114115
<_InstallArguments Include="--temp-dir &quot;$(_TempDirectory)&quot;" />

‎build-tools/scripts/PrepareWindows.targets

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@
2424
/>
2525
<Exec Command="dotnet $(_XAPrepareExe) $(_XAPrepareStandardArgs) -a" WorkingDirectory="$(_TopDir)" />
2626
<MSBuild Projects="$(_TopDir)\Xamarin.Android.BootstrapTasks.sln" Targets="Restore;Build" />
27+
<CallTarget Targets="PrepareJavaInterop" />
2728
</Target>
2829
</Project>

‎build-tools/xaprepare/xaprepare/Application/Utilities.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,10 +488,7 @@ public static HttpClient CreateHttpClient ()
488488
try {
489489
using (HttpClient httpClient = CreateHttpClient ()) {
490490
httpClient.Timeout = WebRequestTimeout;
491-
var req = new HttpRequestMessage (HttpMethod.Head, url);
492-
req.Headers.ConnectionClose = true;
493-
494-
HttpResponseMessage resp = await httpClient.SendAsync (req, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait (true);
491+
HttpResponseMessage resp = await httpClient.GetAsync (url, HttpCompletionOption.ResponseHeadersRead).ConfigureAwait (true);
495492
if (!resp.IsSuccessStatusCode || !resp.Content.Headers.ContentLength.HasValue)
496493
return (false, 0, resp.StatusCode);
497494

‎build-tools/xaprepare/xaprepare/ConfigAndData/Configurables.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ partial class Configurables
1717
{
1818
const string BinutilsVersion = "L_16.0.6-6.0.0";
1919

20-
const string MicrosoftOpenJDK11Version = "11.0.16";
21-
const string MicrosoftOpenJDK11Release = "8.1";
22-
const string MicrosoftOpenJDK11RootDirName = "jdk-11.0.16+8";
20+
const string MicrosoftOpenJDK17Version = "17.0.8";
21+
const string MicrosoftOpenJDK17Release = "17.0.8.7";
22+
const string MicrosoftOpenJDK17RootDirName = "jdk-17.0.8+7";
2323

2424
const string AdoptOpenJDKRelease = "8.0"; // build_number.0
2525
static readonly string AdoptOpenJDKUrlVersion = $"8u{AdoptOpenJDKUpdate}{AdoptOpenJDKBuild}";
@@ -35,10 +35,10 @@ public static partial class Urls
3535
// https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u345-b01/OpenJDK8U-jdk_x64_windows_hotspot_8u345b01.zip
3636
public static readonly Uri AdoptOpenJDK8 = new Uri ($"https://github.com/adoptium/temurin8-binaries/releases/download/{AdoptOpenJDKTag}/OpenJDK8U-jdk_{AdoptOpenJDKOperatingSystem}_hotspot_{AdoptOpenJDKUrlVersion}.{AdoptOpenJDKArchiveExtension}");
3737

38-
// https://aka.ms/download-jdk/microsoft-jdk-11.0.16-linux-x64.tar.gz
39-
// https://aka.ms/download-jdk/microsoft-jdk-11.0.16-macOS-x64.tar.gz
40-
// https://aka.ms/download-jdk/microsoft-jdk-11.0.16-windows-x64.zip
41-
public static readonly Uri MicrosoftOpenJDK11 = new Uri ($"https://aka.ms/download-jdk/microsoft-jdk-{MicrosoftOpenJDK11Version}-{MicrosoftOpenJDKOperatingSystem}.{MicrosoftOpenJDKFileExtension}");
38+
// https://aka.ms/download-jdk/microsoft-jdk-17.0.8-linux-x64.tar.gz
39+
// https://aka.ms/download-jdk/microsoft-jdk-17.0.8-macOS-x64.tar.gz
40+
// https://aka.ms/download-jdk/microsoft-jdk-17.0.8-windows-x64.zip
41+
public static readonly Uri MicrosoftOpenJDK17 = new Uri ($"https://aka.ms/download-jdk/microsoft-jdk-{MicrosoftOpenJDK17Version}-{MicrosoftOpenJDKOperatingSystem}.{MicrosoftOpenJDKFileExtension}");
4242

4343
/// <summary>
4444
/// Base URL for all Android SDK and NDK downloads. Used in <see cref="AndroidToolchain"/>
@@ -57,11 +57,11 @@ public static partial class Defaults
5757
public static readonly string BinutilsVersion = Configurables.BinutilsVersion;
5858
public static readonly char[] PropertyListSeparator = new [] { ':' };
5959

60-
public static readonly string JdkFolder = "jdk-11";
60+
public static readonly string JdkFolder = "jdk-17";
6161

62-
public static readonly Version MicrosoftOpenJDK11Version = new Version (Configurables.MicrosoftOpenJDK11Version);
63-
public static readonly Version MicrosoftOpenJDK11Release = new Version (Configurables.MicrosoftOpenJDK11Release);
64-
public static readonly string MicrosoftOpenJDK11RootDirName = Configurables.MicrosoftOpenJDK11RootDirName;
62+
public static readonly Version MicrosoftOpenJDK17Version = new Version (Configurables.MicrosoftOpenJDK17Version);
63+
public static readonly Version MicrosoftOpenJDK17Release = new Version (Configurables.MicrosoftOpenJDK17Release);
64+
public static readonly string MicrosoftOpenJDK17RootDirName = Configurables.MicrosoftOpenJDK17RootDirName;
6565

6666
public static readonly Version AdoptOpenJDK8Version = new Version (Configurables.AdoptOpenJDKVersion);
6767
public static readonly Version AdoptOpenJDK8Release = new Version (Configurables.AdoptOpenJDKRelease);
@@ -307,8 +307,8 @@ public static partial class Paths
307307
public static string OpenJDK8InstallDir => GetCachedPath (ref openJDK8InstallDir, () => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainDirectory), "jdk-1.8"));
308308
public static string OpenJDK8CacheDir => GetCachedPath (ref openJDK8CacheDir, () => ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory));
309309

310-
public static string OpenJDK11InstallDir => GetCachedPath (ref openJDK11InstallDir, () => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainDirectory), "jdk-11"));
311-
public static string OpenJDK11CacheDir => GetCachedPath (ref openJDK11CacheDir, () => ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory));
310+
public static string OpenJDK17InstallDir => GetCachedPath (ref openJDK17InstallDir, () => Path.Combine (ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainDirectory), "jdk-17"));
311+
public static string OpenJDK17CacheDir => GetCachedPath (ref openJDK17CacheDir, () => ctx.Properties.GetRequiredValue (KnownProperties.AndroidToolchainCacheDirectory));
312312
// bundle
313313
public static string BCLTestsArchiveName = "bcl-tests.zip";
314314

@@ -448,8 +448,8 @@ static string GetCachedPath (ref string? variable, Func<string> creator)
448448
static string? monoSdksTpnExternalPath;
449449
static string? monoSDKSIncludeDestDir;
450450
static string? monoLlvmTpnPath;
451-
static string? openJDK8InstallDir, openJDK11InstallDir;
452-
static string? openJDK8CacheDir, openJDK11CacheDir;
451+
static string? openJDK8InstallDir, openJDK17InstallDir;
452+
static string? openJDK8CacheDir, openJDK17CacheDir;
453453
static string? oldOpenJDKInstallDir;
454454
static string? configurationPropsGeneratedPath;
455455
static string? windowsBinutilsInstallDir;

‎build-tools/xaprepare/xaprepare/Steps/Step_InstallAdoptOpenJDK.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -295,11 +295,11 @@ public Step_InstallMicrosoftOpenJDK11 ()
295295
}
296296

297297
protected override string ProductName => _ProductName;
298-
protected override string JdkInstallDir => Configurables.Paths.OpenJDK11InstallDir;
299-
protected override Version JdkVersion => Configurables.Defaults.MicrosoftOpenJDK11Version;
300-
protected override Version JdkRelease => Configurables.Defaults.MicrosoftOpenJDK11Release;
301-
protected override Uri JdkUrl => Configurables.Urls.MicrosoftOpenJDK11;
302-
protected override string JdkCacheDir => Configurables.Paths.OpenJDK11CacheDir;
303-
protected override string RootDirName => Configurables.Defaults.MicrosoftOpenJDK11RootDirName;
298+
protected override string JdkInstallDir => Configurables.Paths.OpenJDK17InstallDir;
299+
protected override Version JdkVersion => Configurables.Defaults.MicrosoftOpenJDK17Version;
300+
protected override Version JdkRelease => Configurables.Defaults.MicrosoftOpenJDK17Release;
301+
protected override Uri JdkUrl => Configurables.Urls.MicrosoftOpenJDK17;
302+
protected override string JdkCacheDir => Configurables.Paths.OpenJDK17CacheDir;
303+
protected override string RootDirName => Configurables.Defaults.MicrosoftOpenJDK17RootDirName;
304304
}
305305
}

0 commit comments

Comments
 (0)