Merge pull request #7210 from keveleigh/update-plugin-folder

Update csproj and MSB4U dependency components

Author: keveleigh

.gitignore

@@ -94,10 +94,9 @@ doc/
 # ========================= #
 # MSBuildForUnity generated #
 # ========================= #
-Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/Plugins*
 MSBuildForUnity.Common.props
-.obj
 /*.msb4u.csproj.meta
 *.msb4u.csproj.meta
 /*.msb4u.sln.meta
 *.msb4u.sln.meta
+Dependencies*

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/.gitignore

@@ -0,0 +1,5 @@
+# ========================= #
+# MSBuildForUnity generated #
+# ========================= #
+.obj
+.bin

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/DotNetAdapter.csproj

@@ -1,4 +1,4 @@
-<Project ToolsVersion="15.0">
+<Project>
   <Import Project="$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(MSBuildForUnity.Common.props))')" />
 
   <PropertyGroup Condition="'$(UnityCurrentTargetFramework)' == ''">
@@ -10,24 +10,17 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- Make sure Unity ignores the contents of the intermediate output path. -->
-    <BaseIntermediateOutputPath>.obj</BaseIntermediateOutputPath>
-    <OutputPath>Plugins</OutputPath>
+    <!-- Make sure Unity ignores the contents of the output path. -->
+    <BaseIntermediateOutputPath>.obj\</BaseIntermediateOutputPath>
+    <OutputPath>.bin\</OutputPath>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="MSBuildForUnity" Version="0.8.*">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <!-- Note that this is the special "NoTarget" SDK to prevent this project from producing a dll. -->
-  <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
+  <Import Project="Sdk.props" Sdk="Microsoft.Build.NoTargets" Version="1.0.85" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT" Version="0.5.*" />
+    <PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT" Version="0.5.1037" />
   </ItemGroup>
 
-  <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.80" />
+  <Import Project="Sdk.targets" Sdk="Microsoft.Build.NoTargets" Version="1.0.85" />
 </Project>

Assets/MixedRealityToolkit.Providers/WindowsMixedReality/DotNetAdapter/NuGet.config

@@ -6,7 +6,7 @@
     "com.unity.xr.arfoundation": "1.5.0-preview.6",
     "com.unity.xr.arkit": "2.1.2",
     "com.unity.xr.openvr.standalone": "1.0.5",
-    "com.unity.xr.windowsmr.metro": "1.0.15",
+    "com.unity.xr.windowsmr.metro": "1.0.18",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
     "com.unity.modules.assetbundle": "1.0.0",