Update ASA samples for the SDK 2.12.0 release

Azure · Feb 4, 2022 · b6eb7a8 · b6eb7a8
1 parent dec2392
commit b6eb7a8
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 19 deletions.
diff --git a/Android/Java/app/build.gradle b/Android/Java/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-def azureSpatialAnchorsSdkVersion = '2.11.0'
+def azureSpatialAnchorsSdkVersion = '2.12.0'
 
 android {
     compileSdkVersion 27

diff --git a/Android/NDK/app/build.gradle b/Android/NDK/app/build.gradle
@@ -1,6 +1,6 @@
 apply plugin: 'com.android.application'
 
-def azureSpatialAnchorsSdkVersion = '2.11.0'
+def azureSpatialAnchorsSdkVersion = '2.12.0'
 
 /*
 The arcore aar library contains the native shared libraries.  These are

diff --git a/HoloLens/DirectX/SampleHoloLens/SampleHoloLens.vcxproj b/HoloLens/DirectX/SampleHoloLens/SampleHoloLens.vcxproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props')" />
+  <Import Project="$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props')" />
   <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props')" />
   <PropertyGroup Label="Globals">
     <RequiredBundles>$(RequiredBundles);Microsoft.Windows.CppWinRT</RequiredBundles>
@@ -353,7 +353,7 @@
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\MeshContentTask.targets" />
     <Import Project="$(VSINSTALLDIR)\Common7\IDE\Extensions\Microsoft\VsGraphics\ShaderGraphContentTask.targets" />
     <Import Project="$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets')" />
-    <Import Project="$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets')" />
+    <Import Project="$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets')" />
   </ImportGroup>
   <PropertyGroup>
     <AppxPackageSigningEnabled>true</AppxPackageSigningEnabled>
@@ -369,7 +369,7 @@
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.props'))" />
     <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Windows.CppWinRT.2.0.190605.7\build\native\Microsoft.Windows.CppWinRT.targets'))" />
-    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props'))" />
-    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.11.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.props'))" />
+    <Error Condition="!Exists('$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.Azure.SpatialAnchors.WinRT.2.12.0\build\native\Microsoft.Azure.SpatialAnchors.WinRT.targets'))" />
   </Target>
 </Project>
diff --git a/HoloLens/DirectX/SampleHoloLens/packages.config b/HoloLens/DirectX/SampleHoloLens/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.SpatialAnchors.WinRT" version="2.11.0" targetFramework="native" />
+  <package id="Microsoft.Azure.SpatialAnchors.WinRT" version="2.12.0" targetFramework="native" />
   <package id="Microsoft.Windows.CppWinRT" version="2.0.190605.7" targetFramework="native" />
 </packages>
diff --git a/Unity/Packages/packages-lock.json b/Unity/Packages/packages-lock.json
@@ -1,17 +1,17 @@
 {
   "dependencies": {
     "com.microsoft.azure.spatial-anchors-sdk.android": {
-      "version": "2.11.0",
+      "version": "2.12.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.xr.arcore": "4.0.12",
-        "com.microsoft.azure.spatial-anchors-sdk.core": "2.11.0"
+        "com.microsoft.azure.spatial-anchors-sdk.core": "2.12.0"
       },
       "url": "https://pkgs.dev.azure.com/microsoft/_packaging/Analog.SpatialServices/npm/registry"
     },
     "com.microsoft.azure.spatial-anchors-sdk.core": {
-      "version": "2.11.0",
+      "version": "2.12.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -22,21 +22,21 @@
       "url": "https://pkgs.dev.azure.com/microsoft/_packaging/Analog.SpatialServices/npm/registry"
     },
     "com.microsoft.azure.spatial-anchors-sdk.ios": {
-      "version": "2.11.0",
+      "version": "2.12.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.xr.arkit": "4.0.12",
-        "com.microsoft.azure.spatial-anchors-sdk.core": "2.11.0"
+        "com.microsoft.azure.spatial-anchors-sdk.core": "2.12.0"
       },
       "url": "https://pkgs.dev.azure.com/microsoft/_packaging/Analog.SpatialServices/npm/registry"
     },
     "com.microsoft.azure.spatial-anchors-sdk.windows": {
-      "version": "2.11.0",
+      "version": "2.12.0",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.microsoft.azure.spatial-anchors-sdk.core": "2.11.0"
+        "com.microsoft.azure.spatial-anchors-sdk.core": "2.12.0"
       },
       "url": "https://pkgs.dev.azure.com/microsoft/_packaging/Analog.SpatialServices/npm/registry"
     },

diff --git a/Unity/ProjectSettings/ProjectSettings.asset b/Unity/ProjectSettings/ProjectSettings.asset
@@ -127,7 +127,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 2.11.0
+  bundleVersion: 2.12.0
   preloadedAssets:
   - {fileID: 0}
   - {fileID: 2278860890784086906, guid: 7df0b96c1aa1aad4d8170be2bd301ee3, type: 2}

diff --git a/Xamarin/SampleXamarin.Android/SampleXamarin.Android.csproj b/Xamarin/SampleXamarin.Android/SampleXamarin.Android.csproj
@@ -116,7 +116,7 @@
     <AndroidResource Include="Resources\mipmap-xxxhdpi\ic_launcher_round.png" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.SpatialAnchors.Xamarin" Version="2.11.0" />
+    <PackageReference Include="Microsoft.Azure.SpatialAnchors.Xamarin" Version="2.12.0" />
     <PackageReference Include="Xamarin.Android.SceneForm.UX" Version="1.11.0" />
     <PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.0.3" />
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />

diff --git a/Xamarin/SampleXamarin.iOS/SampleXamarin.iOS.csproj b/Xamarin/SampleXamarin.iOS/SampleXamarin.iOS.csproj
@@ -74,7 +74,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Essentials" Version="1.3.1" />
-    <PackageReference Include="Microsoft.Azure.SpatialAnchors.Xamarin" Version="2.11.0" />
+    <PackageReference Include="Microsoft.Azure.SpatialAnchors.Xamarin" Version="2.12.0" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />

diff --git a/iOS/Objective-C/Podfile b/iOS/Objective-C/Podfile
@@ -1,10 +1,22 @@
 platform :ios, '11.0'
 use_frameworks!
 
+# next block is added to wrokaround a code signing issue in Azure build pipelines,
+# see https://github.com/Microsoft/azure-pipelines-tasks/issues/9984
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
+      config.build_settings['CODE_SIGNING_REQUIRED'] = "NO"
+      config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
+    end
+  end
+end
+
 target 'SampleObjC' do
 
   # Pods for SampleObjC
-  pod 'AzureSpatialAnchors', '2.11.0'
+  pod 'AzureSpatialAnchors', '2.12.0'
 
   pod 'ADAL', :git => 'https://github.com/AzureAD/azure-activedirectory-library-for-objc', :tag => '2.7.7', :submodules => true
 end
diff --git a/iOS/Swift/Podfile b/iOS/Swift/Podfile
@@ -1,10 +1,22 @@
 platform :ios, '11.0'
 use_frameworks!
 
+# next block is added to wrokaround a code signing issue in Azure build pipelines,
+# see https://github.com/Microsoft/azure-pipelines-tasks/issues/9984
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    target.build_configurations.each do |config|
+      config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
+      config.build_settings['CODE_SIGNING_REQUIRED'] = "NO"
+      config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
+    end
+  end
+end
+
 target 'SampleSwift' do
 
   # Pods for SampleSwift
-  pod 'AzureSpatialAnchors', '2.11.0'
+  pod 'AzureSpatialAnchors', '2.12.0'
 
   pod 'ADAL', :git => 'https://github.com/AzureAD/azure-activedirectory-library-for-objc', :tag => '2.7.7', :submodules => true
 end