Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various fixes in install scripts #1681

Merged
merged 1 commit into from
Jul 14, 2020
Merged

Various fixes in install scripts #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion install-scripts/Initialize-VSCode.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function Main {

$settings | ConvertTo-Json -depth 32 | Out-File $filePath -Encoding UTF8 -Force

CleanJsonPatterns($filePath)
Repair-Patterns($filePath)
}
}

Expand Down
2 changes: 1 addition & 1 deletion install-scripts/install-arm-gcc-toolchain.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ If ($gnuGccPathExists -eq $False -or $force) {
# unzip to install path, if not on Azure
if ($IsAzurePipelines -eq $False) {
# Install 7Zip4PowerShell module from PSGallery if not already installed
Install-Module -Name 7Zip4Powershell -RequiredVersion -Scope CurrentUser
Install-Module -Name 7Zip4Powershell -RequiredVersion 1.10.0 -Scope CurrentUser

"Installing ARM GNU GCC toolchain..." | Write-Host -ForegroundColor White -NoNewline

Expand Down
2 changes: 1 addition & 1 deletion targets/FreeRTOS_ESP32/ESP32_WROOM_32/cmake-variants.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"NF_FEATURE_HAS_SDCARD": "ON",
"API_System.Net": "ON",
"NF_SECURITY_MBEDTLS": "ON",
"MBEDTLS_SOURCE": "<path-to-mbedtls-source-mind-the-forward-slashes>",
"MBEDTLS_SOURCE": "",
"API_nanoFramework.ResourceManager": "ON",
"API_nanoFramework.System.Collections": "ON",
"API_nanoFramework.System.Text": "ON",
Expand Down