Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 1484a37

Browse files
keijikeiji
authored
Merge branch 'main' into fix_1112
2 parents d4d9d7c + 91bfb0e commit 1484a37

File tree

281 files changed

+17824
-858
lines changed

Some content is hidden

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

281 files changed

+17824
-858
lines changed

‎.ci/build.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ parameters:
77
initSteps: [] # any steps to run before .NET global tools are installed
88
preBuildSteps: [] # any steps that need to run just before the main compilation starts
99
postBuildSteps: [] # any steps that need to run just after the main compilation ends
10-
masterBranchName: 'master' # the "master" branch that should be used - can be something other than "master"
10+
masterBranchName: 'main' # the "master" branch that should be used - can be something other than "master"
1111
installAppleCertificates: 'true' # whether or not to install the Apple certificates and provisioning profiles
1212
submodules: false # whether or not to check out submodules
1313
areaPath: '' # the areaPath to log any issues
@@ -22,12 +22,13 @@ parameters:
2222
windowsImage: 'windows-latest' # the name of the Windows VM image
2323
mono: 'Latest' # the version of mono to use
2424
xcode: '12.3' # the version of Xcode to use
25-
dotnet: '3.1.302' # the version of .NET Core to use
25+
dotnet: '5.0.203' # the version of .NET Core to use
26+
dotnetStable: '3.1.408' # the stable version of .NET Core to use
2627
cake: '0.38.5' # the version of Cake to use
2728
apiTools: '1.1.0-preview.1' # the version of the api-tools CLI to use
2829
xharness: '1.0.0-prerelease.20602.1'
2930
tools: [] # a list of any additional .NET Core tools needed
30-
cakeTemplatesBranch: 'master' # the branch of XamarinComponents that has the templates
31+
cakeTemplatesBranch: 'main' # the branch of XamarinComponents that has the templates
3132
# build parameters
3233
buildType: 'basic' # the type of build: 'basic', 'manifest', 'directories', 'none'
3334
steps: [] # the steps to use when building, typically for 'none'
@@ -102,11 +103,19 @@ jobs:
102103
- bash: echo '##vso[task.setvariable variable=PATH;]'$PATH:$HOME/.dotnet/tools
103104
displayName: 'Add ~/.dotnet/tools to the PATH environment variable'
104105
condition: or(eq(variables['System.JobName'], 'macos'), eq(variables['System.JobName'], 'linux'))
106+
- task: UseDotNet@2
107+
displayName: 'Switch to the correct version of the .NET Core SDK'
108+
inputs:
109+
version: ${{ parameters.dotnetStable }}
110+
performMultiLevelLookup: true
111+
includePreviewVersions: true
112+
condition: ne('${{ parameters.dotnetStable }}', '')
105113
- task: UseDotNet@2
106114
displayName: 'Switch to the correct version of the .NET Core SDK'
107115
inputs:
108116
version: ${{ parameters.dotnet }}
109117
performMultiLevelLookup: true
118+
includePreviewVersions: true
110119
condition: ne('${{ parameters.dotnet }}', '')
111120
# custom init steps
112121
- ${{ parameters.initSteps }}

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ tmpnupkg/
1313
*.user
1414
artifacts/
1515
.idea/
16+
*.binlog

‎Android/ARCore/build.cake‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#load "../../common.cake"
1+
//#load "../../common.cake"
22

33
var TARGET = Argument ("t", Argument ("target", "ci"));
44

5-
var NUGET_VERSION = "1.23.0";
5+
var NUGET_VERSION = "1.24.0";
66

7-
var AAR_VERSION = "1.23.0";
7+
var AAR_VERSION = "1.24.0";
88
var AAR_URL = string.Format("https://dl.google.com/dl/android/maven2/com/google/ar/core/{0}/core-{0}.aar", AAR_VERSION);
99
var OBJ_VERSION = "0.3.0";
1010
var OBJ_URL = string.Format("https://oss.sonatype.org/content/repositories/releases/de/javagl/obj/{0}/obj-{0}.jar", OBJ_VERSION);

‎Android/ARCore/cgmanifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Maven": {
77
"ArtifactId": "core",
88
"GroupId": "com.google.ar",
9-
"Version": "1.16.0",
9+
"Version": "1.24.0",
1010
"NuGetId": "Xamarin.Google.ARCore"
1111
}
1212
}

‎Android/ARCore/source/Additions/Additions.cs‎

Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1 @@
1-
using System;
2-
using Android.Runtime;
3-
4-
namespace Google.AR.Core
5-
{
6-
public partial class Point
7-
{
8-
static Delegate cb_getAnchors;
9-
#pragma warning disable 0169
10-
static Delegate GetGetAnchorsHandler()
11-
{
12-
if (cb_getAnchors == null)
13-
cb_getAnchors = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, IntPtr>)n_GetAnchors);
14-
return cb_getAnchors;
15-
}
16-
17-
static IntPtr n_GetAnchors(IntPtr jnienv, IntPtr native__this)
18-
{
19-
global::Google.AR.Core.Point __this = global::Java.Lang.Object.GetObject<global::Google.AR.Core.Point>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
20-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.ToLocalJniHandle(__this.Anchors);
21-
}
22-
#pragma warning restore 0169
23-
24-
static IntPtr id_getAnchors;
25-
public virtual unsafe global::System.Collections.Generic.ICollection<global::Google.AR.Core.Anchor> Anchors {
26-
// Metadata.xml XPath method reference: path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]"
27-
[Register("getAnchors", "()Ljava/util/Collection;", "GetGetAnchorsHandler")]
28-
get {
29-
if (id_getAnchors == IntPtr.Zero)
30-
id_getAnchors = JNIEnv.GetMethodID(class_ref, "getAnchors", "()Ljava/util/Collection;");
31-
try {
32-
33-
if (((object)this).GetType() == ThresholdType)
34-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_getAnchors), JniHandleOwnership.TransferLocalRef);
35-
else
36-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "getAnchors", "()Ljava/util/Collection;")), JniHandleOwnership.TransferLocalRef);
37-
} finally {
38-
}
39-
}
40-
}
41-
}
42-
43-
44-
public partial class Plane
45-
{
46-
static Delegate cb_getAnchors;
47-
#pragma warning disable 0169
48-
static Delegate GetGetAnchorsHandler()
49-
{
50-
if (cb_getAnchors == null)
51-
cb_getAnchors = JNINativeWrapper.CreateDelegate((Func<IntPtr, IntPtr, IntPtr>)n_GetAnchors);
52-
return cb_getAnchors;
53-
}
54-
55-
static IntPtr n_GetAnchors(IntPtr jnienv, IntPtr native__this)
56-
{
57-
global::Google.AR.Core.Plane __this = global::Java.Lang.Object.GetObject<global::Google.AR.Core.Plane>(jnienv, native__this, JniHandleOwnership.DoNotTransfer);
58-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.ToLocalJniHandle(__this.Anchors);
59-
}
60-
#pragma warning restore 0169
61-
62-
static IntPtr id_getAnchors;
63-
public virtual unsafe global::System.Collections.Generic.ICollection<global::Google.AR.Core.Anchor> Anchors {
64-
// Metadata.xml XPath method reference: path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]"
65-
[Register("getAnchors", "()Ljava/util/Collection;", "GetGetAnchorsHandler")]
66-
get {
67-
if (id_getAnchors == IntPtr.Zero)
68-
id_getAnchors = JNIEnv.GetMethodID(class_ref, "getAnchors", "()Ljava/util/Collection;");
69-
try {
70-
71-
if (((object)this).GetType() == ThresholdType)
72-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallObjectMethod(((global::Java.Lang.Object)this).Handle, id_getAnchors), JniHandleOwnership.TransferLocalRef);
73-
else
74-
return global::Android.Runtime.JavaCollection<global::Google.AR.Core.Anchor>.FromJniHandle(JNIEnv.CallNonvirtualObjectMethod(((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID(ThresholdClass, "getAnchors", "()Ljava/util/Collection;")), JniHandleOwnership.TransferLocalRef);
75-
} finally {
76-
}
77-
}
78-
}
79-
}
80-
}
1+


‎Android/ARCore/source/Google.ARCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<PropertyGroup>
44
<AndroidCodegenTarget>XAJavaInterop1</AndroidCodegenTarget>
55
<TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
6-
<ReleaseVersion>1.16.0</ReleaseVersion>
6+
<ReleaseVersion>1.24.0</ReleaseVersion>
77
</PropertyGroup>
88
<PropertyGroup>
99
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

‎Android/ARCore/source/Transforms/Metadata.xml‎

Lines changed: 44 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,57 @@
99
<attr path="/api/package[@name='com.google.ar.core']/class[@name='ArImage']" name="extends">Android.Media.Image</attr>
1010
<attr path="/api/package[@name='com.google.vr.dynamite.client']/class[@name='ObjectWrapper']" name="extends">Java.Lang.Object</attr>
1111

12-
<attr path="/api/package[@name='com.google.ar.core']/class[@name='TrackableBase']" name="visibility">public</attr>
12+
<!-- <attr path="/api/package[@name='com.google.ar.core']/class[@name='TrackableBase']" name="visibility">public</attr>-->
1313

14-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]" />
15-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]" />
16-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]" />
17-
<remove-node path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]" />
18-
19-
<attr
20-
path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"
21-
name="managedName"
22-
>
23-
Google.AR.Core.Services.Downloads.AIDL
24-
</attr>
25-
<attr
26-
path="/api/package[@name='com.google.ar.core.services.downloads.client']"
27-
name="managedName"
28-
>
29-
Google.AR.Core.Services.Downloads.Client
30-
</attr>
14+
<!-- <attr-->
15+
<!-- path="/api/package[@name='com.google.ar.core.services.downloads.aidl']"-->
16+
<!-- name="managedName"-->
17+
<!-- >-->
18+
<!-- Google.AR.Core.Services.Downloads.AIDL-->
19+
<!-- </attr>-->
20+
<!-- <attr-->
21+
<!-- path="/api/package[@name='com.google.ar.core.services.downloads.client']"-->
22+
<!-- name="managedName"-->
23+
<!-- >-->
24+
<!-- Google.AR.Core.Services.Downloads.Client-->
25+
<!-- </attr>-->
26+
27+
<attr
28+
path="/api/package[@name='com.google.ar.core']/class[@name='InstantPlacementPoint']/method[@name='getAnchors' and count(parameter)=0]"
29+
name="return">
30+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
31+
</attr>
3132

33+
<attr
34+
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedImage']/method[@name='getAnchors' and count(parameter)=0]"
35+
name="return">
36+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
37+
</attr>
38+
39+
40+
<attr
41+
path="/api/package[@name='com.google.ar.core']/class[@name='Plane']/method[@name='getAnchors' and count(parameter)=0]"
42+
name="return">
43+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
44+
</attr>
45+
46+
<attr
47+
path="/api/package[@name='com.google.ar.core']/class[@name='Point']/method[@name='getAnchors' and count(parameter)=0]"
48+
name="return">
49+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
50+
</attr>
51+
3252
<attr
3353
path="/api/package[@name='com.google.ar.core']/class[@name='AugmentedFace']/method[@name='getAnchors' and count(parameter)=0]"
3454
name="return"
3555
>
3656
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
3757
</attr>
3858

59+
<attr
60+
path="/api/package[@name='com.google.ar.core']/class[@name='DepthPoint']/method[@name='getAnchors' and count(parameter)=0]"
61+
name="return">
62+
java.util.Collection&lt;com.google.ar.core.Anchor&gt;
63+
</attr>
64+
3965
</metadata>

‎Android/AndroidThings/build.cake‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load "../../common.cake"
1+
//#load "../../common.cake"
22

33
var TARGET = Argument ("t", Argument ("target", "ci"));
44

@@ -68,10 +68,11 @@ Task("nuget")
6868
.WithProperty("PackageOutputPath", "../../output"));
6969
});
7070

71-
Task("samples");
71+
Task("samples")
7272
.IsDependentOn("nuget");
7373
Task("component");
74-
Task("ci");
74+
75+
Task("ci")
7576
.IsDependentOn("samples");
7677

7778
Task ("externals")
@@ -104,7 +105,7 @@ Task ("clean")
104105
.Does (() =>
105106
{
106107
if (DirectoryExists ("./externals"))
107-
DeleteDirectory ("./externals", true);
108+
DeleteDirectory ("./externals", new DeleteDirectorySettings { Force=true });
108109
});
109110

110111
RunTarget (TARGET);

‎Android/AndroidThings/samples/WeatherStation/Resources/Resource.Designer.cs‎

Lines changed: 120 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)