Fix file naming

Mike Corsaro · mattleibow · commit 58ed3f9ffac7 · 2024-01-18T17:00:58.000Z
diff --git a/src/Essentials/src/Connectivity/Connectivity.Native.uwp.cs b/src/Essentials/src/Connectivity/Connectivity.Native.uwp.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 
-namespace Microsoft.Maui.Essentials.Connectivity
+namespace Microsoft.Maui.Networking
 {
 #if WINDOWS
 	internal class ConnectivityNativeHelper
diff --git a/src/Essentials/src/Connectivity/Connectivity.uwp.cs b/src/Essentials/src/Connectivity/Connectivity.uwp.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Net.NetworkInformation;
 using Windows.Networking.Connectivity;
-using static Microsoft.Maui.Essentials.Connectivity.ConnectivityNativeHelper;
 
 namespace Microsoft.Maui.Networking
 {
@@ -39,11 +38,11 @@ public NetworkAccess NetworkAccess
 				else
 				{
 					// Windows 10 workaround for 
-					var networkList = GetNetworkListManager();
-					var enumNetworks = networkList.GetNetworks(NLM_ENUM_NETWORK.NLM_ENUM_NETWORK_CONNECTED);
-					var connectivity = NLM_CONNECTIVITY.NLM_CONNECTIVITY_DISCONNECTED;
+					var networkList = ConnectivityNativeHelper.GetNetworkListManager();
+					var enumNetworks = networkList.GetNetworks(ConnectivityNativeHelper.NLM_ENUM_NETWORK.NLM_ENUM_NETWORK_CONNECTED);
+					var connectivity = ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_DISCONNECTED;
 
-					foreach (INetwork networkInterface in enumNetworks)
+					foreach (ConnectivityNativeHelper.INetwork networkInterface in enumNetworks)
 					{
 						if (networkInterface.IsConnected())
 						{
@@ -52,15 +51,15 @@ public NetworkAccess NetworkAccess
 						}
 					}
 
-					if ((connectivity & (NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_INTERNET | NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_INTERNET)) != 0)
+					if ((connectivity & (ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_INTERNET | ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_INTERNET)) != 0)
 					{
 						return NetworkAccess.Internet;
 					}
-					else if ((connectivity & (NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_LOCALNETWORK | NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_LOCALNETWORK)) != 0)
+					else if ((connectivity & (ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_LOCALNETWORK | ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_LOCALNETWORK)) != 0)
 					{
 						return NetworkAccess.Local;
 					}
-					else if ((connectivity & (NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_NOTRAFFIC | NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_NOTRAFFIC)) != 0)
+					else if ((connectivity & (ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_NOTRAFFIC | ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_NOTRAFFIC)) != 0)
 					{
 						return NetworkAccess.Local;
 					}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Collections.Generic;`
`4`	`4`	`using System.Runtime.InteropServices;`
`5`	`5`
`6`		`-namespace Microsoft.Maui.Essentials.Connectivity`
	`6`	`+namespace Microsoft.Maui.Networking`
`7`	`7`	`{`
`8`	`8`	`#if WINDOWS`
`9`	`9`	`internal class ConnectivityNativeHelper`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Net.NetworkInformation;`
`4`	`4`	`using Windows.Networking.Connectivity;`
`5`		`-using static Microsoft.Maui.Essentials.Connectivity.ConnectivityNativeHelper;`
`6`	`5`
`7`	`6`	`namespace Microsoft.Maui.Networking`
`8`	`7`	`{`
`@@ -39,11 +38,11 @@ public NetworkAccess NetworkAccess`
`39`	`38`	`else`
`40`	`39`	`{`
`41`	`40`	`// Windows 10 workaround for`
`42`		`- var networkList = GetNetworkListManager();`
`43`		`- var enumNetworks = networkList.GetNetworks(NLM_ENUM_NETWORK.NLM_ENUM_NETWORK_CONNECTED);`
`44`		`- var connectivity = NLM_CONNECTIVITY.NLM_CONNECTIVITY_DISCONNECTED;`
	`41`	`+ var networkList = ConnectivityNativeHelper.GetNetworkListManager();`
	`42`	`+ var enumNetworks = networkList.GetNetworks(ConnectivityNativeHelper.NLM_ENUM_NETWORK.NLM_ENUM_NETWORK_CONNECTED);`
	`43`	`+ var connectivity = ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_DISCONNECTED;`
`45`	`44`
`46`		`- foreach (INetwork networkInterface in enumNetworks)`
	`45`	`+ foreach (ConnectivityNativeHelper.INetwork networkInterface in enumNetworks)`
`47`	`46`	`{`
`48`	`47`	`if (networkInterface.IsConnected())`
`49`	`48`	`{`
`@@ -52,15 +51,15 @@ public NetworkAccess NetworkAccess`
`52`	`51`	`}`
`53`	`52`	`}`
`54`	`53`
`55`		`- if ((connectivity & (NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_INTERNET \| NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_INTERNET)) != 0)`
	`54`	`+ if ((connectivity & (ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_INTERNET \| ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_INTERNET)) != 0)`
`56`	`55`	`{`
`57`	`56`	`return NetworkAccess.Internet;`
`58`	`57`	`}`
`59`		`- else if ((connectivity & (NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_LOCALNETWORK \| NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_LOCALNETWORK)) != 0)`
	`58`	`+ else if ((connectivity & (ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_LOCALNETWORK \| ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_LOCALNETWORK)) != 0)`
`60`	`59`	`{`
`61`	`60`	`return NetworkAccess.Local;`
`62`	`61`	`}`
`63`		`- else if ((connectivity & (NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_NOTRAFFIC \| NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_NOTRAFFIC)) != 0)`
	`62`	`+ else if ((connectivity & (ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV4_NOTRAFFIC \| ConnectivityNativeHelper.NLM_CONNECTIVITY.NLM_CONNECTIVITY_IPV6_NOTRAFFIC)) != 0)`
`64`	`63`	`{`
`65`	`64`	`return NetworkAccess.Local;`
`66`	`65`	`}`