Fixed encoding issue

Author: Zerg00s

GenerateInitialMapping.ps1

@@ -8,7 +8,15 @@ if ($null -eq $SOURCE_SITE_URL) {
 }
 
 Write-Host "[Attention] Look for a login popup in a separate window. Please, log in to the source site site" -ForegroundColor Cyan
-Connect-PnPOnline -Url $SOURCE_SITE_URL -UseWebLogin -WarningAction Ignore
+
+If($CLEAR_CREDENTIALS_CACHE){
+    Connect-PnPOnline -Url $SOURCE_SITE_URL -SPOManagementShell -ClearTokenCache -WarningAction Ignore
+}else{
+    Connect-PnPOnline -Url $SOURCE_SITE_URL -UseWebLogin -WarningAction Ignore
+}
+
+
+
 
 $lists = Get-PnPList -Includes Views, Fields, DefaultView
 $lists = $lists | Where-Object hidden -eq $false

MISC/Move-Lists.ps1

@@ -65,9 +65,11 @@ if ($MigrationType -eq "Export") {
     }
 
     # Remove all Property Bag entries from the lists. Begin
-    ((Get-Content -path Lists.xml -Raw) -replace '<\?xml version="1.0"\?>','' -replace 'RootSite', 'Web') | Set-Content -Path Lists.xml
+    ((Get-Content -path Lists.xml -Raw -Encoding UTF8) -replace '<\?xml version="1.0"\?>','' -replace 'RootSite', 'Web') | Set-Content -Path Lists.xml -Encoding UTF8
 
     $xml = [xml](Get-Content Lists.xml)
+
+
     $propertyBagEntries = $xml.GetElementsByTagName('pnp:PropertyBagEntries')
     if($propertyBagEntries -ne $null -and $propertyBagEntries.Count -gt 0) {
        for ($i = $propertyBagEntries.Count -1; $i -gt -1 ; $i--) {
@@ -76,7 +78,8 @@ if ($MigrationType -eq "Export") {
     }
 
     $xml.Save('Lists.xml')
-    "<?xml version=""1.0""?>`n" + (Get-Content "Lists.xml" -Raw) | Set-Content "Lists.xml"
+    "<?xml version=""1.0""?>`n" + (Get-Content "Lists.xml" -Raw -Encoding UTF8) | Set-Content "Lists.xml" -Encoding UTF8
+
     # Remove all Property Bag entries from the lists. End
 
     foreach ($title in $titles) {

MISC/PS-Forms.ps1

@@ -603,7 +603,7 @@ function Get-FormItemProperties {
 
 
     $Form = New-Object System.Windows.Forms.Form
-    $Form.Height = 380
+    $Form.Height = 450
     $Form.Width = 530
     $Form.Text = $dialogTitle
     $Form.Topmost = $true

Prepare-Deployment-Package-for-Client.ps1

@@ -37,7 +37,7 @@ Import-Module (Get-ChildItem -Recurse -Filter "*.psd1").FullName -DisableNameChe
 
 $Migration = @{
     SOURCE_SITE_URL = "https://contoso.sharepoint.com/sites/Site_A"
-    MIGRATE_LISTS   = $true
+    MIGRATE_LISTS   = $true    
 }
 
 $Migration = Get-FormItemProperties `

README.md

@@ -166,6 +166,19 @@ SharePoint List forms customized with Power Apps can be migrated if you follow t
 
 # Latest Updates
 
+### 3.8 Version - 2022-09-04
+
+#### New features
+- Added ability to Clear Credentials cache (useful when your credentials pop-up opens and closes automatically, without prompting you to enter your credentials)
+
+#### Bug fixes
+- Fixed an issue with migrating between non-English SharePoint sites. 
+
+#### Known issues
+- Migrated lists with custom content types end up with extra content type that should be deleted manually.
+- Migrated lists might need fields to be added to the content type or a form.
+
+
 ### 3.7 Version - 2022-09-01
 
 #### New features

RunAllScripts.ps1

@@ -38,12 +38,13 @@ $Migration = @{
     SOURCE_SITE_URL = "https://contoso.sharepoint.com/sites/Site_A"
     TARGET_SITE_URL = "https://contoso.sharepoint.com/sites/Site_b"
     MIGRATE_LISTS   = $true
+    CLEAR_CREDENTIALS_CACHE = $false
 }
 
 $Migration = Get-FormItemProperties `
     -item $Migration `
     -dialogTitle "Enter source and target sites" `
-    -propertiesOrder @("SOURCE_SITE_URL", "TARGET_SITE_URL", "MIGRATE_LISTS") 
+    -propertiesOrder @("SOURCE_SITE_URL", "TARGET_SITE_URL", "MIGRATE_LISTS", "CLEAR_CREDENTIALS_CACHE") 
 
 $SOURCE_SITE_URL = $Migration.SOURCE_SITE_URL
 $TARGET_SITE_URL = $Migration.TARGET_SITE_URL
@@ -58,13 +59,30 @@ else {
 }
 $MIGRATE_LISTS = $Migration.MIGRATE_LISTS
 
+
+if ($Migration.CLEAR_CREDENTIALS_CACHE -like "true" -or 
+    $Migration.CLEAR_CREDENTIALS_CACHE -like "yes" -or
+    $Migration.CLEAR_CREDENTIALS_CACHE -like "1"
+) {
+    $Migration.CLEAR_CREDENTIALS_CACHE = $true
+}
+else {
+    $Migration.CLEAR_CREDENTIALS_CACHE = $false
+}
+$MIGRATE_LISTS = $Migration.CLEAR_CREDENTIALS_CACHE
+
 . .\GenerateInitialMapping.ps1
 if ($MIGRATE_LISTS) {
     . .\MISC\Move-Lists.ps1 -Path $Path -MigrationType Export -SourceSite $SOURCE_SITE_URL
 }
 
 Write-Host "[Attention] Look for a login popup in a separate window. Please, log in to the target site." -ForegroundColor Cyan
-Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
+If($CLEAR_CREDENTIALS_CACHE){
+    Connect-PnPOnline -Url $TARGET_SITE_URL -SPOManagementShell -ClearTokenCache -WarningAction Ignore
+}else{
+    Connect-PnPOnline -Url $TARGET_SITE_URL -UseWebLogin -WarningAction Ignore
+}
+
 
 if ($MIGRATE_LISTS) {   
     Write-Host Applying Imported XML to $TARGET_SITE_URL -ForegroundColor Cyan