Skip to content

Commit

Permalink
Merge branch 'release/0.12.0'
Browse files Browse the repository at this point in the history
* release/0.12.0: (58 commits)
  (build) Switch to local environment variables
  (maint) Fixing TS Errors
  Bump @types/node from 11.12.0 to 11.13.2
  Bump @types/xml2js from 0.4.3 to 0.4.4
  Bump expect from 24.5.0 to 24.7.1
  (maint) Bump required version of vscode
  Bump vscode from 1.1.32 to 1.1.33
  Bump tslint from 5.14.0 to 5.15.0
  Bump make-dir from 2.1.0 to 3.0.0
  Bump @types/node-fetch from 2.1.7 to 2.3.0
  Bump mocha from 6.0.2 to 6.1.2
  Bump @types/node from 11.11.5 to 11.12.0
  Bump @types/node from 11.11.4 to 11.11.5
  Bump expect from 24.1.0 to 24.5.0
  Bump @types/node-fetch from 2.1.6 to 2.1.7
  Update cakeRunTaskCommand.ts to fix --script parameter
  (GH-133) Removed unnecessary entry in manifest
  (maint) Updated spellings etc.
  (maint) Bump to latest VSCode version
  Bump vscode from 1.1.29 to 1.1.32
  ...
  • Loading branch information
gep13 committed Apr 9, 2019
2 parents efc87a2 + 0f56382 commit 684d8e1
Show file tree
Hide file tree
Showing 23 changed files with 4,465 additions and 6,438 deletions.
5 changes: 5 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pull_request_rules:
- name: delete head branch after merge
conditions: []
actions:
delete_head_branch: {}
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ os:
- linux

script:
- ./build.sh --verbosity=diagnostic --settings_skipverification=true
- ./build.sh --verbosity=diagnostic
9 changes: 8 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,12 @@
"**/bower_components": true,
"logs/": true,
"out/": true
}
},
"cSpell.words": [
"Addin",
"bootstrapper",
"bootstrappers",
"coreclr",
"typemoq"
]
}
6 changes: 5 additions & 1 deletion GitReleaseManager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,13 @@ issue-labels-include:
- Bug
- Improvement
- Documentation
- security
issue-labels-exclude:
- Build
issue-labels-alias:
- name: Documentation
header: Documentation
plural: Documentation
plural: Documentation
- name: security
header: Security
plural: Security
3 changes: 2 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ init:

# Build script
build_script:
- ps: .\build.ps1 -Target "AppVeyor" --settings_skipverification=true
- ps: Get-ChildItem -Path "C:\Program Files (x86)\Microsoft SDKs\TypeScript\*" -Include tsc.exe,tsc.js -Recurse | Rename-Item -NewName {$_.name -replace "tsc","tsc1"}
- ps: .\build.ps1 -Target "AppVeyor"

# Tests
test: off
Expand Down
197 changes: 0 additions & 197 deletions build.cake

This file was deleted.

4 changes: 2 additions & 2 deletions build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ https://cakebuild.net

[CmdletBinding()]
Param(
[string]$Script = "build.cake",
[string]$Script = "recipe.cake",
[string]$Target = "Default",
[ValidateSet("Release", "Debug")]
[string]$Configuration = "Release",
Expand Down Expand Up @@ -179,7 +179,7 @@ if(-Not $SkipToolPackageRestore.IsPresent) {
$md5Hash | Out-File $PACKAGES_CONFIG_MD5 -Encoding "ASCII"
}
Write-Verbose -Message ($NuGetOutput | out-string)

Pop-Location
}

Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ else
fi

# Define default arguments.
SCRIPT="build.cake"
SCRIPT="recipe.cake"
CAKE_ARGUMENTS=()

# Parse arguments.
Expand Down
104 changes: 0 additions & 104 deletions build/parameters.cake

This file was deleted.

Loading

0 comments on commit 684d8e1

Please sign in to comment.