Skip to content

Commit 4ee0b4f

Browse files
authored
Merge pull request #7229 from keveleigh/move-dotnetadapter
Move DotNetAdapter into WMR.Shared
2 parents 52c8c2d + b90b126 commit 4ee0b4f

File tree

5 files changed

+1
-1
lines changed

5 files changed

+1
-1
lines changed

Assets/MixedReality.Toolkit.Foundation.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
</metadata>
2323
<files>
2424
<file src="MixedRealityToolkit\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit\toc.yml*" 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\**\*.*;MixedRealityToolkit.Providers\UnityAR*;MixedRealityToolkit.Providers\UnityAR\**\*.*" 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\Shared\DotNetAdapter*;MixedRealityToolkit.Providers\WindowsMixedReality\Shared\DotNetAdapter\**\*.*;MixedRealityToolkit.Providers\UnityAR*;MixedRealityToolkit.Providers\UnityAR\**\*.*" target="MRTK\" />
2626
<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\" />
2727
<file src="MixedRealityToolkit.Services\**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta;MixedRealityToolkit.Services\License.txt*;MixedRealityToolkit.Services\Version.txt*" target="MRTK\" />
2828

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter.meta renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/DotNetAdapter.meta

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/.gitignore renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/DotNetAdapter/.gitignore

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/DotNetAdapter.csproj renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/DotNetAdapter/DotNetAdapter.csproj

File renamed without changes.

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/DotNetAdapter.csproj.meta renamed to Assets/MixedRealityToolkit.Providers/WindowsMixedReality/Shared/DotNetAdapter/DotNetAdapter.csproj.meta

File renamed without changes.

0 commit comments

Comments
 (0)