Skip to content

Commit aa9bcc0

Browse files
author
David Kline
authored
Merge pull request #8725 from microsoft/releases/2.5.0
Merge 2.5.0 -> mrtk_release
2 parents ed6929b + 84454ec commit aa9bcc0

File tree

3,031 files changed

+393257
-432494
lines changed

Some content is hidden

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

3,031 files changed

+393257
-432494
lines changed

‎.gitignore‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ UnityPackageManager/
1717
project.json
1818
project.lock.json
1919
*.package
20-
20+
**/.DS_Store
21+
Assets/XR/
22+
Assets/XR.meta
23+
Assets/Oculus/
24+
Assets/Oculus.meta
2125
# ============ #
2226
# Certificates #
2327
# ============ #
@@ -101,3 +105,8 @@ MSBuildForUnity.Common.props
101105
*.msb4u.sln.meta
102106
Dependencies*
103107
Nuget.config*
108+
109+
# =========== #
110+
# Other files #
111+
# =========== #
112+
.DS_Store

‎Assets/MRTK/.npmignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
*.nuspec
2+
*.nuspec.meta
3+
*.tgz

‎Assets/MRTK/Core/AssemblyInfo.cs‎

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎Assets/MRTK/Core/AssemblyInfo.cs.meta‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎Assets/MRTK/Core/Attributes/DocLinkAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55

‎Assets/MRTK/Core/Attributes/EnumFlagsAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using System;
55
using UnityEngine;

‎Assets/MRTK/Core/Attributes/ExperimentalAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33
using UnityEngine;
44
using System;
55

‎Assets/MRTK/Core/Attributes/ExtendsAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
#if WINDOWS_UWP && !ENABLE_IL2CPP

‎Assets/MRTK/Core/Attributes/HelpAttribute.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33
using UnityEngine;
44
using System;
55

@@ -8,7 +8,7 @@ namespace Microsoft.MixedReality.Toolkit
88
/// <summary>
99
/// A PropertyAttribute for showing a collapsible Help section.
1010
/// </summary>
11-
[AttributeUsage(AttributeTargets.Field|AttributeTargets.Property, AllowMultiple = false)]
11+
[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = false)]
1212
public class HelpAttribute : PropertyAttribute
1313
{
1414
/// <summary>
@@ -35,7 +35,7 @@ public class HelpAttribute : PropertyAttribute
3535
/// <param name="helpText">The help text to display</param>
3636
/// <param name="helpHeader">The help header foldout text</param>
3737
/// <param name="collapsible">If true, this help drawer will be collapsible</param>
38-
public HelpAttribute(string helpText, string helpHeader="Help", bool collapsible = true)
38+
public HelpAttribute(string helpText, string helpHeader = "Help", bool collapsible = true)
3939
{
4040
Text = helpText;
4141
Header = helpHeader;

‎Assets/MRTK/Core/Attributes/ImplementsAttribute.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
2-
// Licensed under the MIT License. See LICENSE in the project root for license information.
1+
// Copyright (c) Microsoft Corporation.
2+
// Licensed under the MIT License.
33

44
using Microsoft.MixedReality.Toolkit.Utilities;
55
#if WINDOWS_UWP && !ENABLE_IL2CPP

0 commit comments

Comments
 (0)