Automated commit for release version 1.2.25

jloehr · jloehr · commit 3197e63ba8a2 · 2024-04-18T08:09:34.000Z
diff --git a/NativeCpp/HoloLens-OpenXr/samples/BasicXrApp/BasicXrApp_uwp.targets b/NativeCpp/HoloLens-OpenXr/samples/BasicXrApp/BasicXrApp_uwp.targets
@@ -1,9 +1,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Redirect to the nuget .targets and .props file -->
-  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.props')" />
+  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.props')" />
   
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.targets')" />
   </ImportGroup>
 
 </Project>
diff --git a/NativeCpp/HoloLens-OpenXr/samples/BasicXrApp/packages.config b/NativeCpp/HoloLens-OpenXr/samples/BasicXrApp/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.2.24" targetFramework="native" />
+  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.2.25" targetFramework="native" />
   <package id="OpenXR.Headers" version="1.0.10.2" targetFramework="native" />
   <package id="OpenXR.Loader" version="1.0.10.2" targetFramework="native" />
 </packages>
diff --git a/NativeCpp/HoloLens-Wmr/HolographicApp.targets b/NativeCpp/HoloLens-Wmr/HolographicApp.targets
@@ -1,9 +1,9 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Redirect to the nuget .targets and .props file -->
-  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.props')" />
+  <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.props" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.props')" />
   
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.24\build\microsoft.azure.remoterendering.Cpp.targets')" />
+    <Import Project="$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.targets" Condition="Exists('$(SolutionDir)\packages\Microsoft.Azure.RemoteRendering.Cpp.1.2.25\build\microsoft.azure.remoterendering.Cpp.targets')" />
   </ImportGroup>
 
 </Project>
diff --git a/NativeCpp/HoloLens-Wmr/packages.config b/NativeCpp/HoloLens-Wmr/packages.config
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Windows.CppWinRT" version="2.0.200729.8" targetFramework="native" />
-  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.2.24" targetFramework="native" />
+  <package id="Microsoft.Azure.RemoteRendering.Cpp" version="1.2.25" targetFramework="native" />
 </packages>
diff --git a/Scripts/ARRUtils.ps1 b/Scripts/ARRUtils.ps1
diff --git a/Scripts/Conversion.ps1 b/Scripts/Conversion.ps1
diff --git a/Scripts/DownloadUnityPackages.ps1 b/Scripts/DownloadUnityPackages.ps1
diff --git a/Scripts/RenderingSession.ps1 b/Scripts/RenderingSession.ps1
diff --git a/Scripts/ValidateConversionJson.ps1 b/Scripts/ValidateConversionJson.ps1
diff --git a/Scripts/unity_sample_dependencies.json b/Scripts/unity_sample_dependencies.json
@@ -57,7 +57,7 @@
     },
     {
       "name": "com.microsoft.azure.remote-rendering",
-      "version": "1.2.24",
+      "version": "1.2.25",
       "registry": "https://pkgs.dev.azure.com/aipmr/MixedReality-Unity-Packages/_packaging/Unity-packages/npm/registry"
     }
   ]
diff --git a/Unity/Quickstart/Packages/manifest.json b/Unity/Quickstart/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.microsoft.azure.remote-rendering": "file:../../MRPackages/com.microsoft.azure.remote-rendering-1.2.24.tgz",
+    "com.microsoft.azure.remote-rendering": "file:../../MRPackages/com.microsoft.azure.remote-rendering-1.2.25.tgz",
     "com.microsoft.mixedreality.openxr": "file:../../MRPackages/com.microsoft.mixedreality.openxr-1.8.1.tgz",
     "com.unity.ide.rider": "3.0.24",
     "com.unity.ide.visualstudio": "2.0.18",
diff --git a/Unity/Showcase/App/Assets/App/Anchoring/Editor/AddCapabilities.cs b/Unity/Showcase/App/Assets/App/Anchoring/Editor/AddCapabilities.cs
@@ -15,6 +15,11 @@ public class AddCapabilities
     [PostProcessBuild(0)]
     public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject)
     {
+        if (target != BuildTarget.WSAPlayer)
+        {
+            return;
+        }
+
         // Find the appxmanifest, assume the one we want is the first one
         string[] manifests = Directory.GetFiles(
             pathToBuiltProject,
diff --git a/Unity/Showcase/App/Assets/App/Startup/BuildAppUriHandler.cs b/Unity/Showcase/App/Assets/App/Startup/BuildAppUriHandler.cs
@@ -15,9 +15,14 @@ public class BuildAppUriHandler
     [PostProcessBuild(1)]
     public static void OnPostprocessBuild(BuildTarget target, string pathToBuiltProject)
     {
+        if (target != BuildTarget.WSAPlayer)
+        {
+            return;
+        }
+
         // Find the appxmanifest, assume the one we want is the first one
         string[] manifests = Directory.GetFiles(
-            pathToBuiltProject, 
+            pathToBuiltProject,
             "Package.appxmanifest", 
             SearchOption.AllDirectories);
 
diff --git a/Unity/Showcase/App/Assets/App/Utilities/Editor/PatchProjectConfigurations.cs b/Unity/Showcase/App/Assets/App/Utilities/Editor/PatchProjectConfigurations.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
@@ -25,15 +26,15 @@ public class PatchProjectConfigurations : IPostprocessBuildWithReport
 
     public void OnPostprocessBuild(BuildReport report)
     {
-        if (report == null || report.files == null)
+        if (report == null || report.files == null || report.summary.platformGroup != BuildTargetGroup.WSA)
         {
             return;
         }
 
         foreach (var patchEntry in _replacements)
         {
             string[] files = Directory.GetFiles(
-                report.summary.outputPath, 
+                report.summary.outputPath,
                 patchEntry.fileSearchPattern, 
                 SearchOption.AllDirectories);
 
diff --git a/Unity/Showcase/App/Packages/manifest.json b/Unity/Showcase/App/Packages/manifest.json
@@ -1,7 +1,7 @@
 {
   "scopedRegistries": [],
   "dependencies": {
-    "com.microsoft.azure.remote-rendering": "file:../../../MRPackages/com.microsoft.azure.remote-rendering-1.2.24.tgz",
+    "com.microsoft.azure.remote-rendering": "file:../../../MRPackages/com.microsoft.azure.remote-rendering-1.2.25.tgz",
     "com.microsoft.mixedreality.openxr": "file:../../../MRPackages/com.microsoft.mixedreality.openxr-1.8.1.tgz",
     "com.microsoft.mixedreality.toolkit.extensions": "file:../../../MRPackages/com.microsoft.mixedreality.toolkit.extensions-2.8.3.tgz",
     "com.microsoft.mixedreality.toolkit.foundation": "file:../../../MRPackages/com.microsoft.mixedreality.toolkit.foundation-2.8.3.tgz",
diff --git a/Unity/Showcase/App/ProjectSettings/ProjectSettings.asset b/Unity/Showcase/App/ProjectSettings/ProjectSettings.asset
@@ -135,7 +135,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.2.24
+  bundleVersion: 1.2.25
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -576,7 +576,7 @@ PlayerSettings:
   m_RenderingPath: 1
   m_MobileRenderingPath: 1
   metroPackageName: Azure.Remote.Rendering.Showcase
-  metroPackageVersion: 1.2.24.0
+  metroPackageVersion: 1.2.25.0
   metroCertificatePath: Assets/WSATestCertificate.pfx
   metroCertificatePassword: 
   metroCertificateSubject: Microsoft
diff --git a/Unity/Tutorial-Complete/Assets/RemoteRenderingTutorial/Plugins/x86/Microsoft.Identity.Client.dll.meta b/Unity/Tutorial-Complete/Assets/RemoteRenderingTutorial/Plugins/x86/Microsoft.Identity.Client.dll.meta
diff --git a/Unity/Tutorial-Complete/Packages/manifest.json b/Unity/Tutorial-Complete/Packages/manifest.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "com.microsoft.azure.remote-rendering": "file:../../MRPackages/com.microsoft.azure.remote-rendering-1.2.24.tgz",
+    "com.microsoft.azure.remote-rendering": "file:../../MRPackages/com.microsoft.azure.remote-rendering-1.2.25.tgz",
     "com.microsoft.mixedreality.openxr": "file:../../MRPackages/com.microsoft.mixedreality.openxr-1.8.1.tgz",
     "com.microsoft.mixedreality.toolkit.foundation": "file:../../MRPackages/com.microsoft.mixedreality.toolkit.foundation-2.7.2.tgz",
     "com.microsoft.mixedreality.toolkit.standardassets": "file:../../MRPackages/com.microsoft.mixedreality.toolkit.standardassets-2.7.2.tgz",
diff --git a/Unity/TutorialAssets/TutorialAssets.unitypackage b/Unity/TutorialAssets/TutorialAssets.unitypackage
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a6408896a29178f7c9e8baeb4449ed3bc09181bcf3ab3a5f5e8c7424c0a534c2
-size 5449760
+oid sha256:aabb2bd33f7647740c1061b2db6e893b2e12bb823dfe0ea63725f062a73c834b
+size 5448958

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`},`
`58`	`58`	`{`
`59`	`59`	`"name": "com.microsoft.azure.remote-rendering",`
`60`		`- "version": "1.2.24",`
	`60`	`+ "version": "1.2.25",`
`61`	`61`	`"registry": "https://pkgs.dev.azure.com/aipmr/MixedReality-Unity-Packages/_packaging/Unity-packages/npm/registry"`
`62`	`62`	`}`
`63`	`63`	`]`