Update microsoft and apple (#3768)

* microsoft: reorder

no functional changes

* unitychina: add unity3dcloud.cn

* azure: add more domains

* microsoft: cleanup cn attrs

remove non-cn domains

* microsoft: add more domains from felixonmars/dnsmasq-china-list

* apple: sync with felixonmars/dnsmasq-china-list

data/apple

@@ -860,7 +860,7 @@ full:s4.mzstatic.com @cn
 full:s5.mzstatic.com @cn
 
 # The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
-# Revision: 888c12fd0708f2fafc562b0652429a25eef5b6ba
+# Revision: c3c9839e5e71f04fc170b5645d7a162631985e2d
 # Duplicates removed
 # According to the consensus in #503, do not include the domain name apps.apple.com directly.
 # Use in config file like this: "geosite:apple@cn"
@@ -932,6 +932,7 @@ full:is-ssl.mzstatic.com-cn-lb.itunes-apple.com.akadns.net @cn
 full:itunes-apple.com.akadns.net @cn
 full:itunes.apple.com @cn
 full:itunesconnect.apple.com @cn
+full:mensura.cdn-apple.com @cn
 full:mesu-cdn.apple.com.akadns.net @cn
 full:mesu-china.apple.com.akadns.net @cn
 full:mesu.apple.com @cn

data/azure

@@ -1,6 +1,9 @@
 # All .azure domains
 azure
 
+# Note: some 21Vianet (世纪互联) domains are taken from:
+# https://learn.microsoft.com/en-us/microsoft-365/enterprise/urls-and-ip-address-ranges-21vianet?view=o365-worldwide
+
 21vbc.com @cn
 21vbluecloud.com @cn
 21vbluecloud.net @cn
@@ -23,6 +26,7 @@ azure-devices-int.net
 azure-devices-provisioning.cn @cn
 azure-devices.cn @cn
 azure-devices.net
+azure-mobile.cn @cn
 azure-mobile.net
 azure-sphere.com
 azure-test.net
@@ -100,11 +104,14 @@ msn.net
 playfab.com
 playfabapi.com
 serverlesslibrary.net
+sovcloud-mx.cn @cn
+sovcloud-static.cn @cn
+sovcloud-usercontent.cn @cn
+sovcloud.cn @cn
 trafficmanager.cn @cn
 trafficmanager.net
 trustcenter.cn @cn
 tryfunctions.com
-unity3dcloud.cn @cn
 windowsazure.cn @cn
 windowsazure.com
 windowsazurestatus.cn @cn

data/microsoft

@@ -90,7 +90,6 @@ cortanaskills.com
 crmdynint-gcc.com
 crmdynint.com
 crossborderexpansion.com
-dcg.microsoft.com @cn
 docs.com
 dynamics.cn @cn
 dynamics.com
@@ -301,9 +300,16 @@ winhec.com
 winhec.net
 yammer.com
 
-# Skype CDN
+# CDN
 skype-edf.akadns.net
 skypedata.akadns.net
+full:img-prod-cms-rt-microsoft-com.akamaized.net
+full:img-s-msn-com.akamaized.net
+full:mwf-service.akamaized.net
+full:officecdn-microsoft-com.akamaized.net
+full:statics-marketingsites-eas-ms-com.akamaized.net
+full:statics-marketingsites-eus-ms-com.akamaized.net
+full:statics-marketingsites-wcus-ms-com.akamaized.net
 
 # Ads/tracking
 clarity.ms @ads
@@ -313,43 +319,58 @@ nelreports.net @ads
 
 # Domains and services below are available in China mainland
 # Use in config file like this: "geosite:microsoft@cn"
+dcg.microsoft.com @cn #2105
 dl.delivery.mp.microsoft.com @cn
 download.windowsupdate.com @cn
+# The rules below are from https://github.com/felixonmars/dnsmasq-china-list/blob/master/accelerated-domains.china.conf
+# sed -n -e '/\.microsoft\.com/p' -e '/\.office\.net/p' -e '/\.windowssearch\.com/p' -e '/\.windowsupdate\.com/p' ./accelerated-domains.china.conf
+# Revision: 8041ef38432a4ae92a769fbb280165b9d76d5ab0
+full:azuremigrate.download.prss.microsoft.com @cn
+full:azuremigratetest.download.prss.microsoft.com @cn
+full:azurestackhub.download.prss.microsoft.com @cn
+full:azurestackhubuat.download.prss.microsoft.com @cn
 full:b.c2r.ts.cdn.office.net @cn
-full:bg.v4.a.dl.ws.microsoft.com @cn
+full:cbdstest.download.prss.microsoft.com @cn
-full:bg4.v4.a.dl.ws.microsoft.com @cn
-full:build.microsoft.com @cn
-full:cdn.marketplaceimages.windowsphone.com @cn
 full:cn.windowssearch.com @cn
+full:collaborate.download.prss.microsoft.com @cn
+full:collaborateppe.download.prss.microsoft.com @cn
 full:ctldl.windowsupdate.com @cn
-full:devblogs.microsoft.com @cn
 full:developer.microsoft.com @cn
-full:docs.microsoft.com @cn
 full:download.microsoft.com @cn
 full:download.visualstudio.microsoft.com @cn
+full:dreamspark.download.prss.microsoft.com @cn
+full:dreamsparkuat.download.prss.microsoft.com @cn
 full:f.c2r.ts.cdn.office.net @cn
-full:fs.microsoft.com @cn
+full:itacademy.download.prss.microsoft.com @cn
-full:learn.microsoft.com @cn
+full:itacademyuat.download.prss.microsoft.com @cn
+full:lex.download.prss.microsoft.com @cn
+full:lexuat.download.prss.microsoft.com @cn
+full:mbs.download.prss.microsoft.com @cn
+full:mpnbenefits.download.prss.microsoft.com @cn
+full:mpnbenefitsrtl.download.prss.microsoft.com @cn
+full:mpnbenefitsrtluat.download.prss.microsoft.com @cn
+full:msdn.download.prss.microsoft.com @cn
+full:msdprod-ad.download.prss.microsoft.com @cn
+full:msproduct.download.prss.microsoft.com @cn
 full:myvs.download.prss.microsoft.com @cn
 full:oemsoc.download.prss.microsoft.com @cn
+full:oemsocuat.download.prss.microsoft.com @cn
 full:officecdn.microsoft.com @cn
-full:res-1.cdn.office.net @cn
+full:officemkt.download.prss.microsoft.com @cn
-full:res.cdn.office.net @cn
+full:officemktuat.download.prss.microsoft.com @cn
+full:osrelease.download.prss.microsoft.com @cn
+full:rsm.download.prss.microsoft.com @cn
 full:sdx.microsoft.com @cn
 full:shell.cdn.office.net @cn
 full:software.download.prss.microsoft.com @cn
 full:statics.teams.cdn.office.net @cn
+full:storecorefulfillment.download.prss.microsoft.com @cn
+full:storeedge.microsoft.com @cn
 full:storeedgefd.dsx.mp.microsoft.com @cn
+full:surface.download.prss.microsoft.com @cn
 full:surface.downloads.prss.microsoft.com @cn
+full:vlportal.download.prss.microsoft.com @cn
+full:volic.download.prss.microsoft.com @cn
 full:vscode.download.prss.microsoft.com @cn
 full:vz.download.prss.microsoft.com @cn
-full:wscont1.apps.microsoft.com @cn
+full:windbg.download.prss.microsoft.com @cn
-full:wscont2.apps.microsoft.com @cn
-
-full:img-prod-cms-rt-microsoft-com.akamaized.net
-full:img-s-msn-com.akamaized.net
-full:mwf-service.akamaized.net
-full:officecdn-microsoft-com.akamaized.net
-full:statics-marketingsites-eas-ms-com.akamaized.net
-full:statics-marketingsites-eus-ms-com.akamaized.net
-full:statics-marketingsites-wcus-ms-com.akamaized.net

data/microsoft-pki

@@ -4,4 +4,4 @@ full:crl.microsoft.com
 full:mscrl.microsoft.com
 full:ocsp.microsoft.com
 full:oneocsp.microsoft.com
-full:www.microsoft.com @cn
+full:www.microsoft.com

data/unitychina

@@ -3,6 +3,9 @@ u3d.cn
 unity.cn
 unitychina.cn
 
+# 上海蓝云网络科技有限公司 (世纪互联)
+unity3dcloud.cn
+
 # Ads/tracking
 ads.unitychina.cn @ads
 splash-ads.cdn.unity.cn @ads