Skip to content

Commit 1a50383

Browse files
author
David Kline
authored
Merge branch 'releases/2.2.0' into update_remoting_doc
2 parents b021566 + 9f2eb8f commit 1a50383

File tree

7 files changed

+23
-13
lines changed

7 files changed

+23
-13
lines changed

‎Assets/MixedReality.Toolkit.Foundation.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
99
<projectUrl>https://aka.ms/MRTK</projectUrl>
10-
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTKLogo_64x64.png</iconUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<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>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
99
<projectUrl>https://aka.ms/MRTK</projectUrl>
10-
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTKLogo_64x64.png</iconUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<description>Examples of the Mixed Reality Toolkit</description>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
99
<projectUrl>https://aka.ms/MRTK</projectUrl>
10-
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTKLogo_64x64.png</iconUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<description>Extension services and components for the Mixed Reality Toolkit</description>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
99
<projectUrl>https://aka.ms/MRTK</projectUrl>
10-
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTKLogo_64x64.png</iconUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<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>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
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>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
99
<projectUrl>https://aka.ms/MRTK</projectUrl>
10-
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTKLogo_64x64.png</iconUrl>
10+
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTK_Logo_NuGet.png</iconUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<description>Tests for the Mixed Reality Toolkit.</description>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

‎Assets/MixedRealityToolkit.Tools/MSBuild/MSBuildMRTKTemplates/WSA.Player.Template.props.template

+11-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AssemblySearchPaths>$(AssemblySearchPaths);<!--PLATFORM_COMMON_ASSEMBLY_SEARCH_PATHS_TOKEN-->;C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETCore\v4.5;$(UnityEditorInstallFolder)Data\PlaybackEngines\MetroSupport\Managed\UAP\</AssemblySearchPaths>
44
<TargetFramework>uap10.0</TargetFramework>
55
<DefaultLanguage>en-US</DefaultLanguage>
6-
<DefineConstants>$(DefineConstants);<!--PLATFORM_COMMON_DEFINE_CONSTANTS-->;NETFX_CORE;WINDOWS_UWP</DefineConstants>
6+
<DefineConstants>$(DefineConstants);<!--PLATFORM_COMMON_DEFINE_CONSTANTS-->;NETFX_CORE;WINDOWS_UWP;DOTNETWINRT_PRESENT</DefineConstants>
77
<NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
88
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
99
<TargetPlatformVersion><!--UWP_TARGET_PLATFORM_VERSION_TOKEN--></TargetPlatformVersion>
@@ -49,4 +49,14 @@
4949
</Reference>
5050
<!--PLATFORM_COMMON_REFERENCE_TEMPLATE_END-->
5151
</ItemGroup>
52+
53+
<PropertyGroup>
54+
<DotNetWinRTVersion>0.5.1037</DotNetWinRTVersion>
55+
</PropertyGroup>
56+
<ItemGroup>
57+
<PackageReference Include="Microsoft.Windows.MixedReality.DotNetWinRT" Version="$(DotNetWinRTVersion)" ExcludeAssets="Compile" />
58+
<Reference Include="Microsoft.Windows.MixedReality.DotNetWinRT">
59+
<HintPath>$(NuGetPackageRoot)\microsoft.windows.mixedreality.dotnetwinrt\$(DotNetWinRTVersion)\lib\uap10.0.18362\Microsoft.Windows.MixedReality.DotNetWinRT.dll</HintPath>
60+
</Reference>
61+
</ItemGroup>
5262
</Project>

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
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>
8+
<licenseUrl>https://github.com/Microsoft/MixedRealityToolkit-Unity/blob/releases/2.2.0/License.txt</licenseUrl>
99
<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>
11-
<iconUrl>https://microsoft.github.io/MixedRealityToolkit-Unity/Documentation/Images/MRTKLogo_64x64.png</iconUrl>
1212
<description>Editor and utility tooling of the Mixed Reality Toolkit</description>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1414
<releaseNotes>$releaseNotes$</releaseNotes>

0 commit comments

Comments
 (0)