Merge remote-tracking branch 'public/feature/ux_refactor' into user/bethalha/fixes_for_merge_to_dev

Author: bethalha-havok

.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,15 +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/*
+Assets/MixedRealityToolkit.Generated*
 
 /mrtk_log_mostRecentET.csv
 

Assets/MixedReality.Toolkit.Foundation.nuspec

@@ -5,23 +5,24 @@
     <version>$version$</version>
     <authors>Microsoft</authors>
     <owners>Microsoft,MixedReality</owners>
-    <licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
-    <projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
+    <licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_development/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>
     <description>The Mixed Reality Toolkit is a collection of scripts and components intended to accelerate development of applications targeting Microsoft HoloLens and Windows Mixed Reality headsets.</description>
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <releaseNotes>$releaseNotes$</releaseNotes>
-    <tags>Unity MixedReality</tags>
+    <tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
     <dependencies>
-      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1034" />
+      <dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1037" />
     </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*" 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.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\" />
 

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/Boundary/Scenes/BoundaryVisualization.unity

@@ -256,8 +256,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
     m_FontSize: 40
@@ -540,8 +538,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
     m_FontSize: 40
@@ -698,8 +694,6 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
-      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
   m_FontData:
     m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
     m_FontSize: 40

Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity

@@ -10209,7 +10209,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "                                  ***\n<size=2.9><color=#78A2C8>https://www.microsoft.com/en-us/hololens/</color></size>\nThe
+  m_text: "                                  ***\n<size=2.9><color=#78A2C8>https://www.microsoft.com/hololens/</color></size>\nThe
     <b>HoloLens</b> is a head-mounted display unit connected to an adjustable, cushioned
     inner headband, which can tilt HoloLens up and down, as well as forward and backward.
     To wear the unit, the user fits the HoloLens on their head, using an adjustment

Assets/MixedRealityToolkit.Examples/Demos/Gltf/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/Gltf/Models/Avocado/README.md

@@ -4,7 +4,7 @@
 
 ![screenshot](../../../../../../Documentation/Images/gltf/avocado_screenshot.jpg)
 
-## License Information
+## License information
 
 [![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png)](http://creativecommons.org/publicdomain/zero/1.0/)  
 To the extent possible under law, Microsoft has waived all copyright and related or neighboring rights to this asset.