From ea86d3fafc2aab700f609f2b886bee1da26b775b Mon Sep 17 00:00:00 2001 From: "David Kline (ANALOG)" Date: Fri, 1 Feb 2019 16:43:32 -0800 Subject: [PATCH 1/2] update to unity 2018.3.4 --- ProjectSettings/ProjectVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index acd2ceba1e4..1816da4aa51 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.3.3f1 +m_EditorVersion: 2018.3.4f1 From 5763e43bdb8bae453885b9724b665fd0d63a7213 Mon Sep 17 00:00:00 2001 From: "David Kline (ANALOG)" Date: Fri, 1 Feb 2019 16:53:22 -0800 Subject: [PATCH 2/2] update version, license file year --- .../MixedRealityToolkit.Examples/License.txt | 2 +- Assets/MixedRealityToolkit.Examples/README.md | 3 --- .../MixedRealityToolkit.Examples/Version.txt | 2 +- .../Version.txt.meta | 2 +- .../MixedRealityToolkit.Providers/License.txt | 21 +++++++++++++++++++ .../License.txt.meta} | 2 +- .../MixedRealityToolkit.Providers/Version.txt | 1 + .../Version.txt.meta} | 2 +- Assets/MixedRealityToolkit.SDK/License.txt | 2 +- Assets/MixedRealityToolkit.SDK/README.md | 3 --- Assets/MixedRealityToolkit.SDK/Version.txt | 2 +- .../MixedRealityToolkit.SDK/Version.txt.meta | 2 +- .../MixedRealityToolkit.Services/License.txt | 21 +++++++++++++++++++ .../License.txt.meta | 7 +++++++ .../MixedRealityToolkit.Services/Version.txt | 1 + .../Version.txt.meta | 7 +++++++ Assets/MixedRealityToolkit.Tests/License.txt | 2 +- Assets/MixedRealityToolkit.Tests/Version.txt | 2 +- .../Version.txt.meta | 2 +- Assets/MixedRealityToolkit/License.txt | 2 +- Assets/MixedRealityToolkit/Version.txt | 2 +- ProjectSettings/ProjectSettings.asset | 13 +++++++++--- 22 files changed, 81 insertions(+), 22 deletions(-) delete mode 100644 Assets/MixedRealityToolkit.Examples/README.md create mode 100644 Assets/MixedRealityToolkit.Providers/License.txt rename Assets/{MixedRealityToolkit.Examples/README.md.meta => MixedRealityToolkit.Providers/License.txt.meta} (75%) create mode 100644 Assets/MixedRealityToolkit.Providers/Version.txt rename Assets/{MixedRealityToolkit.SDK/README.md.meta => MixedRealityToolkit.Providers/Version.txt.meta} (75%) delete mode 100644 Assets/MixedRealityToolkit.SDK/README.md create mode 100644 Assets/MixedRealityToolkit.Services/License.txt create mode 100644 Assets/MixedRealityToolkit.Services/License.txt.meta create mode 100644 Assets/MixedRealityToolkit.Services/Version.txt create mode 100644 Assets/MixedRealityToolkit.Services/Version.txt.meta diff --git a/Assets/MixedRealityToolkit.Examples/License.txt b/Assets/MixedRealityToolkit.Examples/License.txt index 58a527c35e3..f1fb456db8a 100644 --- a/Assets/MixedRealityToolkit.Examples/License.txt +++ b/Assets/MixedRealityToolkit.Examples/License.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Microsoft Corporation +Copyright (c) 2019 Microsoft Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Assets/MixedRealityToolkit.Examples/README.md b/Assets/MixedRealityToolkit.Examples/README.md deleted file mode 100644 index 0b200c09ecc..00000000000 --- a/Assets/MixedRealityToolkit.Examples/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Mixed Reality Toolkit - Examples - -This folder contains all the individual assets used to build MRTK solutions with either the SDK not native MRTK. \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.Examples/Version.txt b/Assets/MixedRealityToolkit.Examples/Version.txt index 35a1d8998a8..b63b17e8d36 100644 --- a/Assets/MixedRealityToolkit.Examples/Version.txt +++ b/Assets/MixedRealityToolkit.Examples/Version.txt @@ -1 +1 @@ -Mixed Reality Toolkit 2018.9.0 (BETA) \ No newline at end of file +Mixed Reality Toolkit 2.0.0-Beta2 \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.Examples/Version.txt.meta b/Assets/MixedRealityToolkit.Examples/Version.txt.meta index 1989e534046..97ee35b4968 100644 --- a/Assets/MixedRealityToolkit.Examples/Version.txt.meta +++ b/Assets/MixedRealityToolkit.Examples/Version.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 481ba183d40e427c8d17dc06015feb1a +guid: 1f70987e4644a4441a5ac0f549c4a8dc TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/MixedRealityToolkit.Providers/License.txt b/Assets/MixedRealityToolkit.Providers/License.txt new file mode 100644 index 00000000000..f1fb456db8a --- /dev/null +++ b/Assets/MixedRealityToolkit.Providers/License.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.Examples/README.md.meta b/Assets/MixedRealityToolkit.Providers/License.txt.meta similarity index 75% rename from Assets/MixedRealityToolkit.Examples/README.md.meta rename to Assets/MixedRealityToolkit.Providers/License.txt.meta index 89b5f53db3c..988d8f88f13 100644 --- a/Assets/MixedRealityToolkit.Examples/README.md.meta +++ b/Assets/MixedRealityToolkit.Providers/License.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fef36f257adb40cf9e2683422c11157d +guid: a9fa54d72d9366b49b60047eb59fe03f TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/MixedRealityToolkit.Providers/Version.txt b/Assets/MixedRealityToolkit.Providers/Version.txt new file mode 100644 index 00000000000..b63b17e8d36 --- /dev/null +++ b/Assets/MixedRealityToolkit.Providers/Version.txt @@ -0,0 +1 @@ +Mixed Reality Toolkit 2.0.0-Beta2 \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.SDK/README.md.meta b/Assets/MixedRealityToolkit.Providers/Version.txt.meta similarity index 75% rename from Assets/MixedRealityToolkit.SDK/README.md.meta rename to Assets/MixedRealityToolkit.Providers/Version.txt.meta index db4a2ecc796..7d29de0ba0f 100644 --- a/Assets/MixedRealityToolkit.SDK/README.md.meta +++ b/Assets/MixedRealityToolkit.Providers/Version.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d082e90c98c6a304a93e5ed522a479ed +guid: e69f45021b11efb40b9c0c0e359a94f2 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/MixedRealityToolkit.SDK/License.txt b/Assets/MixedRealityToolkit.SDK/License.txt index 58a527c35e3..f1fb456db8a 100644 --- a/Assets/MixedRealityToolkit.SDK/License.txt +++ b/Assets/MixedRealityToolkit.SDK/License.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Microsoft Corporation +Copyright (c) 2019 Microsoft Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Assets/MixedRealityToolkit.SDK/README.md b/Assets/MixedRealityToolkit.SDK/README.md deleted file mode 100644 index 47ef03a5a42..00000000000 --- a/Assets/MixedRealityToolkit.SDK/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Mixed Reality Toolkit - SDK - -This folder contains all the individual assets used to build Mixed Reality solutions using pre-built solution components \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.SDK/Version.txt b/Assets/MixedRealityToolkit.SDK/Version.txt index 35a1d8998a8..b63b17e8d36 100644 --- a/Assets/MixedRealityToolkit.SDK/Version.txt +++ b/Assets/MixedRealityToolkit.SDK/Version.txt @@ -1 +1 @@ -Mixed Reality Toolkit 2018.9.0 (BETA) \ No newline at end of file +Mixed Reality Toolkit 2.0.0-Beta2 \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.SDK/Version.txt.meta b/Assets/MixedRealityToolkit.SDK/Version.txt.meta index 53ddd8b6275..72886f9c305 100644 --- a/Assets/MixedRealityToolkit.SDK/Version.txt.meta +++ b/Assets/MixedRealityToolkit.SDK/Version.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56bf9b0086704fc380f8f09ae74ac725 +guid: fd3f4f6d3bd4dfe4c87333a3c7cbc86d TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/MixedRealityToolkit.Services/License.txt b/Assets/MixedRealityToolkit.Services/License.txt new file mode 100644 index 00000000000..f1fb456db8a --- /dev/null +++ b/Assets/MixedRealityToolkit.Services/License.txt @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2019 Microsoft Corporation + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.Services/License.txt.meta b/Assets/MixedRealityToolkit.Services/License.txt.meta new file mode 100644 index 00000000000..148f75c81a8 --- /dev/null +++ b/Assets/MixedRealityToolkit.Services/License.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7e9a8646ef583234394b73e8005a8130 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MixedRealityToolkit.Services/Version.txt b/Assets/MixedRealityToolkit.Services/Version.txt new file mode 100644 index 00000000000..b63b17e8d36 --- /dev/null +++ b/Assets/MixedRealityToolkit.Services/Version.txt @@ -0,0 +1 @@ +Mixed Reality Toolkit 2.0.0-Beta2 \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.Services/Version.txt.meta b/Assets/MixedRealityToolkit.Services/Version.txt.meta new file mode 100644 index 00000000000..557d42f0036 --- /dev/null +++ b/Assets/MixedRealityToolkit.Services/Version.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d89f396564f84014b9ea077bb94283eb +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MixedRealityToolkit.Tests/License.txt b/Assets/MixedRealityToolkit.Tests/License.txt index 58a527c35e3..f1fb456db8a 100644 --- a/Assets/MixedRealityToolkit.Tests/License.txt +++ b/Assets/MixedRealityToolkit.Tests/License.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Microsoft Corporation +Copyright (c) 2019 Microsoft Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Assets/MixedRealityToolkit.Tests/Version.txt b/Assets/MixedRealityToolkit.Tests/Version.txt index 35a1d8998a8..b63b17e8d36 100644 --- a/Assets/MixedRealityToolkit.Tests/Version.txt +++ b/Assets/MixedRealityToolkit.Tests/Version.txt @@ -1 +1 @@ -Mixed Reality Toolkit 2018.9.0 (BETA) \ No newline at end of file +Mixed Reality Toolkit 2.0.0-Beta2 \ No newline at end of file diff --git a/Assets/MixedRealityToolkit.Tests/Version.txt.meta b/Assets/MixedRealityToolkit.Tests/Version.txt.meta index 36ba0b71050..f541b198f45 100644 --- a/Assets/MixedRealityToolkit.Tests/Version.txt.meta +++ b/Assets/MixedRealityToolkit.Tests/Version.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6769368fb3fb4d3a81eac43b47b7a4bf +guid: 7b683cc8780892546a9e9a9d22a9d53b TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/MixedRealityToolkit/License.txt b/Assets/MixedRealityToolkit/License.txt index 58a527c35e3..f1fb456db8a 100644 --- a/Assets/MixedRealityToolkit/License.txt +++ b/Assets/MixedRealityToolkit/License.txt @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2018 Microsoft Corporation +Copyright (c) 2019 Microsoft Corporation Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/Assets/MixedRealityToolkit/Version.txt b/Assets/MixedRealityToolkit/Version.txt index 35a1d8998a8..b63b17e8d36 100644 --- a/Assets/MixedRealityToolkit/Version.txt +++ b/Assets/MixedRealityToolkit/Version.txt @@ -1 +1 @@ -Mixed Reality Toolkit 2018.9.0 (BETA) \ No newline at end of file +Mixed Reality Toolkit 2.0.0-Beta2 \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 3faa336e5ad..c16078529ab 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -113,7 +113,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 2018.0.0.0 + bundleVersion: 2.0.0-Beta2 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -580,7 +580,7 @@ PlayerSettings: m_RenderingPath: 1 m_MobileRenderingPath: 1 metroPackageName: Microsoft.MixedReality.Toolkit - metroPackageVersion: 2018.9.0.0 + metroPackageVersion: 2.0.0.0 metroCertificatePath: Assets/WSATestCertificate.pfx metroCertificatePassword: metroCertificateSubject: Microsoft @@ -640,7 +640,14 @@ PlayerSettings: VideosLibrary: False VoipCall: False WebCam: False - metroTargetDeviceFamilies: {} + metroTargetDeviceFamilies: + Desktop: False + Holographic: False + IoT: False + IoTHeadless: False + Mobile: False + Team: False + Xbox: False metroFTAName: metroFTAFileTypes: [] metroProtocolName: