Merge remote-tracking branch 'upstream/mrtk_development_hl2' into apicontract

wiwei · wiwei · commit c85c971226d7 · 2019-04-01T14:40:39.000-07:00
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsDictationInputProvider.cs b/Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsDictationInputProvider.cs
@@ -13,8 +13,6 @@
 
 namespace Microsoft.MixedReality.Toolkit.Windows.Input
 {
-#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
-
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         SupportedPlatforms.WindowsStandalone | SupportedPlatforms.WindowsUniversal | SupportedPlatforms.WindowsEditor,
diff --git a/Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsSpeechInputProvider.cs b/Assets/MixedRealityToolkit.Providers/WindowsVoiceInput/WindowsSpeechInputProvider.cs
@@ -13,8 +13,6 @@
 
 namespace Microsoft.MixedReality.Toolkit.Windows.Input
 {
-#if UNITY_STANDALONE_WIN || UNITY_WSA || UNITY_EDITOR_WIN
-
     [MixedRealityDataProvider(
         typeof(IMixedRealityInputSystem),
         SupportedPlatforms.WindowsStandalone | SupportedPlatforms.WindowsUniversal | SupportedPlatforms.WindowsEditor,

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,6 @@`
`13`	`13`
`14`	`14`	`namespace Microsoft.MixedReality.Toolkit.Windows.Input`
`15`	`15`	`{`
`16`		`-#if UNITY_STANDALONE_WIN \|\| UNITY_WSA \|\| UNITY_EDITOR_WIN`
`17`		`-`
`18`	`16`	`[MixedRealityDataProvider(`
`19`	`17`	`typeof(IMixedRealityInputSystem),`
`20`	`18`	`SupportedPlatforms.WindowsStandalone \| SupportedPlatforms.WindowsUniversal \| SupportedPlatforms.WindowsEditor,`