Skip to content

Commit 34130e1

Browse files
keveleighkeveleigh
committed
Merge branch 'prerelease/2.3.0_stabilization' into merge-stabilization
2 parents 261ef0c + 3bed304 commit 34130e1

File tree

92 files changed

+340
-195
lines changed

Some content is hidden

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

92 files changed

+340
-195
lines changed

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,30 @@
3434
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
3535
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
3636
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
37-
<file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" />
37+
38+
<!-- The following line is commented out because of a path length issue in nuget for unity -->
39+
<!-- <file src="..\..\Assets\MixedRealityToolkit\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit" /> -->
40+
3841

3942
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Providers folder -->
4043
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
41-
<file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" />
4244

45+
<!-- The following line is commented out because of a path length issue in nuget for unity -->
46+
<!-- <file src="..\..\Assets\MixedRealityToolkit.Providers\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Providers" /> -->
47+
4348
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.SDK folder -->
4449
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
4550
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
46-
<file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" />
47-
51+
52+
<!-- The following line is commented out because of a path length issue in nuget for unity -->
53+
<!-- <file src="..\..\Assets\MixedRealityToolkit.SDK\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.SDK" />-->
54+
4855
<!-- Assemblies and Sources that are built from the MixedRealityToolkit.Services folder -->
4956
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
50-
<file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" />
5157

58+
<!-- The following line is commented out because of a path length issue in nuget for unity -->
59+
<!-- <file src="..\..\Assets\MixedRealityToolkit.Services\**\*.cs" target="contentFiles\any\any\.PkgSrc\MRTK\MixedRealityToolkit.Services" /> -->
60+
5261
<!--
5362
link.xml is copied to the root location, so that it can catch IL2CPP
5463
bytecode stripping issues for all scripts included in this package.

‎Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Scripts/Editor/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scripts/Editor/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Inspectors/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.4.0.0")]
7-
[assembly: AssemblyFileVersion("2.4.0.0")]
6+
[assembly: AssemblyVersion("2.3.0.0")]
7+
[assembly: AssemblyFileVersion("2.3.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Microsoft Mixed Reality Toolkit 2.4.0
1+
Microsoft Mixed Reality Toolkit 2.3.0

0 commit comments

Comments
 (0)