diff --git a/change/react-native-windows-4ed5a244-28e4-46c9-bfb6-e5949f7c3af2.json b/change/react-native-windows-4ed5a244-28e4-46c9-bfb6-e5949f7c3af2.json new file mode 100644 index 00000000000..5f1a4d5c6e2 --- /dev/null +++ b/change/react-native-windows-4ed5a244-28e4-46c9-bfb6-e5949f7c3af2.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Deprecated Web Debugging", + "packageName": "react-native-windows", + "email": "30809111+acoates-ms@users.noreply.github.com", + "dependentChangeType": "patch" +} diff --git a/packages/e2e-test-app/windows/RNTesterApp/App.xaml.cs b/packages/e2e-test-app/windows/RNTesterApp/App.xaml.cs index 227982cff67..4feec9b1554 100644 --- a/packages/e2e-test-app/windows/RNTesterApp/App.xaml.cs +++ b/packages/e2e-test-app/windows/RNTesterApp/App.xaml.cs @@ -29,16 +29,15 @@ public App() { #if BUNDLE JavaScriptBundleFile = "index.windows"; - InstanceSettings.UseWebDebugger = false; InstanceSettings.UseDirectDebugger = false; InstanceSettings.UseFastRefresh = false; #else JavaScriptBundleFile = "app/index"; - InstanceSettings.UseWebDebugger = false; InstanceSettings.UseDirectDebugger = true; InstanceSettings.UseFastRefresh = true; #endif + InstanceSettings.UseDirectDebugger = true; #if DEBUG InstanceSettings.UseDeveloperSupport = true; #else diff --git a/packages/sample-apps/windows/SampleAppCS/App.xaml.cs b/packages/sample-apps/windows/SampleAppCS/App.xaml.cs index 1de2de9c7dd..a8d137b9af3 100644 --- a/packages/sample-apps/windows/SampleAppCS/App.xaml.cs +++ b/packages/sample-apps/windows/SampleAppCS/App.xaml.cs @@ -25,14 +25,14 @@ public App() #if BUNDLE JavaScriptBundleFile = "index.windows"; - InstanceSettings.UseWebDebugger = false; InstanceSettings.UseFastRefresh = false; #else JavaScriptBundleFile = "index"; - InstanceSettings.UseWebDebugger = true; InstanceSettings.UseFastRefresh = true; #endif + InstanceSettings.UseDirectDebugger = true; + #if DEBUG InstanceSettings.UseDeveloperSupport = true; #else diff --git a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/TestReactNativeHostHolder.cs b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/TestReactNativeHostHolder.cs index 9dce49ac373..e8f047dd96d 100644 --- a/vnext/Microsoft.ReactNative.Managed.IntegrationTests/TestReactNativeHostHolder.cs +++ b/vnext/Microsoft.ReactNative.Managed.IntegrationTests/TestReactNativeHostHolder.cs @@ -36,7 +36,9 @@ public TestReactNativeHostHolder(string jsBundle, Action hostIn Host.InstanceSettings.BundleRootPath = Path.GetFullPath(testBinaryPath + "\\..\\JSBundles"); Host.InstanceSettings.JavaScriptBundleFile = jsBundle; Host.InstanceSettings.UseDeveloperSupport = false; +#pragma warning disable 612, 618 // Deprecated Host.InstanceSettings.UseWebDebugger = false; +#pragma warning restore 612, 618 Host.InstanceSettings.UseFastRefresh = false; Host.InstanceSettings.UseDeveloperSupport = false; diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs b/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs index b324c203636..abb92b26ccf 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/ReactModuleBuilderMock.cs @@ -311,7 +311,9 @@ class ReactSettingsSnapshot : IReactSettingsSnapshot public bool UseFastRefresh => throw new NotImplementedException(); +#pragma warning disable 612, 618 // Deprecated public bool UseWebDebugger => throw new NotImplementedException(); +#pragma warning restore 612, 618 public string BundleRootPath => throw new NotImplementedException(); diff --git a/vnext/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs b/vnext/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs index 2fdbe7a3ee6..ed910ad33b1 100644 --- a/vnext/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs +++ b/vnext/Microsoft.ReactNative.Managed/ReactSettingsSnapshot.cs @@ -30,7 +30,9 @@ public struct ReactSettingsSnapshot public bool UseFastRefresh => IsValid ? Handle.UseFastRefresh : false; + #pragma warning disable 612, 618 // Deprecated public bool UseWebDebugger => IsValid ? Handle.UseWebDebugger : false; + #pragma warning restore 612, 618 public bool RequestDevBundle => IsValid ? Handle.RequestDevBundle : true; diff --git a/vnext/Microsoft.ReactNative/DevMenuControl.idl b/vnext/Microsoft.ReactNative/DevMenuControl.idl index 7e3ddc43ce9..60f9412aab3 100644 --- a/vnext/Microsoft.ReactNative/DevMenuControl.idl +++ b/vnext/Microsoft.ReactNative/DevMenuControl.idl @@ -14,11 +14,8 @@ namespace Microsoft.ReactNative XAML_NAMESPACE.Controls.Button BreakOnNextLine { get; }; XAML_NAMESPACE.Controls.Button DirectDebug { get; }; - XAML_NAMESPACE.Controls.Button RemoteDebug { get; }; XAML_NAMESPACE.Controls.Button Reload { get; }; - XAML_NAMESPACE.Controls.TextBlock RemoteDebugText { get; }; - XAML_NAMESPACE.Controls.TextBlock RemoteDebugDesc { get; }; XAML_NAMESPACE.Controls.TextBlock FastRefreshText { get; }; XAML_NAMESPACE.Controls.TextBlock DirectDebugText { get; }; XAML_NAMESPACE.Controls.TextBlock DirectDebugDesc { get; }; diff --git a/vnext/Microsoft.ReactNative/DevMenuControl.xaml b/vnext/Microsoft.ReactNative/DevMenuControl.xaml index 873b66aaa17..3757326f95d 100644 --- a/vnext/Microsoft.ReactNative/DevMenuControl.xaml +++ b/vnext/Microsoft.ReactNative/DevMenuControl.xaml @@ -50,21 +50,6 @@ Restarts the JS instance. Any javascript state will be lost. -