-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1444 from microsoft/dev
Sync from dev
- Loading branch information
Showing
569 changed files
with
14,761 additions
and
15,882 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# At least one of the code owners below will be required on each PR: | ||
* @markAtMicrosoft @sibille @mvegaca @dgomezc @smmatte @trevorNgo @jcoc611-microsoft @piotrmark @MehaKaushik @Tanya0609 @javieraparisivaldes | ||
* @sibille @mvegaca @dgomezc @trevorNgo @jcoc611-microsoft @piotrmark @MehaKaushik @Tanya0609 @javieraparisivaldes | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"Environment": "WebTSDebug", | ||
"CdnUrl": "", | ||
"RemoteTelemetryKey": "", | ||
"LogFileFolderPath": "WebTS\\Logs", | ||
"CustomTelemetryEndpoint": "", | ||
"RepositoryFolderName": "WebTS", | ||
"BackupFolderPath": "", | ||
"TempGenerationFolderPath": "WTSTempGeneration", | ||
"DiagnosticsTraceLevel": "Verbose", | ||
"GitHubDocsUrl": "", | ||
"DaysToKeepTempGenerations": 5, | ||
"DaysToKeepDiagnosticsLogs": 5, | ||
"AllowedPublicKeysPins": [ | ||
"14CAC54E3A89855AF3F33C6C2F88E389094305F15EC3E7CC18844E8ABD4651A8992710E005DE189A313039064B082D62D41077B44BEFA4D837C1FC320083D422", | ||
"51E93470FD838DFCE5F4ADF0D7750D2B66635677499A73160B9CB3BA84884A9EBA5F4E80C346323C0F61D2A8EDDC8EE5E02E7F186D13C953270F68AEB44CFE3D", | ||
"8A79BF09C49440C614229A2338384348443353A4B3DBA4AD46EDC0FE1054ED220A0D3445783493869186DEADBF0D9D8627E0EAC2D37475C9EC991A0324038EA4", | ||
"2A0A69F1AB9BB46A8AE3563B72702FD6CCB16ECBF669D62A7DC92D217A084E318EC8BB2AE87A4A2C6855BDB9C0F4FD93D77E802AAACDDEB795C2EF718D7D4890", | ||
"3887006BEB41CEE5386343BE28289FB8D08ED52D4DCB0907FBC4624D0EA886E9295303467AD3323D98D20703CBFBDA331680B2D8D90B3A561A98C94E05E9A021", | ||
"C70A54064923A7CFB68FFA0E2C4308D496CA4B56FFE5ECCC4338F4A4E87083EB881CFFC73B19FC60DC362F45D381CFEB1C719B08AB47A8BE6190D7DEB7A83834", | ||
"82B4B76E0A82BCBA2DE619851CF3EB205C233BFB1A4135EC4E05329D8258DC8B30408B21B827EFF3D6008BBFBAFB115E4AD72DE66988888A44BE02CD74A4BE5F", | ||
"26859EB6CDE0744E0B5DA300681265837D0B9F8CFCBB8071C914367EF5C6E14EA806BA770281F64077536C97F477BF55AE7083EEC93F0EC376DA6D357F1F6699" | ||
], | ||
"AllowedPackages": [ "" ], | ||
"BreakingChangesVersions": [] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"Environment": "Local", | ||
"CdnUrl": "", | ||
"RemoteTelemetryKey": "", | ||
"LogFileFolderPath": "WebTS\\Logs", | ||
"CustomTelemetryEndpoint": "", | ||
"RepositoryFolderName": "WebTS", | ||
"BackupFolderPath": "", | ||
"TempGenerationFolderPath": "WTSTempGeneration", | ||
"DiagnosticsTraceLevel": "Verbose", | ||
"GitHubDocsUrl": "", | ||
"DaysToKeepTempGenerations": 5, | ||
"DaysToKeepDiagnosticsLogs": 5, | ||
"AllowedPublicKeysPins": [ | ||
"14CAC54E3A89855AF3F33C6C2F88E389094305F15EC3E7CC18844E8ABD4651A8992710E005DE189A313039064B082D62D41077B44BEFA4D837C1FC320083D422", | ||
"51E93470FD838DFCE5F4ADF0D7750D2B66635677499A73160B9CB3BA84884A9EBA5F4E80C346323C0F61D2A8EDDC8EE5E02E7F186D13C953270F68AEB44CFE3D", | ||
"8A79BF09C49440C614229A2338384348443353A4B3DBA4AD46EDC0FE1054ED220A0D3445783493869186DEADBF0D9D8627E0EAC2D37475C9EC991A0324038EA4", | ||
"2A0A69F1AB9BB46A8AE3563B72702FD6CCB16ECBF669D62A7DC92D217A084E318EC8BB2AE87A4A2C6855BDB9C0F4FD93D77E802AAACDDEB795C2EF718D7D4890", | ||
"3887006BEB41CEE5386343BE28289FB8D08ED52D4DCB0907FBC4624D0EA886E9295303467AD3323D98D20703CBFBDA331680B2D8D90B3A561A98C94E05E9A021", | ||
"C70A54064923A7CFB68FFA0E2C4308D496CA4B56FFE5ECCC4338F4A4E87083EB881CFFC73B19FC60DC362F45D381CFEB1C719B08AB47A8BE6190D7DEB7A83834", | ||
"82B4B76E0A82BCBA2DE619851CF3EB205C233BFB1A4135EC4E05329D8258DC8B30408B21B827EFF3D6008BBFBAFB115E4AD72DE66988888A44BE02CD74A4BE5F", | ||
"26859EB6CDE0744E0B5DA300681265837D0B9F8CFCBB8071C914367EF5C6E14EA806BA770281F64077536C97F477BF55AE7083EEC93F0EC376DA6D357F1F6699" | ||
], | ||
"AllowedPackages": [ "38B3095D8E46591DB6BDF8A6C9816AA50AF486124649F23B86306482B8C62EA5" ], | ||
"BreakingChangesVersions": [] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
[CmdletBinding()] | ||
Param( | ||
[Parameter(Mandatory=$True,Position=1)] | ||
[string]$vsixPackageJson, | ||
|
||
[Parameter(Mandatory=$True,Position=2)] | ||
[string]$vsixName, | ||
|
||
[Parameter(Mandatory=$True,Position=3)] | ||
[string]$vsixDisplayName, | ||
|
||
[Parameter(Mandatory=$True,Position=4)] | ||
[string]$versionNumber, | ||
|
||
[Parameter(Mandatory=$True,Position=5)] | ||
[string]$aikey | ||
) | ||
function Clear-WhiteSpace ($Text) { | ||
"$($Text -replace "(`t|`n|`r)"," " -replace "\s+"," ")".Trim() | ||
} | ||
|
||
## SET NAME AND VERSION IN VSIX Package json | ||
if($vsixName){ | ||
Write-Host | ||
Write-Host "Setting name and version in VSIX package json" | ||
|
||
if(Test-Path($vsixPackageJson)){ | ||
$packagejsonContent = Get-Content $vsixPackageJson | ConvertFrom-Json | ||
$LocalIdentity = $packagejsonContent.name | ||
$localDisplayName = $packagejsonContent.displayName | ||
$localVersionNumber = $packagejsonContent.version | ||
$localAiKey = $packagejsonContent.aiKey | ||
|
||
Write-Host "Replacing $LocalIdentity by $vsixName" | ||
Write-Host "Replacing $localDisplayName by $vsixDisplayName" | ||
Write-Host "Replacing $localVersionNumber by $versionNumber" | ||
|
||
$content = (Get-Content -path $vsixPackageJson -Raw) | ||
|
||
$content = $content -replace "$LocalIdentity" , "$vsixName" | ||
$content = $content -replace [regex]::Escape("$localDisplayName") , "$vsixDisplayName" | ||
$content = $content -replace "$localVersionNumber" , "$versionNumber" | ||
$content = $content -replace "$localAiKey" , "$aikey" | ||
|
||
[System.IO.File]::WriteAllLines($vsixPackageJson, $content, [System.Text.UTF8Encoding]($False)) | ||
|
||
Write-Host "$resolvedPath - Version, Name & DisplayName applied ($versionNumber, $vsixName, $vsixDisplayName)" | ||
} | ||
else{ | ||
throw "No VSIX package json file found." | ||
} | ||
} | ||
else{ | ||
throw "Identity is mandatory." | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
#!/bin/bash | ||
|
||
# This script installs and builds the client and cli and copies the output to the extensions folder | ||
|
||
magenta='\033[0;35m' | ||
red='\033[0;31m' | ||
nc='\033[0m' | ||
|
||
# Build the client | ||
sh ./build-client.sh | ||
|
||
# Build the cli in debug | ||
sh ./build-coretscli.sh "debug" | ||
|
||
# Build the extension | ||
sh ./build-extension.sh |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/bin/bash | ||
|
||
# This script installs client dependencies and builds the client and copies the output to the extensions react folder | ||
|
||
magenta='\033[0;35m' | ||
red='\033[0;31m' | ||
nc='\033[0m' | ||
|
||
echo -e "${magenta}Installing client dependencies ${nc}" | ||
echo | ||
yarn --cwd ../src/client install | ||
echo | ||
|
||
echo -e "${magenta}Building client ${nc}" | ||
echo | ||
yarn --cwd ../src/client build | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/bash | ||
|
||
# This script installs and builds the client and cli and copies the output to the extensions folder | ||
|
||
magenta='\033[0;35m' | ||
red='\033[0;31m' | ||
nc='\033[0m' | ||
|
||
# Build the client | ||
sh ./build-client.sh | ||
|
||
# Build the cli in debug | ||
sh ./build-coretscli.sh "debug" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
#!/bin/bash | ||
|
||
# This script builds the cli as a selfconatined executable and copies the output to the extensions corets-cli folders for mac, linux and windows | ||
|
||
magenta='\033[0;35m' | ||
red='\033[0;31m' | ||
nc='\033[0m' | ||
|
||
if [ ! -z "$1" ] && ([ "$1" == "release" ] || [ "$1" == "debug" ]); then # Check if release was passed as parameter, else ignore it | ||
|
||
rm -rf ../src/extension/src/corets-cli/win32/ | ||
rm -rf ../src/extension/src/corets-cli/linux/ | ||
rm -rf ../src/extension/src/corets-cli/darwin/ | ||
|
||
configuration=$1 | ||
|
||
echo -e "${magenta}Building and publishing cli in configuration $configuration ${nc}" | ||
echo | ||
|
||
dotnet publish ../src/CoreTemplateStudio/code/src/CoreTemplateStudio/CoreTemplateStudio.Cli/CoreTemplateStudio.Cli.csproj -c $configuration -r win-x64 --self-contained true -o ../src/extension/src/corets-cli/win32/ | ||
dotnet publish ../src/CoreTemplateStudio/code/src/CoreTemplateStudio/CoreTemplateStudio.Cli/CoreTemplateStudio.Cli.csproj -c $configuration -r linux-x64 --self-contained true -o ../src/extension/src/corets-cli/linux/ | ||
dotnet publish ../src/CoreTemplateStudio/code/src/CoreTemplateStudio/CoreTemplateStudio.Cli/CoreTemplateStudio.Cli.csproj -c $configuration -r osx-x64 --self-contained true -o ../src/extension/src/corets-cli/darwin/ | ||
|
||
|
||
echo -e "${magenta}Copy config file $configuration ${nc}" | ||
cp -v CoreTemplateStudio.local.$configuration.config.json ../src/extension/src/corets-cli/win32/CoreTemplateStudio.config.json | ||
cp -v CoreTemplateStudio.local.$configuration.config.json ../src/extension/src/corets-cli/linux/CoreTemplateStudio.config.json | ||
cp -v CoreTemplateStudio.local.$configuration.config.json ../src/extension/src/corets-cli/darwin/CoreTemplateStudio.config.json | ||
else | ||
echo -e "${red}Invalid parmeter $1, expected values: 'debug' or ' release' for build configuration.${nc}" | ||
fi | ||
|
||
|
||
|
||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
#!/bin/bash | ||
|
||
# This script installs extension dependencies and builds the extension | ||
|
||
magenta='\033[0;35m' | ||
red='\033[0;31m' | ||
nc='\033[0m' | ||
|
||
echo -e "${magenta}Installing extension dependencies ${nc}" | ||
echo | ||
yarn --cwd ../src/extension install | ||
echo | ||
|
||
echo -e "${magenta}Building extension ${nc}" | ||
echo | ||
yarn --cwd ../src/extension build | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
#!/bin/bash | ||
|
||
# This script builds the client, the cli (in release) and the extension and generates a vsix | ||
magenta='\033[0;35m' | ||
red='\033[0;31m' | ||
nc='\033[0m' | ||
|
||
# Build the client | ||
sh ./build-client.sh | ||
|
||
# Build the cli in release | ||
sh ./build-coretscli.sh "release" | ||
|
||
# Create vsix package | ||
echo -e "${magenta}Creating vsix package ${nc}" | ||
echo | ||
yarn --cwd ../src/extension createVsixPackage && echo -e "${magenta}vsix file is now available in root/dist/ ${nc}" |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.