Merge pull request #7312 from microsoft/releases/2.3.0

Update release branch to v2.3.0

Author: David Kline

.github/ISSUE_TEMPLATE/bug-report.md

@@ -28,12 +28,12 @@ A clear and concise description of what you expected to happen.
 
 If applicable, add screenshots to help explain your problem.
 
-## Your Setup (please complete the following information)
+## Your setup (please complete the following information)
 
 - Unity Version [e.g. 2018.3.11f1]
 - MRTK Version [e.g. v2.0]
 
-## Target Platform (please complete the following information)
+## Target platform (please complete the following information)
 
 - HoloLens
 - HoloLens 2

.github/ISSUE_TEMPLATE/documentation-issue.md

@@ -7,14 +7,14 @@ assignees: ''
 
 ---
 
-## Describe the Issue
+## Describe the issue
 A clear and concise what the issue
 
-## Feature Area
+## Feature area
 What's incorrect? What's missing?
 
-## Existing Doc Link
-If this is about something in an existing document, please provide link 
+## Existing doc link
+If this is about something in an existing document, please provide link
 
 ## Additional context
 Add any other context about the problem here.

.github/issue_template.md

@@ -1,12 +1,12 @@
 ## Overview
 
-## Expected Behavior
+## Expected behavior
 
-## Actual Behavior
+## Actual behavior
 
 ## Steps to reproduce
 _(Links to sample github project preferred)_
 
-## Unity Editor Version
+## Unity editor version
 
-## Mixed Reality Toolkit Release Version
+## Mixed Reality Toolkit release version

.gitignore

@@ -59,14 +59,13 @@ obj/
 # Project Specific List #
 # ===================== #
 artifacts/
-Assets/ThirdParty/
-Assets/ThirdParty.meta
-Assets/TextMesh Pro.meta
-Assets/TextMesh Pro/
+Assets/ThirdParty*
+Assets/TextMesh Pro*
 --Version/
 Assets/StreamingAssets/GltfModels/
 Assets/StreamingAssets/GltfModels.meta
 Assets/StreamingAssets.meta
+Assets/MixedRealityToolkit.Generated*
 
 /mrtk_log_mostRecentET.csv
 
@@ -95,6 +94,10 @@ doc/
 # ========================= #
 # MSBuildForUnity generated #
 # ========================= #
-Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/Plugins*
 MSBuildForUnity.Common.props
-.obj
+/*.msb4u.csproj.meta
+*.msb4u.csproj.meta
+/*.msb4u.sln.meta
+*.msb4u.sln.meta
+Dependencies*
+Nuget.config*

Assets/MixedReality.Toolkit.Foundation.nuspec

@@ -5,7 +5,7 @@
     <version>$version$</version>
     <authors>Microsoft</authors>
     <owners>Microsoft,MixedReality</owners>
-    <licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
+    <licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.3.0/License.txt</licenseUrl>
     <projectUrl>https://aka.ms/MRTK</projectUrl>
     <iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -14,15 +14,15 @@
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
     <dependencies>
-      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1037" />
+      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1045" />
     </dependencies>
     <contentFiles>
       <files include="any\any\.PkgSrc\**" buildAction="None" copyToOutput="false" />
     </contentFiles>
   </metadata>
   <files>
     <file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
-    <file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter*;MixedRealityToolkit.Providers\WindowsMixedReality\DotNetAdapter\**\*.*" target="MRTK\" />
+    <file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*;MixedRealityToolkit.Providers\WindowsMixedReality\Shared\DotNetAdapter*;MixedRealityToolkit.Providers\WindowsMixedReality\Shared\DotNetAdapter\**\*.*;MixedRealityToolkit.Providers\UnityAR*;MixedRealityToolkit.Providers\UnityAR\**\*.*" target="MRTK\" />
     <file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.SDK\License.txt*;MixedRealityToolkit.SDK\Version.txt*;MixedRealityToolkit.SDK\toc.yml*;MixedRealityToolkit.SDK\StandardAssets.meta;MixedRealityToolkit.SDK\StandardAssets\Fonts.meta;MixedRealityToolkit.SDK\StandardAssets\Materials.meta;MixedRealityToolkit.SDK\StandardAssets\Shaders.meta;MixedRealityToolkit.SDK\StandardAssets\Textures.meta" target="MRTK\" />
     <file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
 
@@ -34,22 +34,25 @@
     <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
     <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
     <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
-    <!-- commenting source packaging for the 2.2.0 release -->
+    <!-- The following line is commented out because of a path length issue -->
     <!-- <file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" /> -->
 
     <!-- Assemblies and Sources that are built from the MixedRealityToolkit.Providers folder -->
-    <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
+    <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" exclude="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.UnityAR*;..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.UnityAR\**\*.*" target="Plugins\" />
+    <!-- The following line is commented out because of a path length issue -->
     <!-- <file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" /> -->
 
     <!-- Assemblies and Sources that are built from the MixedRealityToolkit.SDK folder -->
     <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
     <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
+    <!-- The following line is commented out because of a path length issue -->
     <!-- <file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" /> -->
 
     <!-- Assemblies and Sources that are built from the MixedRealityToolkit.Services folder -->
     <file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
+    <!-- The following line is commented out because of a path length issue -->
     <!-- <file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" /> -->
-
+    
     <!-- 
       link.xml is copied to the root location, so that it can catch IL2CPP
       bytecode stripping issues for all scripts included in this package.

Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs

@@ -3,8 +3,8 @@
 
 using System.Reflection;
 
-[assembly: AssemblyVersion("2.2.0.0")]
-[assembly: AssemblyFileVersion("2.2.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 
 [assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
 [assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

Assets/MixedRealityToolkit.Examples/Demos/Audio/Scripts/LoFiFilterSelection.cs

@@ -8,6 +8,7 @@
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos
 {
     [RequireComponent(typeof(AudioLoFiEffect))]
+    [AddComponentMenu("Scripts/MRTK/Examples/LoFiFilterSelection")]
     public class LoFiFilterSelection : MonoBehaviour, IMixedRealityPointerHandler
     {
         [Tooltip("Material used when the emitter is set to Narrow Band Telephony")]

Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scripts/BoundaryVisualizationDemo.cs

@@ -10,6 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos
     /// <summary>
     /// Demo class to show different ways of using the boundary system and visualizing the data.
     /// </summary>
+    [AddComponentMenu("Scripts/MRTK/Examples/BoundaryVisualizationDemo")]
     public class BoundaryVisualizationDemo : MonoBehaviour, IMixedRealityBoundaryHandler
     {
         private GameObject markerParent;

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoBasicSetup/Scripts/ColorTap.cs

@@ -6,6 +6,7 @@
 
 namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
 {
+    [AddComponentMenu("Scripts/MRTK/Examples/ColorTap")]
     public class ColorTap : MonoBehaviour, IMixedRealityFocusHandler, IMixedRealityPointerHandler
     {
         [SerializeField]

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/DemoBasicSetup/Scripts/FollowEyeGazeGazeProvider.cs

@@ -10,6 +10,7 @@ namespace Microsoft.MixedReality.Toolkit.Examples.Demos.EyeTracking
     /// Sample for allowing the game object that this script is attached to follow the user's eye gaze
     /// at a given distance of "DefaultDistanceInMeters". 
     /// </summary>
+    [AddComponentMenu("Scripts/MRTK/Examples/FollowEyeGazeGazeProvider")]
     public class FollowEyeGazeGazeProvider : MonoBehaviour
     {
         [Tooltip("Display the game object along the eye gaze ray at a default distance (in meters).")]