Skip to content

Commit 89fb1f9

Browse files
author
David Kline
authored
Merge pull request #5740 from microsoft/mergeToRelease
Merge 2.0.0_stabilization into mrtk_release
2 parents 99b16b1 + e854d25 commit 89fb1f9

File tree

3,050 files changed

+182904
-70272
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,050 files changed

+182904
-70272
lines changed

‎.gitignore‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,10 @@ Assets/StreamingAssets.meta
7474
# =============== #
7575
doc/
7676

77-
# =========================================== #
78-
# Asset Script Reference Retargeter Generated #
79-
# =========================================== #
80-
NuGet/
77+
# ============================= #
78+
# NuGet Build Process Generated #
79+
# ============================= #
80+
/NuGet/
81+
/MRTKBuild/
82+
/MSBuild/
83+
/PackagesCopy/

‎Assets/MixedReality.Toolkit.Foundation.nuspec‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<?xml version="1.0"?>
2+
<package >
3+
<metadata>
4+
<id>Microsoft.MixedReality.Toolkit.Foundation</id>
5+
<version>$version$</version>
6+
<authors>Microsoft</authors>
7+
<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>
10+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
11+
<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>
12+
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
13+
<releaseNotes>$releaseNotes$</releaseNotes>
14+
<tags>Unity MixedReality</tags>
15+
</metadata>
16+
<files>
17+
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
18+
<file src="MixedRealityToolkit.Providers\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
19+
<file src="MixedRealityToolkit.SDK\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
20+
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
21+
22+
<file src="MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Foundation.targets" />
23+
24+
<!-- Assemblies that are built from the MixedRealityToolkit folder -->
25+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Editor.*" target="Plugins\" />
26+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Async.*" target="Plugins\" />
27+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
28+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.pdb*" target="Plugins\" />
29+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Gltf.*" target="Plugins\" />
30+
31+
<!-- Assemblies that are built from the MixedRealityToolkit.Providers folder -->
32+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.*" target="Plugins\" />
33+
34+
<!-- Assemblies that are built from the MixedRealityToolkit.SDK folder -->
35+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.*" target="Plugins\" />
36+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.*" target="Plugins\" />
37+
38+
<!-- Assemblies that are built from the MixedRealityToolkit.Services folder -->
39+
<file src="..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.*" target="Plugins\" />
40+
41+
<!--
42+
link.xml is copied to the root location, so that it can catch IL2CPP
43+
bytecode stripping issues for all scripts included in this package.
44+
-->
45+
<file src="link.xml" target="" />
46+
<file src="link.xml.meta" target="" />
47+
</files>
48+
</package>

‎Assets/MixedReality.Toolkit.Foundation.nuspec.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)