Move subsystem impls back to core (#11651)

Per discussions with Adam and Kurtis, we're moving the subsystem implementations back to the core package
microsoft · Jun 26, 2023 · 81698f0 · 81698f0
1 parent fea8085
commit 81698f0
Show file tree

Hide file tree

Showing 18 changed files with 0 additions and 11 deletions.
diff --git a/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json b/UnityProjects/MRTKDevTemplate/Packages/packages-lock.json
@@ -188,7 +188,6 @@
       "source": "local",
       "dependencies": {
         "com.microsoft.mrtk.core": "3.0.0",
-        "com.microsoft.mrtk.input": "3.0.0",
         "com.microsoft.mrtk.tts.windows": "1.0.1"
       }
     },

diff --git a/...systems/Hands/HandsAggregatorSubsystem.cs → ...systems/Hands/HandsAggregatorSubsystem.cs b/...systems/Hands/HandsAggregatorSubsystem.cs → ...systems/Hands/HandsAggregatorSubsystem.cs
diff --git a/...ms/Hands/HandsAggregatorSubsystem.cs.meta → ...ms/Hands/HandsAggregatorSubsystem.cs.meta b/...ms/Hands/HandsAggregatorSubsystem.cs.meta → ...ms/Hands/HandsAggregatorSubsystem.cs.meta
diff --git a/....input/Subsystems/Hands/HandsSubsystem.cs → ...k.core/Subsystems/Hands/HandsSubsystem.cs b/....input/Subsystems/Hands/HandsSubsystem.cs → ...k.core/Subsystems/Hands/HandsSubsystem.cs
diff --git a/...t/Subsystems/Hands/HandsSubsystem.cs.meta → ...e/Subsystems/Hands/HandsSubsystem.cs.meta b/...t/Subsystems/Hands/HandsSubsystem.cs.meta → ...e/Subsystems/Hands/HandsSubsystem.cs.meta
diff --git a/...systems/Hands/HandsSubsystemDescriptor.cs → ...systems/Hands/HandsSubsystemDescriptor.cs b/...systems/Hands/HandsSubsystemDescriptor.cs → ...systems/Hands/HandsSubsystemDescriptor.cs
diff --git a/...ms/Hands/HandsSubsystemDescriptor.cs.meta → ...ms/Hands/HandsSubsystemDescriptor.cs.meta b/...ms/Hands/HandsSubsystemDescriptor.cs.meta → ...ms/Hands/HandsSubsystemDescriptor.cs.meta
diff --git a/...t/Subsystems/Speech/DictationSubsystem.cs → ...e/Subsystems/Speech/DictationSubsystem.cs b/...t/Subsystems/Speech/DictationSubsystem.cs → ...e/Subsystems/Speech/DictationSubsystem.cs
diff --git a/...systems/Speech/DictationSubsystem.cs.meta → ...systems/Speech/DictationSubsystem.cs.meta b/...systems/Speech/DictationSubsystem.cs.meta → ...systems/Speech/DictationSubsystem.cs.meta
diff --git a/...ms/Speech/DictationSubsystemDescriptor.cs → ...ms/Speech/DictationSubsystemDescriptor.cs b/...ms/Speech/DictationSubsystemDescriptor.cs → ...ms/Speech/DictationSubsystemDescriptor.cs
diff --git a/...eech/DictationSubsystemDescriptor.cs.meta → ...eech/DictationSubsystemDescriptor.cs.meta b/...eech/DictationSubsystemDescriptor.cs.meta → ...eech/DictationSubsystemDescriptor.cs.meta
diff --git a/...ems/Speech/KeywordRecognitionSubsystem.cs → ...ems/Speech/KeywordRecognitionSubsystem.cs b/...ems/Speech/KeywordRecognitionSubsystem.cs → ...ems/Speech/KeywordRecognitionSubsystem.cs
diff --git a/...peech/KeywordRecognitionSubsystem.cs.meta → ...peech/KeywordRecognitionSubsystem.cs.meta b/...peech/KeywordRecognitionSubsystem.cs.meta → ...peech/KeywordRecognitionSubsystem.cs.meta
diff --git a/.../KeywordRecognitionSubsystemDescriptor.cs → .../KeywordRecognitionSubsystemDescriptor.cs b/.../KeywordRecognitionSubsystemDescriptor.cs → .../KeywordRecognitionSubsystemDescriptor.cs
diff --git a/...ordRecognitionSubsystemDescriptor.cs.meta → ...ordRecognitionSubsystemDescriptor.cs.meta b/...ordRecognitionSubsystemDescriptor.cs.meta → ...ordRecognitionSubsystemDescriptor.cs.meta
diff --git a/com.microsoft.mrtk.input/Subsystems/Speech.meta b/com.microsoft.mrtk.input/Subsystems/Speech.meta
diff --git a/com.microsoft.mrtk.windowsspeech/MRTK.Speech.Windows.asmdef b/com.microsoft.mrtk.windowsspeech/MRTK.Speech.Windows.asmdef
@@ -3,7 +3,6 @@
     "rootNamespace": "Microsoft.MixedReality.Toolkit.Speech.Windows",
     "references": [
         "Microsoft.MixedReality.Toolkit.Core",
-        "Microsoft.MixedReality.Toolkit.Input",
         "Microsoft.MixedReality.OpenXR",
         "Microsoft.MixedReality.Toolkit.TextToSpeech.Windows"
     ],

diff --git a/com.microsoft.mrtk.windowsspeech/package.json b/com.microsoft.mrtk.windowsspeech/package.json
@@ -16,7 +16,6 @@
   "unity": "2021.3",
   "dependencies": {
     "com.microsoft.mrtk.core": "3.0.0",
-    "com.microsoft.mrtk.input": "3.0.0",
     "com.microsoft.mrtk.tts.windows": "1.0.1"
   }
 }