From d2a268ad6ca38fe1c3ca1b1f8437fd576a8240e9 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 26 Jan 2018 18:04:02 +0100 Subject: [PATCH 1/6] Rewrite disable_shitty_modern_app for better output --- cleanW10.ps1 | 58 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/cleanW10.ps1 b/cleanW10.ps1 index b430723..6bbdf82 100644 --- a/cleanW10.ps1 +++ b/cleanW10.ps1 @@ -54,7 +54,7 @@ function block_shitty_ip { Write-Host -Nonewline -ForegroundColor Red " Error " return } - } + } } function remove_shitty_tasks () { @@ -80,10 +80,10 @@ function remove_shitty_tasks () { } # Modify a reg value -# Params : +# Params : # path : the complete path to reg key # key : key name -# value : The value to write +# value : The value to write function modify_shitty_reg_value { param([string]$path, [string]$key, [string]$value, [string]$type) Write-Host -ForegroundColor white -NoNewline "Modify $key reg value to $value :" @@ -91,13 +91,13 @@ function modify_shitty_reg_value { Write-Host -ForegroundColor Gray -NoNewline " creating path " New-Item -Path $path -Force | Out-Null } - + try { - if ($type) { - Set-ItemProperty -Path $path -Name $key -Value $value -Type $type -Force + if ($type) { + Set-ItemProperty -Path $path -Name $key -Value $value -Type $type -Force } else { - Set-ItemProperty -Path $path -Name $key -Value $value -Type Dword -Force + Set-ItemProperty -Path $path -Name $key -Value $value -Type Dword -Force } } catch [System.Security.SecurityException]{ @@ -140,19 +140,35 @@ function disable_shitty_feature { # $name : Name of modern app function disable_shitty_modern_app { param([string]$name) - Write-Host -ForegroundColor white -NoNewline "Remove $name modern app" - try { - $pkgname = Get-AppxPackage -allusers -name *$name* - if (Get-AppxPackage $pkgname.Name) { - Remove-AppxPackage $pkgname - } - Get-AppxProvisionedPackage -Online | where-Object {$_.PackageName -like "*$name*"} | Remove-AppxProvisionedPackage -Online | Out-Null - } - catch { - Write-Host -ForegroundColor Red " Error " - return - } - Write-Host -ForegroundColor Green " Done " + Write-Host -ForegroundColor white -NoNewLine "Remove $name modern app" + $package = Get-AppxPackage -AllUsers -name *$name* + if ( $package ) { + Write-Host -ForegroundColor white -NoNewLine " installed :" + try { + $package | Remove-AppxPackage + } + catch { + Write-Host -ForegroundColor Red " Uninstall error" + return + } + Write-Host -ForegroundColor Green -NoNewLine " uninstalled" + } + else { Write-Host -ForegroundColor Yellow -NoNewLine " Not installed"} + + Write-Host -ForegroundColor white -NoNewLine " |" + $provisioned = Get-AppxProvisionedPackage -Online | where-Object {$_.PackageName -like "*$name*"} + if ( $provisioned ) { + Write-Host -ForegroundColor White -NoNewLine " Provisonned" + try { + $provisioned | Remove-AppxProvisionedPackage -Online | Out-Null + } + catch { + Write-Host -ForegroundColor red " Error" + return + } + Write-Host -ForegroundColor Green " Done" + } + else { Write-Host -ForegroundColor Yellow " Not provisionned"} } function disable_shitty_service ([string]$name){ @@ -234,7 +250,7 @@ modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" " modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCalendar" 2 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCallHistory" 2 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessCamera" 2 -modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessContacts" 2 + modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessContacts" 2 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessEmail" 2 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessLocation" 2 modify_shitty_reg_value "HKLM:\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" "LetAppsAccessMessaging" 2 From e627d836dfa73f04be0f4a1af0699aeb7135952d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 26 Jan 2018 18:07:27 +0100 Subject: [PATCH 2/6] Updated IP adress list --- lib/ip.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) mode change 100644 => 100755 lib/ip.txt diff --git a/lib/ip.txt b/lib/ip.txt old mode 100644 new mode 100755 index 23cf3d5..c534941 --- a/lib/ip.txt +++ b/lib/ip.txt @@ -1,11 +1,12 @@ 2.22.61.43 2.22.61.66 +64.4.54.254 65.39.117.230 +65.52.108.33 65.55.108.23 23.218.212.69 134.170.30.202 137.116.81.24 157.56.106.189 -204.79.197.200 -64.4.54.254 -65.52.108.33 \ No newline at end of file +184.86.53.99 +204.79.197.200 \ No newline at end of file From d3e59476baecfc560f6a73ae54370afde8fe5914 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 26 Jan 2018 18:08:15 +0100 Subject: [PATCH 3/6] Updated hosts list --- lib/hosts.txt | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) mode change 100644 => 100755 lib/hosts.txt diff --git a/lib/hosts.txt b/lib/hosts.txt old mode 100644 new mode 100755 index 5c0977d..2008428 --- a/lib/hosts.txt +++ b/lib/hosts.txt @@ -1,3 +1,4 @@ +184-86-53-99.deploy.static.akamaitechnologies.com a-0001.a-msedge.net a-0002.a-msedge.net a-0003.a-msedge.net @@ -12,6 +13,10 @@ a.ads1.msn.com a.ads2.msads.net a.ads2.msn.com a.rad.msn.com +a1621.g.akamai.net +a1856.g2.akamai.net +a1961.g.akamai.net +a978.i6g1.akamai.net ac3.msn.com ad.doubleclick.net adnexus.net @@ -39,9 +44,14 @@ compatexchange.cloudapp.net corp.sts.microsoft.com corpext.msitadfs.glbdns2.microsoft.com cs1.wpc.v0cdn.net +cy2.vortex.data.microsoft.com.akadns.net db3aqu.atdmt.com df.telemetry.microsoft.com diagnostics.support.microsoft.com +e2835.dspb.akamaiedge.net +e7341.g.akamaiedge.net +e7502.ce.akamaiedge.net +e8218.ce.akamaiedge.net ec.atdmt.com fe2.update.microsoft.com.akadns.net feedback.microsoft-hohm.com @@ -50,8 +60,12 @@ feedback.windows.com flex.msn.com g.msn.com h1.msn.com +h2.msn.com +hostedocsp.globalsign.com i1.services.social.microsoft.com i1.services.social.microsoft.com.nsatc.net +ipv6.msftncsi.com +ipv6.msftncsi.com.edgesuite.net lb1.www.ms.akadns.net live.rads.msn.com m.adnxs.com @@ -69,7 +83,7 @@ rad.live.com rad.msn.com redir.metaservices.microsoft.com reports.wes.df.telemetry.microsoft.com -s.gateway.messenger.live.com) +s.gateway.messenger.live.com s0.2mdn.net schemas.microsoft.akadns.net secure.adnxs.com @@ -109,4 +123,8 @@ watson.telemetry.microsoft.com watson.telemetry.microsoft.com.nsatc.net web.vortex.data.microsoft.com wes.df.telemetry.microsoft.com -www.msftncsi.com \ No newline at end of file +www.msftncsi.com +win10.ipv6.microsoft.com +www.bingads.microsoft.com +www.go.microsoft.akadns.net +www.msftncsi.com From 3e420855ec2a70ed26c98f8e4b12d799b7cfe76c Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 26 Jan 2018 18:09:51 +0100 Subject: [PATCH 4/6] Updated services list --- lib/services.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) mode change 100644 => 100755 lib/services.txt diff --git a/lib/services.txt b/lib/services.txt old mode 100644 new mode 100755 index 1b74915..3c418a4 --- a/lib/services.txt +++ b/lib/services.txt @@ -1,12 +1,18 @@ +diagnosticshub.standardcollector.service DiagTrack -dmwappushsvc +dmwappushservice HomeGroupListener HomeGroupProvider lfsvc MapsBroker +NetTcpPortSharing +RemoteAccess +RemoteRegistry +SharedAccess TrkWks WbioSrvc WMPNetworkSvc +wscsvc XblAuthManager XblGameSave -XboxNetApiSvc \ No newline at end of file +XboxNetApiSvc From 752447cabfd1859931729b78624945be7bdc5996 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 26 Jan 2018 18:11:13 +0100 Subject: [PATCH 5/6] Updated tasks list --- lib/tasks.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) mode change 100644 => 100755 lib/tasks.txt diff --git a/lib/tasks.txt b/lib/tasks.txt old mode 100644 new mode 100755 index d6c9e91..e9005a3 --- a/lib/tasks.txt +++ b/lib/tasks.txt @@ -1,5 +1,11 @@ Microsoft Compatibility Appraiser ProgramDataUpdater +CreateObjectTask Consolidator KernelCeipTask -UsbCeip \ No newline at end of file +UsbCeip +SmartScreenSpecific +Microsoft-Windows-DiskDiagnosticDataCollector +DmClient +MNO Metadata Parser +QueueReporting From ea5fe14d1193dbe4125705b0326daa5c32a92c51 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Fri, 26 Jan 2018 18:12:39 +0100 Subject: [PATCH 6/6] Updated Modern App list --- lib/apps.txt | 73 ++++++++++++++++++++++++---------------------------- 1 file changed, 33 insertions(+), 40 deletions(-) diff --git a/lib/apps.txt b/lib/apps.txt index 5ca525c..aca60af 100755 --- a/lib/apps.txt +++ b/lib/apps.txt @@ -1,46 +1,39 @@ -Microsoft.Messaging -Microsoft.Office.Sway -Microsoft.Office.OneNote -Microsoft.MicrosoftOfficeHub -3dbuilder -skypeapp -zunemusic -solitairecollection -bingfinance -bingnews -soundrecorder -twitter -Microsoft.BioEnrollment -Microsoft.Windows.CloudExperienceHost -Microsoft.Windows.ShellExperienceHost -windows.immersivecontrolpanel -Microsoft.Windows.Cortana -Microsoft.LockApp -Microsoft.MicrosoftEdge -Microsoft.Windows.ContentDeliveryManager -Microsoft.Windows.SecondaryTileExperience -Microsoft.WindowsFeedback -Microsoft.XboxApp -Microsoft.XboxGameCallableUI -Microsoft.XboxIdentityProvider -Windows.ContactSupport -Windows.PurchaseDialog -Microsoft.WindowsStore -windows.devicesflow -Microsoft.CommsPhone -Microsoft.Services.Store.Engagement -Microsoft.ConnectivityStore -Microsoft.People -Microsoft.WindowsMaps +king.com.CandyCrushSodaSaga +Microsoft.3dbuilder +Microsoft.Appconnector +Microsoft.BingFinance +Microsoft.BingFoodAndDrink +Microsoft.BingHealthAndFitness +Microsoft.BingNews Microsoft.BingSports +Microsoft.BingTravel +Microsoft.BingWeather +Microsoft.CommsPhone +Microsoft.ConnectivityStore +Microsoft.Getstarted +Microsoft.Messaging +Microsoft.MicrosoftOfficeHub +Microsoft.MicrosoftPowerBIForWindows +Microsoft.MicrosoftSolitaireCollection +Microsoft.MinecraftUWP +Microsoft.Office.OneNote +Microsoft.Office.Sway +Microsoft.OneConnec +Microsoft.People +Microsoft.Services.Store.Engagement +Microsoft.SkypeApp +Microsoft.Windows.Photos +Microsoft.WindowsAlarms Microsoft.WindowsCalculator +Microsoft.WindowsCamera microsoft.windowscommunicationsapps +Microsoft.WindowsFeedbackHub +Microsoft.WindowsMaps +Microsoft.WindowsPhone Microsoft.WindowsSoundRecorder +Microsoft.WindowsStore +Microsoft.XboxApp +Microsoft.ZuneMusic Microsoft.ZuneVideo Microsoft.Advertising.Xaml -Microsoft.WindowsPhone -Microsoft.WindowsAlarms -Microsoft.WindowsCamera -Microsoft.BingWeather -Microsoft.Windows.Photos -Microsoft.Getstarted \ No newline at end of file +twitter \ No newline at end of file