[TypeScript][Samples/Template] Add UTF8 default encoding for deployment scripts (#2130)

DiegoCardozo94 · darrenj · commit af50c233a134 · 2019-08-19T17:53:23.000+01:00
* Add UTF-8

* change from uppercase to lowercase

* changes a lowcase and add 'enconding utf8' to sample assistant

* Move the location of the encoding argument
diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/deployment/scripts/deploy.ps1 b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/deployment/scripts/deploy.ps1
@@ -184,7 +184,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 $(Join-Path $projDir appsettings.json) -Encoding utf8 | ConvertFrom-Json
 	}
 	else {
 		$settings = New-Object PSObject
diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/deployment/scripts/deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/deployment/scripts/deploy_cognitive_models.ps1
@@ -301,4 +301,4 @@ foreach ($language in $languageArr)
 }
 
 # Write out config to file
-$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" )
+$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json") -Encoding utf8
diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/deployment/scripts/publish.ps1 b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/app/templates/sample-assistant/deployment/scripts/publish.ps1
@@ -27,7 +27,7 @@ else {
 if (-not (Test-Path (Join-Path $projFolder '.deployment'))) {
 
 	# Add needed deployment configuration
-	Add-Content -Path $(Join-Path $projFolder ".deployment") -Value @("[config]", "SCM_DO_BUILD_DURING_DEPLOYMENT=true")
+	Add-Content -Path $(Join-Path $projFolder ".deployment") -Value @("[config]", "SCM_DO_BUILD_DURING_DEPLOYMENT=true") -Encoding utf8
 }
 
 # Delete src zip, if it exists
diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/deployment/scripts/deploy.ps1 b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-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 $(Join-Path $projDir appsettings.json) -Encoding utf8 | ConvertFrom-Json
 	}
 	else {
 		$settings = New-Object PSObject
diff --git a/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/deployment/scripts/deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/typescript/generator-botbuilder-assistant/generators/skill/templates/sample-skill/deployment/scripts/deploy_cognitive_models.ps1
@@ -296,4 +296,4 @@ foreach ($language in $languageArr)
 }
 
 # Write out config to file
-$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" )
+$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json") -Encoding utf8
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/deploy.ps1 b/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/deploy.ps1
@@ -184,7 +184,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 $(Join-Path $projDir appsettings.json) -Encoding utf8 | ConvertFrom-Json
 	}
 	else {
 		$settings = New-Object PSObject
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/deploy_cognitive_models.ps1
@@ -301,4 +301,4 @@ foreach ($language in $languageArr)
 }
 
 # Write out config to file
-$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" )
+$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json") -Encoding utf8
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/publish.ps1 b/templates/Virtual-Assistant-Template/typescript/samples/sample-assistant/deployment/scripts/publish.ps1
@@ -27,7 +27,7 @@ else {
 if (-not (Test-Path (Join-Path $projFolder '.deployment'))) {
 
 	# Add needed deployment configuration
-	Add-Content -Path $(Join-Path $projFolder ".deployment") -Value @("[config]", "SCM_DO_BUILD_DURING_DEPLOYMENT=true")
+	Add-Content -Path $(Join-Path $projFolder ".deployment") -Value @("[config]", "SCM_DO_BUILD_DURING_DEPLOYMENT=true") -Encoding utf8
 }
 
 # Delete src zip, if it exists
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/deployment/scripts/deploy.ps1 b/templates/Virtual-Assistant-Template/typescript/samples/sample-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 $(Join-Path $projDir appsettings.json) -Encoding utf8 | ConvertFrom-Json
 	}
 	else {
 		$settings = New-Object PSObject
diff --git a/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/deployment/scripts/deploy_cognitive_models.ps1 b/templates/Virtual-Assistant-Template/typescript/samples/sample-skill/deployment/scripts/deploy_cognitive_models.ps1
@@ -296,4 +296,4 @@ foreach ($language in $languageArr)
 }
 
 # Write out config to file
-$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json" )
+$settings | ConvertTo-Json -depth 100 | Out-File $(Join-Path $outFolder "cognitivemodels.json") -Encoding utf8

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ if ($outputs)`
`184`	`184`	`# Update appsettings.json`
`185`	`185`	`Write-Host "> Updating appsettings.json ..."`
`186`	`186`	`if (Test-Path $(Join-Path $projDir appsettings.json)) {`
`187`		`- $settings = Get-Content $(Join-Path $projDir appsettings.json) \| ConvertFrom-Json`
	`187`	`+ $settings = Get-Content $(Join-Path $projDir appsettings.json) -Encoding utf8 \| ConvertFrom-Json`
`188`	`188`	`}`
`189`	`189`	`else {`
`190`	`190`	`$settings = New-Object PSObject`
Original file line number	Diff line number	Diff line change
`@@ -301,4 +301,4 @@ foreach ($language in $languageArr)`
`301`	`301`	`}`
`302`	`302`
`303`	`303`	`# Write out config to file`
`304`		`-$settings \| ConvertTo-Json -depth 100 \| Out-File $(Join-Path $outFolder "cognitivemodels.json" )`
	`304`	`+$settings \| ConvertTo-Json -depth 100 \| Out-File $(Join-Path $outFolder "cognitivemodels.json") -Encoding utf8`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ else {`
`27`	`27`	`if (-not (Test-Path (Join-Path $projFolder '.deployment'))) {`
`28`	`28`
`29`	`29`	`# Add needed deployment configuration`
`30`		`- Add-Content -Path $(Join-Path $projFolder ".deployment") -Value @("[config]", "SCM_DO_BUILD_DURING_DEPLOYMENT=true")`
	`30`	`+ Add-Content -Path $(Join-Path $projFolder ".deployment") -Value @("[config]", "SCM_DO_BUILD_DURING_DEPLOYMENT=true") -Encoding utf8`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`# Delete src zip, if it exists`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ if ($outputs)`
`187`	`187`	`# Update appsettings.json`
`188`	`188`	`Write-Host "> Updating appsettings.json ..."`
`189`	`189`	`if (Test-Path $(Join-Path $projDir appsettings.json)) {`
`190`		`- $settings = Get-Content $(Join-Path $projDir appsettings.json) \| ConvertFrom-Json`
	`190`	`+ $settings = Get-Content $(Join-Path $projDir appsettings.json) -Encoding utf8 \| ConvertFrom-Json`
`191`	`191`	`}`
`192`	`192`	`else {`
`193`	`193`	`$settings = New-Object PSObject`
Original file line number	Diff line number	Diff line change
`@@ -296,4 +296,4 @@ foreach ($language in $languageArr)`
`296`	`296`	`}`
`297`	`297`
`298`	`298`	`# Write out config to file`
`299`		`-$settings \| ConvertTo-Json -depth 100 \| Out-File $(Join-Path $outFolder "cognitivemodels.json" )`
	`299`	`+$settings \| ConvertTo-Json -depth 100 \| Out-File $(Join-Path $outFolder "cognitivemodels.json") -Encoding utf8`