From d3e16e36611c2fc663fe33b434eacb5c98a58adf Mon Sep 17 00:00:00 2001 From: Martin Battaglino Date: Mon, 9 Sep 2019 10:45:55 -0300 Subject: [PATCH] Update Encoding to UTF8 (#2289) --- .../csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1 | 4 ++-- .../Deployment/Scripts/deploy_cognitive_models.ps1 | 2 +- .../Deployment/Scripts/update_cognitive_models.ps1 | 2 +- .../csharp/Template/Skill/Deployment/Scripts/deploy.ps1 | 4 ++-- .../Skill/Deployment/Scripts/deploy_cognitive_models.ps1 | 2 +- .../Skill/Deployment/Scripts/update_cognitive_models.ps1 | 2 +- .../VirtualAssistantSample/Deployment/Scripts/deploy.ps1 | 4 ++-- .../Deployment/Scripts/deploy_cognitive_models.ps1 | 2 +- .../Deployment/Scripts/update_cognitive_models.ps1 | 2 +- .../csharp/Template/VA/Deployment/Scripts/deploy.ps1 | 4 ++-- .../VA/Deployment/Scripts/deploy_cognitive_models.ps1 | 2 +- .../VA/Deployment/Scripts/update_cognitive_models.ps1 | 2 +- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1 b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1 index 2ec874cf98..8bfe6a5262 100644 --- a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1 +++ b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy.ps1 @@ -187,7 +187,7 @@ if ($outputs) # Update appsettings.json Write-Host "> Updating appsettings.json ..." if (Test-Path $(Join-Path $projDir appsettings.json)) { - $settings = Get-Content $(Join-Path $projDir appsettings.json) | ConvertFrom-Json + $settings = Get-Content -Encoding utf8 $(Join-Path $projDir appsettings.json) | ConvertFrom-Json } else { $settings = New-Object PSObject @@ -196,7 +196,7 @@ if ($outputs) $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppId' -Value $appId $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppPassword' -Value $appPassword foreach ($key in $outputMap.Keys) { $settings | Add-Member -Type NoteProperty -Force -Name $key -Value $outputMap[$key].value } - $settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $projDir appsettings.json) + $settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $projDir appsettings.json) if ($outputs.qnaMaker.value.key) { $qnaSubscriptionKey = $outputs.qnaMaker.value.key } diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy_cognitive_models.ps1 b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy_cognitive_models.ps1 index 96c892f93a..5b7200040a 100644 --- a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy_cognitive_models.ps1 +++ b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/deploy_cognitive_models.ps1 @@ -297,4 +297,4 @@ foreach ($language in $languageArr) } # Write out config to file -$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file +$settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file diff --git a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/update_cognitive_models.ps1 b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/update_cognitive_models.ps1 index d435017c30..61df1dd943 100644 --- a/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/update_cognitive_models.ps1 +++ b/templates/Skill-Template/csharp/Sample/SkillSample/Deployment/Scripts/update_cognitive_models.ps1 @@ -24,7 +24,7 @@ else { Write-Host "> Getting config file ..." $languageMap = @{ } -$config = Get-Content -Raw -Path $configFile | ConvertFrom-Json +$config = Get-Content -Encoding utf8 -Raw -Path $configFile | ConvertFrom-Json $config.cognitiveModels.PSObject.Properties | Foreach-Object { $languageMap[$_.Name] = $_.Value } foreach ($langCode in $languageMap.Keys) { diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy.ps1 b/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy.ps1 index 2ec874cf98..8bfe6a5262 100644 --- a/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy.ps1 +++ b/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy.ps1 @@ -187,7 +187,7 @@ if ($outputs) # Update appsettings.json Write-Host "> Updating appsettings.json ..." if (Test-Path $(Join-Path $projDir appsettings.json)) { - $settings = Get-Content $(Join-Path $projDir appsettings.json) | ConvertFrom-Json + $settings = Get-Content -Encoding utf8 $(Join-Path $projDir appsettings.json) | ConvertFrom-Json } else { $settings = New-Object PSObject @@ -196,7 +196,7 @@ if ($outputs) $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppId' -Value $appId $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppPassword' -Value $appPassword foreach ($key in $outputMap.Keys) { $settings | Add-Member -Type NoteProperty -Force -Name $key -Value $outputMap[$key].value } - $settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $projDir appsettings.json) + $settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $projDir appsettings.json) if ($outputs.qnaMaker.value.key) { $qnaSubscriptionKey = $outputs.qnaMaker.value.key } diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy_cognitive_models.ps1 b/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy_cognitive_models.ps1 index 96c892f93a..5b7200040a 100644 --- a/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy_cognitive_models.ps1 +++ b/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/deploy_cognitive_models.ps1 @@ -297,4 +297,4 @@ foreach ($language in $languageArr) } # Write out config to file -$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file +$settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file diff --git a/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/update_cognitive_models.ps1 b/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/update_cognitive_models.ps1 index d435017c30..61df1dd943 100644 --- a/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/update_cognitive_models.ps1 +++ b/templates/Skill-Template/csharp/Template/Skill/Deployment/Scripts/update_cognitive_models.ps1 @@ -24,7 +24,7 @@ else { Write-Host "> Getting config file ..." $languageMap = @{ } -$config = Get-Content -Raw -Path $configFile | ConvertFrom-Json +$config = Get-Content -Encoding utf8 -Raw -Path $configFile | ConvertFrom-Json $config.cognitiveModels.PSObject.Properties | Foreach-Object { $languageMap[$_.Name] = $_.Value } foreach ($langCode in $languageMap.Keys) { diff --git a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy.ps1 b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy.ps1 index 2ec874cf98..8bfe6a5262 100644 --- a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy.ps1 +++ b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy.ps1 @@ -187,7 +187,7 @@ if ($outputs) # Update appsettings.json Write-Host "> Updating appsettings.json ..." if (Test-Path $(Join-Path $projDir appsettings.json)) { - $settings = Get-Content $(Join-Path $projDir appsettings.json) | ConvertFrom-Json + $settings = Get-Content -Encoding utf8 $(Join-Path $projDir appsettings.json) | ConvertFrom-Json } else { $settings = New-Object PSObject @@ -196,7 +196,7 @@ if ($outputs) $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppId' -Value $appId $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppPassword' -Value $appPassword foreach ($key in $outputMap.Keys) { $settings | Add-Member -Type NoteProperty -Force -Name $key -Value $outputMap[$key].value } - $settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $projDir appsettings.json) + $settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $projDir appsettings.json) if ($outputs.qnaMaker.value.key) { $qnaSubscriptionKey = $outputs.qnaMaker.value.key } diff --git a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy_cognitive_models.ps1 index 70310aeeb4..c84539cddf 100644 --- a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy_cognitive_models.ps1 +++ b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/deploy_cognitive_models.ps1 @@ -297,4 +297,4 @@ foreach ($language in $languageArr) } # Write out config to file -$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file +$settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file diff --git a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/update_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/update_cognitive_models.ps1 index d435017c30..61df1dd943 100644 --- a/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/update_cognitive_models.ps1 +++ b/templates/Virtual-Assistant-Template/csharp/Sample/VirtualAssistantSample/Deployment/Scripts/update_cognitive_models.ps1 @@ -24,7 +24,7 @@ else { Write-Host "> Getting config file ..." $languageMap = @{ } -$config = Get-Content -Raw -Path $configFile | ConvertFrom-Json +$config = Get-Content -Encoding utf8 -Raw -Path $configFile | ConvertFrom-Json $config.cognitiveModels.PSObject.Properties | Foreach-Object { $languageMap[$_.Name] = $_.Value } foreach ($langCode in $languageMap.Keys) { diff --git a/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy.ps1 b/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy.ps1 index 2ec874cf98..8bfe6a5262 100644 --- a/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy.ps1 +++ b/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy.ps1 @@ -187,7 +187,7 @@ if ($outputs) # Update appsettings.json Write-Host "> Updating appsettings.json ..." if (Test-Path $(Join-Path $projDir appsettings.json)) { - $settings = Get-Content $(Join-Path $projDir appsettings.json) | ConvertFrom-Json + $settings = Get-Content -Encoding utf8 $(Join-Path $projDir appsettings.json) | ConvertFrom-Json } else { $settings = New-Object PSObject @@ -196,7 +196,7 @@ if ($outputs) $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppId' -Value $appId $settings | Add-Member -Type NoteProperty -Force -Name 'microsoftAppPassword' -Value $appPassword foreach ($key in $outputMap.Keys) { $settings | Add-Member -Type NoteProperty -Force -Name $key -Value $outputMap[$key].value } - $settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $projDir appsettings.json) + $settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $projDir appsettings.json) if ($outputs.qnaMaker.value.key) { $qnaSubscriptionKey = $outputs.qnaMaker.value.key } diff --git a/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy_cognitive_models.ps1 index 70310aeeb4..c84539cddf 100644 --- a/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy_cognitive_models.ps1 +++ b/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/deploy_cognitive_models.ps1 @@ -297,4 +297,4 @@ foreach ($language in $languageArr) } # Write out config to file -$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file +$settings | ConvertTo-Json -depth 100 | Out-File -Encoding utf8 $(Join-Path $outFolder "cognitivemodels.json" ) \ No newline at end of file diff --git a/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/update_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/update_cognitive_models.ps1 index d435017c30..61df1dd943 100644 --- a/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/update_cognitive_models.ps1 +++ b/templates/Virtual-Assistant-Template/csharp/Template/VA/Deployment/Scripts/update_cognitive_models.ps1 @@ -24,7 +24,7 @@ else { Write-Host "> Getting config file ..." $languageMap = @{ } -$config = Get-Content -Raw -Path $configFile | ConvertFrom-Json +$config = Get-Content -Encoding utf8 -Raw -Path $configFile | ConvertFrom-Json $config.cognitiveModels.PSObject.Properties | Foreach-Object { $languageMap[$_.Name] = $_.Value } foreach ($langCode in $languageMap.Keys) {