Merge pull request microsoft#4051 from andreiborodin/features/assetRe…

…targeting

MRTK NuGet with Compiled Binaries

.gitignore

@@ -73,3 +73,8 @@ Assets/StreamingAssets.meta
 # DocFX Generated #
 # =============== #
 doc/
+
+# =========================================== #
+# Asset Script Reference Retargeter Generated #
+# =========================================== #
+NuGet/

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

@@ -16,4 +16,17 @@
       <dependency id="Microsoft.MixedReality.Toolkit.SDK" version="$version$" />
     </dependencies>
   </metadata>
+  <files>
+    <file src="**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
+
+    <!-- Reuse MixedReality.Toolkit.targets, as the MSBuild logic is the same for all MRTK nuget packages. -->
+    <file src="..\MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Examples.targets" />
+
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Examples.Demos.Gltf.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Examples.Demos.StandardShader.Inspectors.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Examples.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\MixedRealityToolkit.Examples.Demos.Utilities.InspectorFields.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\MixedRealityToolkit.Examples.Demos.Utilities.InspectorFields.Inspectors.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\MixedRealityToolkit.Examples.Demos.UX.Interactables.dll*" target="Plugins\" />
+  </files>
 </package>

Assets/MixedRealityToolkit.Providers/MixedReality.Toolkit.Providers.nuspec

@@ -12,5 +12,18 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality</tags>
+    <dependencies>
+      <dependency id="Microsoft.MixedReality.Toolkit" version="$version$" />
+    </dependencies>
   </metadata>
+  <files>
+    <file src="**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
+
+    <!-- Reuse MixedReality.Toolkit.targets, as the MSBuild logic is the same for all MRTK nuget packages. -->
+    <file src="..\MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Providers.targets" />
+
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.OpenVR.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.WindowsMixedReality.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Providers.WindowsVoiceInput.dll*" target="Plugins\" />
+  </files>
 </package>

Assets/MixedRealityToolkit.SDK/MixedReality.Toolkit.SDK.nuspec

@@ -14,6 +14,17 @@
     <tags>Unity MixedReality</tags>
     <dependencies>
       <dependency id="Microsoft.MixedReality.Toolkit" version="$version$" />
+      <dependency id="Microsoft.MixedReality.Toolkit.Services" version="$version$" />
+	  <dependency id="Microsoft.MixedReality.Toolkit.Providers" version="$version$" />
     </dependencies>
   </metadata>
+  <files>
+    <file src="**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
+
+    <!-- Reuse MixedReality.Toolkit.targets, as the MSBuild logic is the same for all MRTK nuget packages. -->
+    <file src="..\MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.SDK.targets" />
+
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.SDK.Inspectors.dll*" target="Plugins\" />
+  </files>
 </package>

Assets/MixedRealityToolkit.Services/MixedReality.Toolkit.Services.nuspec

@@ -12,5 +12,23 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality</tags>
+    <dependencies>
+      <dependency id="Microsoft.MixedReality.Toolkit" version="$version$" />
+    </dependencies>
   </metadata>
+  <files>
+    <file src="**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
+
+    <!-- Reuse MixedReality.Toolkit.targets, as the MSBuild logic is the same for all MRTK nuget packages. -->
+    <file src="..\MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Services.targets" />
+
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.BoundarySystem.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.DiagnosticsSystem.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.InputSimulation.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.InputSimulation.Editor.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.InputSystem.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.InputSystem.Inspectors.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.SpatialAwarenessSystem.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Services.TeleportSystem.dll*" target="Plugins\" />
+  </files>
 </package>

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

@@ -16,4 +16,14 @@
       <dependency id="Microsoft.MixedReality.Toolkit" version="$version$" />
     </dependencies>
   </metadata>
+  <files>
+    <file src="**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
+
+    <!-- Reuse MixedReality.Toolkit.targets, as the MSBuild logic is the same for all MRTK nuget packages. -->
+    <file src="..\MixedRealityToolkit\MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.Tests.targets" />
+
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Tests.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Tests.EditModeTests.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Tests.PlayModeTests.dll*" target="Plugins\" />
+  </files>
 </package>

Assets/MixedRealityToolkit/MixedReality.Toolkit.nuspec

@@ -13,4 +13,19 @@
     <releaseNotes>$releaseNotes$</releaseNotes>
     <tags>Unity MixedReality</tags>
   </metadata>
+  <files>
+    <file src="**" exclude="*.nuspec;*.nuspec.meta;*.props;*.props.meta;*.targets;*.targets.meta" target="MRTK\" />
+
+    <file src="MixedReality.Toolkit.targets" target="build\Microsoft.MixedReality.Toolkit.targets" />
+
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Core.Build.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Core.Definitions.Utilities.Editor.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Core.Extensions.EditorClassExtensions.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Core.Inspectors.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Core.Utilities.Async.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Core.Utilities.Editor.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Utilities.Gltf.dll*" target="Plugins\" />
+    <file src="..\..\Plugins\**\Microsoft.MixedReality.Toolkit.Utilities.Gltf.Importers.dll*" target="Plugins\" />
+  </files>
 </package>

Assets/MixedRealityToolkit/MixedReality.Toolkit.targets

@@ -0,0 +1,45 @@
+<Project>
+
+  <PropertyGroup>
+    <!-- If $(UnityPlayer) is not set, default to Standalone. -->
+    <MRTKUnityPlayer Condition=" '$(MRTKUnityPlayer)' == '' ">Standalone</MRTKUnityPlayer>
+
+    <!-- Player specific assemblies are in a directory name that starts with the player name and is suffixed with 'Player'. -->
+    <_MRTKPlayerDirectory>$(MRTKUnityPlayer)Player</_MRTKPlayerDirectory>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Include content, but only if explicitly requested. This is useful if an MSBuild project references this
+         nuget package, and the output of the MSBuild project is copied into a Unity project. -->
+    <Content Include="$(MSBuildThisFileDirectory)..\MRTK\**" Condition=" '$(MRTKIncludeContent)' == 'true' ">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <!-- Don't show .meta files in Solution Explorer - it's not useful. -->
+      <Visible Condition=" '%(Extension)' == '.meta' ">false</Visible>
+      <Link>MRTK\%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Content>
+
+    <!-- Get all the dlls for the target player, and store the Identity in a custom OriginalPath metadata.
+         If Identity is used directly as the HintPath in the Reference, Visual Studio generates a warning
+         indicating the assemblies are not found, even though the build succeeds. -->
+    <_MRTKPlayerAssemblies Include="$(MSBuildThisFileDirectory)..\Plugins\$(_MRTKPlayerDirectory)\*.dll">
+      <OriginalPath>%(Identity)</OriginalPath>
+    </_MRTKPlayerAssemblies>
+
+    <!-- Add a Reference to each assembly, where the FileName is assumed to be the assembly name (true by default),
+         and the HintPath is just the full path to the assembly.  -->
+    <Reference Include="@(_MRTKPlayerAssemblies -> '%(FileName)')">
+      <HintPath>%(OriginalPath)</HintPath>
+    </Reference>
+
+    <!-- Include assembly meta files, but only if explicitly requested. This is useful if an MSBuild project references this
+         nuget package, and the output of the MSBuild project is copied into a Unity project. -->
+    <Content Include="@(_MRTKPlayerAssemblies -> '%(OriginalPath).meta')" Condition=" '$(MRTKIncludeAssemblyMetaFiles)' == 'true' ">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>false</Visible>
+    </Content>
+
+    <!-- Clear the _MRTKPlayerAssemblies item list since it will be reused for each MRTK nuget package. -->
+    <_MRTKPlayerAssemblies Remove="@(_MRTKPlayerAssemblies)" />
+  </ItemGroup>
+
+</Project>