Skip to content

Commit bef5f3e

Browse files
author
David Kline
authored
Merge pull request #6852 from microsoft/mrtk_release
merge release into development
2 parents 7fafb07 + 022064a commit bef5f3e

27 files changed

+233
-130
lines changed

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<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>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
1516
<dependencies>
1617
<dependency id="Microsoft.Windows.MixedReality.DotNetWinRT" version="0.5.1037" />
1718
</dependencies>
@@ -21,7 +22,7 @@
2122
</metadata>
2223
<files>
2324
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" target="MRTK\" />
24-
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Providers\License.txt*;MixedRealityToolkit.Providers\Version.txt*" target="MRTK\" />
25+
<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\" />
2526
<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\" />
2627
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
2728

‎Assets/MixedRealityToolkit.Examples/Demos/Boundary/Scenes/BoundaryVisualization.unity‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -256,8 +256,6 @@ MonoBehaviour:
256256
m_OnCullStateChanged:
257257
m_PersistentCalls:
258258
m_Calls: []
259-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
260-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
261259
m_FontData:
262260
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
263261
m_FontSize: 40
@@ -540,8 +538,6 @@ MonoBehaviour:
540538
m_OnCullStateChanged:
541539
m_PersistentCalls:
542540
m_Calls: []
543-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
544-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
545541
m_FontData:
546542
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
547543
m_FontSize: 40
@@ -698,8 +694,6 @@ MonoBehaviour:
698694
m_OnCullStateChanged:
699695
m_PersistentCalls:
700696
m_Calls: []
701-
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
702-
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
703697
m_FontData:
704698
m_Font: {fileID: 12800000, guid: e869342c56e54acf989b2422b4b80dcc, type: 3}
705699
m_FontSize: 40

‎Assets/MixedRealityToolkit.Examples/Experimental/ExamplesHub/Profiles/MRTKExamplesHubSceneSystemProfile.asset‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,92 +33,92 @@ MonoBehaviour:
3333
contentScenes:
3434
- Name: MRTKExamplesHubMainMenu
3535
Path: Assets/MixedRealityToolkit.Examples/Experimental/ExamplesHub/Scenes/MRTKExamplesHubMainMenu.unity
36-
Included: 1
37-
BuildIndex: 2
36+
Included: 0
37+
BuildIndex: -1
3838
Tag: Untagged
3939
Asset: {fileID: 102900000, guid: 63a00118e809c754f9c7911bb85d635f, type: 3}
4040
- Name: HandInteractionExamples
4141
Path: Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandInteractionExamples.unity
4242
Included: 1
43-
BuildIndex: 1
43+
BuildIndex: 0
4444
Tag: Untagged
4545
Asset: {fileID: 102900000, guid: 3dd4a396b5225f8469b9a1eb608bfa57, type: 3}
4646
- Name: ClippingExamples
4747
Path: Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scenes/ClippingExamples.unity
48-
Included: 1
49-
BuildIndex: 3
48+
Included: 0
49+
BuildIndex: -1
5050
Tag: Untagged
5151
Asset: {fileID: 102900000, guid: e532091edada3e04aa706112e8d5f310, type: 3}
5252
- Name: TooltipExamples
5353
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/Tooltips/Scenes/TooltipExamples.unity
54-
Included: 1
55-
BuildIndex: 4
54+
Included: 0
55+
BuildIndex: -1
5656
Tag: Untagged
5757
Asset: {fileID: 102900000, guid: de90a43947eced441b4c426e11f35f28, type: 3}
5858
- Name: MaterialGallery
5959
Path: Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scenes/MaterialGallery.unity
60-
Included: 1
61-
BuildIndex: 5
60+
Included: 0
61+
BuildIndex: -1
6262
Tag: Untagged
6363
Asset: {fileID: 102900000, guid: c6b1477d31864dff836e9738518eae60, type: 3}
6464
- Name: BoundingBoxExamples
6565
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/BoundingBox/Scenes/BoundingBoxExamples.unity
66-
Included: 1
67-
BuildIndex: 6
66+
Included: 0
67+
BuildIndex: -1
6868
Tag: Untagged
6969
Asset: {fileID: 102900000, guid: 9da574c0affd04d42a6b1e5db09e82b4, type: 3}
7070
- Name: PressableButtonExample
7171
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/PressableButton/Scenes/PressableButtonExample.unity
72-
Included: 1
73-
BuildIndex: 7
72+
Included: 0
73+
BuildIndex: -1
7474
Tag: Untagged
7575
Asset: {fileID: 102900000, guid: b2d06bb8d7f107d4783a56c796c5c120, type: 3}
7676
- Name: HandMenuExamples
7777
Path: Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/HandMenuExamples.unity
78-
Included: 1
79-
BuildIndex: 8
78+
Included: 0
79+
BuildIndex: -1
8080
Tag: Untagged
8181
Asset: {fileID: 102900000, guid: 2792ec9767804e644906ab978f2eed23, type: 3}
8282
- Name: SlateExample
8383
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/Slate/SlateExample.unity
84-
Included: 1
85-
BuildIndex: 9
84+
Included: 0
85+
BuildIndex: -1
8686
Tag: Untagged
8787
Asset: {fileID: 102900000, guid: 86e8b0c6246dbb74aa04ecd40a57d89c, type: 3}
8888
- Name: SliderExample
8989
Path: Assets/MixedRealityToolkit.Examples/Demos/UX/Slider/Scenes/SliderExample.unity
90-
Included: 1
91-
BuildIndex: 10
90+
Included: 0
91+
BuildIndex: -1
9292
Tag: Untagged
9393
Asset: {fileID: 102900000, guid: 086aad2912678d04e968264b2398004b, type: 3}
9494
- Name: EyeTrackingDemo-02-TargetSelection
9595
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-02-TargetSelection.unity
96-
Included: 1
97-
BuildIndex: 11
96+
Included: 0
97+
BuildIndex: -1
9898
Tag: Untagged
9999
Asset: {fileID: 102900000, guid: 55643f7e4eceb734784192b162f565e0, type: 3}
100100
- Name: EyeTrackingDemo-03-Navigation
101101
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-03-Navigation.unity
102-
Included: 1
103-
BuildIndex: 12
102+
Included: 0
103+
BuildIndex: -1
104104
Tag: Untagged
105105
Asset: {fileID: 102900000, guid: 5df475f0bf57b1f488d59e0e16040d9a, type: 3}
106106
- Name: EyeTrackingDemo-04-TargetPositioning
107107
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-04-TargetPositioning.unity
108-
Included: 1
109-
BuildIndex: 13
108+
Included: 0
109+
BuildIndex: -1
110110
Tag: Untagged
111111
Asset: {fileID: 102900000, guid: 91ded1f5ef2ae854ba4ac94eca7a2494, type: 3}
112112
- Name: EyeTrackingDemo-05-Visualizer
113113
Path: Assets/MixedRealityToolkit.Examples/Demos/EyeTracking/Scenes/EyeTrackingDemo-05-Visualizer.unity
114-
Included: 1
115-
BuildIndex: 14
114+
Included: 0
115+
BuildIndex: -1
116116
Tag: Untagged
117117
Asset: {fileID: 102900000, guid: 2d6c43a82f3a88c4dbdc3b5e99a68d8a, type: 3}
118118
- Name: NearMenuExamples
119119
Path: Assets/MixedRealityToolkit.Examples/Demos/HandTracking/Scenes/NearMenuExamples.unity
120-
Included: 1
121-
BuildIndex: 15
120+
Included: 0
121+
BuildIndex: -1
122122
Tag: Untagged
123123
Asset: {fileID: 102900000, guid: bf3eb3415bffceb41810526380c2c71c, type: 3}
124124
permittedLightingSceneComponentTypes:

‎Assets/MixedRealityToolkit.Examples/MixedReality.Toolkit.Examples.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<description>Examples of the Mixed Reality Toolkit</description>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
1516
<dependencies>
1617
<dependency id="Microsoft.MixedReality.Toolkit.Foundation" version="$version$" />
1718
</dependencies>

‎Assets/MixedRealityToolkit.Extensions/MixedReality.Toolkit.Extensions.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<description>Extension services and components for the Mixed Reality Toolkit</description>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
1516
<dependencies>
1617
<dependency id="Microsoft.MixedReality.Toolkit.Foundation" version="$version$" />
1718
</dependencies>

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/HolographicBackPlateBorderOnly.mat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ Material:
165165
- _UVSec: 0
166166
- _VertexColors: 0
167167
- _VertexExtrusion: 0
168+
- _VertexExtrusionSmoothNormals: 0
168169
- _VertexExtrusionValue: 0
169170
- _ZOffsetFactor: 0
170171
- _ZOffsetUnits: 0

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsH.mat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Material:
108108
- _TriplanarMappingBlendSharpness: 4
109109
- _VertexColors: 0
110110
- _VertexExtrusion: 0
111+
- _VertexExtrusionSmoothNormals: 0
111112
- _VertexExtrusionValue: 0
112113
- _ZOffsetFactor: 0
113114
- _ZOffsetUnits: 0

‎Assets/MixedRealityToolkit.SDK/Features/UX/Interactable/Materials/MRTK_GrabbableDots2RowsV1.mat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ Material:
108108
- _TriplanarMappingBlendSharpness: 4
109109
- _VertexColors: 0
110110
- _VertexExtrusion: 0
111+
- _VertexExtrusionSmoothNormals: 0
111112
- _VertexExtrusionValue: 0
112113
- _ZOffsetFactor: 0
113114
- _ZOffsetUnits: 0

‎Assets/MixedRealityToolkit.Staging/UnityAR/MixedReality.Toolkit.Providers.UnityAR.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<description>Mixed Reality Toolkit provider adding support for mobile (phones and tablets) AR devices. NOTE: This package requires Unity's Package Manager AR Foundation as well as AR Core and/or AR Kit packages.</description>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
1516
<dependencies>
1617
<dependency id="Microsoft.MixedReality.Toolkit.Foundation" version="$version$" />
1718
</dependencies>

‎Assets/MixedRealityToolkit.Tests/MixedReality.Toolkit.Tests.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
<version>$version$</version>
66
<authors>Microsoft</authors>
77
<owners>Microsoft,MixedReality</owners>
8-
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/mrtk_release/License.txt</licenseUrl>
9-
<projectUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity</projectUrl>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
9+
<projectUrl>https://aka.ms/MRTK</projectUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1011
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1112
<description>Tests for the Mixed Reality Toolkit.</description>
1213
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1314
<releaseNotes>$releaseNotes$</releaseNotes>
14-
<tags>Unity MixedReality</tags>
15+
<tags>Unity MixedReality MixedRealityToolkit MRTK</tags>
1516
<dependencies>
1617
<dependency id="Microsoft.MixedReality.Toolkit.Foundation" version="$version$" />
1718
</dependencies>

0 commit comments

Comments
 (0)