Skip to content

Commit 413ec06

Browse files
authored
Merge pull request #271 from watson-developer-cloud/4945-semantic-release
Implement semantic release
2 parents 818a729 + 688fa71 commit 413ec06

File tree

45 files changed

+644
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+644
-27
lines changed

.bumpversion.cfg

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
[bumpversion]
2+
commit = True
3+
4+
[bumpversion:file:Doxyfile]
5+
6+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.Conversation.v1.Example\IBM.WatsonDeveloperCloud.Conversation.v1.Example.csproj]
7+
8+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.Discovery.v1.Example\IBM.WatsonDeveloperCloud.Discovery.v1.Example.csproj]
9+
10+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.Example.csproj]
11+
12+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.Example.csproj]
13+
14+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.Ex\IBM.WatsonDeveloperCloud.NLU.v1.Example.csproj]
15+
16+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.Example\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.Example.csproj]
17+
18+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.SpeechToText.v1.Example\IBM.WatsonDeveloperCloud.SpeechToText.v1.Example.csproj]
19+
20+
[bumpversion:file:examples\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.Example\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.Example.csproj]
21+
22+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj]
23+
24+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Assistant.v1\README.md]
25+
26+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj]
27+
28+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Conversation.v1\README.md]
29+
30+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj]
31+
32+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.Discovery.v1\README.md]
33+
34+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.csproj]
35+
36+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\README.md]
37+
38+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj]
39+
40+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\README.md]
41+
42+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj]
43+
44+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\README.md]
45+
46+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.csproj]
47+
48+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\README.md]
49+
50+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.csproj]
51+
52+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\README.md]
53+
54+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.SpeechToText.v1\IBM.WatsonDeveloperCloud.SpeechToText.v1.csproj]
55+
56+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.SpeechToText.v1\README.md]
57+
58+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1.csproj]
59+
60+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.csproj]
61+
62+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\README.md]
63+
64+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3.csproj]
65+
66+
[bumpversion:file:src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\README.md]
67+
68+
[bumpversion:file:src\IBM.WatsonDeveloperCloud\Constants.cs]
69+
70+
[bumpversion:file:src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj]
71+
72+
[bumpversion:file:src\IBM.WatsonDeveloperCloud\README.md]
73+
74+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Assistant.v1.IntegrationTests.csproj]
75+
76+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests\IBM.WatsonDeveloperCloud.Assistant.v1.UnitTests.csproj]
77+
78+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Conversation.v1.IntegrationTests.csproj]
79+
80+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests\IBM.WatsonDeveloperCloud.Conversation.v1.UnitTests.csproj]
81+
82+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests.csproj]
83+
84+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.Discovery.v1.UnitTests\IBM.WatsonDeveloperCloud.Discovery.v1.UnitTests.csproj]
85+
86+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests.csproj]
87+
88+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.UnitTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.UnitTests.csproj]
89+
90+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.IntegrationTests.csproj]
91+
92+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.UnitTests.csproj]
93+
94+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.IntTests\IBM.WatsonDeveloperCloud.NLU.v1.IntegrationTests.csproj]
95+
96+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1.UnitTests\IBM.WatsonDeveloperCloud.NLU.v1.UnitTests.csproj]
97+
98+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.NLC.v1.IntegrationTests\IBM.WatsonDeveloperCloud.NLC.v1.IntegrationTests.csproj]
99+
100+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntTests\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.IntTests.csproj]
101+
102+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.UnitTests\IBM.WatsonDeveloperCloud.PersonalityInsights.v3.UnitTests.csproj]
103+
104+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests\IBM.WatsonDeveloperCloud.SpeechToText.v1.IntegrationTests.csproj]
105+
106+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.TextToSpeech.v1.IntegrationTests\IBM.WatsonDeveloperCloud.TextToSpeech.v1.IntegrationTests.csproj]
107+
108+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.IntegrationTests\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.IntegrationTests.csproj]
109+
110+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.UnitTests\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3.UnitTests.csproj]
111+
112+
[bumpversion:file:test\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests\IBM.WatsonDeveloperCloud.VisualRecognition.v3.IntegrationTests.csproj]
113+
search = {current_version}
114+
replace = {new_version}

.releaserc

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"branch": "master",
3+
"verifyConditions": [],
4+
"prepare": [
5+
{
6+
"path": "@semantic-release/exec",
7+
"cmd": "bumpversion --current-version ${lastRelease.version} --new-version ${nextRelease.version} --verbose patch"
8+
}
9+
],
10+
"publish": [
11+
{
12+
"path": "@semantic-release/github"
13+
}
14+
]
15+
}

appveyor.yml

Lines changed: 100 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.3.{build}
1+
version: 2.6.{build}
22
branches:
33
except:
44
- gh-pages
@@ -9,13 +9,19 @@ clone_folder: C:\projects\dotnet-standard-sdk
99
environment:
1010
COVERALLS_REPO_TOKEN:
1111
secure: Dnsrk2n+VNE4swcbTLXpfnHwUwTWT8TqMiMkthU6mq/ohNq9dA2rrSA6kdLDBKME
12-
GH_TOKEN:
12+
WPS_GITHUB_TOKEN:
1313
secure: J0LjUlYl+lGJMLBcOgVF1m1I07nyr+8yFOMaNBA23RGLMJKvYnRlhmGWXp07ejgu
1414
CRED_SECRET:
1515
secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8=
16-
GITHUB_TOKEN:
16+
CREDENTIALS_GITHUB_TOKEN:
1717
secure: 8sr9qy9Ghr7IaCVsf0mvKITy6nb5RZaEScQ3VIPNMJxPzFCkZ688RHIOmW5qWWy5
18+
GITHUB_TOKEN:
19+
secure: +B2bs86RVtJtlbkB+cTf9bkqnNlFJi/PbBBPzR5jlUlLLZoOc+ZgqgQLwee4tCT+
1820
install:
21+
# Get the latest stable version of Node.js or io.js
22+
- ps: Install-Product node $env:nodejs_version
23+
# install modules
24+
- pip install --user bumpversion
1925
- cmd: >-
2026
rm -rf packages
2127
@@ -37,7 +43,7 @@ before_build:
3743
- ps: >-
3844
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
3945
{
40-
git clone https://$env:GITHUB_TOKEN@github.ibm.com/germanatt/sdk-credentials.git C:\projects\sdk-credentials
46+
git clone https://$env:CREDENTIALS_GITHUB_TOKEN@github.ibm.com/germanatt/sdk-credentials.git C:\projects\sdk-credentials
4147
}
4248
4349
dotnet restore
@@ -47,6 +53,9 @@ build:
4753
verbosity: minimal
4854
after_build:
4955
- ps: >-
56+
git config --global user.email "[email protected]"
57+
git config --global user.name "Watson Github Bot"
58+
5059
if(!$env:APPVEYOR_REPO_TAG_NAME)
5160
5261
{
@@ -59,20 +68,17 @@ after_build:
5968
$branchName = $env:APPVEYOR_REPO_TAG_NAME
6069
}
6170
62-
6371
Write-Output "branchName is " + $branchName
6472
6573
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
6674
{
67-
.\packages\Doxygen.1.8.13\tools\doxygen.exe Doxyfile
68-
69-
75+
7076
If($branchName -eq "development" -or $branchName -eq $env:APPVEYOR_REPO_TAG_NAME -or $branchName -eq "master")
7177
7278
{
73-
git config --global user.email "[email protected]"
74-
git config --global user.name "Watson Github Bot"
75-
git clone --quiet --branch=gh-pages https://$env:GH_TOKEN@github.com/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
79+
.\packages\Doxygen.1.8.14\tools\doxygen.exe Doxyfile
80+
81+
git clone --quiet --branch=gh-pages https://$env:WPS_GITHUB_TOKEN@github.com/watson-developer-cloud/dotnet-standard-sdk.git gh-pages
7682
7783
If(Test-Path -Path gh-pages\docs\$branchName)
7884
{
@@ -87,6 +93,32 @@ after_build:
8793
git commit -m "Updated documentation for $branchName"
8894
git push -f origin gh-pages
8995
cd ../
96+
97+
If($branchName -eq "master")
98+
99+
{
100+
Write-Output "branchName is master - building nuget packages"
101+
dotnet pack .\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj --configuration Release
102+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Assistant.v1\IBM.WatsonDeveloperCloud.Assistant.v1.csproj --configuration Release
103+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj --configuration Release
104+
dotnet pack .\src\IBM.WatsonDeveloperCloud.Discovery.v1\IBM.WatsonDeveloperCloud.Discovery.v1.csproj --configuration Release
105+
dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.csproj --configuration Release
106+
dotnet pack .\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\IBM.WatsonDeveloperCloud.LanguageTranslator.v3.csproj --configuration Release
107+
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1.csproj --configuration Release
108+
dotnet pack .\src\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1\IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1 --configuration Release
109+
dotnet pack .\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\IBM.WatsonDeveloperCloud.PersonalityInsights.v3 --configuration Release
110+
dotnet pack .\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\IBM.WatsonDeveloperCloud.SpeechToText.v1 --configuration Release
111+
dotnet pack .\src\IBM.WatsonDeveloperCloud.TextToSpeech.v1\IBM.WatsonDeveloperCloud.TextToSpeech.v1 --configuration Release
112+
dotnet pack .\src\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3\IBM.WatsonDeveloperCloud.ToneAnalyzer.v3 --configuration Release
113+
dotnet pack .\src\IBM.WatsonDeveloperCloud.VisualRecognition.v3\IBM.WatsonDeveloperCloud.VisualRecognition.v3 --configuration Release
114+
}
115+
116+
else
117+
118+
{
119+
Write-Output "branchName is not master - do not pack."
120+
}
121+
90122
}
91123
92124
else
@@ -104,7 +136,58 @@ after_build:
104136
105137
Copy-Item C:\projects\dotnet-standard-sdk\test\IBM.WatsonDeveloperCloud.LanguageTranslator.v2.IntegrationTests\glossary.tmx C:\projects\dotnet-standard-sdk\glossary.tmx
106138
test_script:
107-
- ps: "if($env:GITHUB_TOKEN)\n{\nif((Test-Path -Path coverage))\n{\n rm coverage -r -force\n}\nNew-Item -path . -name coverage -itemtype directory\nForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory)) { \n if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)\n {\n Write-Output \"No pull request number. Executing tests\"\n dotnet test $folder.FullName\n if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode ) }\n echo \"Test passed: $?\"\n echo \"LastExitCode: $LastExitCode\"\n $openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe' \n $targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'\n $filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'\n & $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'\n }\n else\n {\n Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping tests.\"\n }\n }\n\nC:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error\n\nif($env:COVERALLS_REPO_TOKEN)\n{\n C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths\n}\nelse\n{\n Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"\n}\n}"
139+
- ps: >-
140+
if(Test-Path -Path coverage)
141+
{
142+
rm coverage -r -force
143+
}
144+
145+
New-Item -path . -name coverage -itemtype directory
146+
147+
ForEach ($folder in (Get-ChildItem -Path C:\\projects\\dotnet-standard-sdk\\test -Directory))
148+
{
149+
if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
150+
{
151+
Write-Output \"No pull request number. Executing tests\"
152+
dotnet test $folder.FullName
153+
if($LastExitCode -ne 0)
154+
{
155+
$host.SetShouldExit($LastExitCode )
156+
}
157+
echo \"Test passed: $?\"
158+
echo \"LastExitCode: $LastExitCode\"
159+
$openCover = 'C:\\projects\\dotnet-standard-sdk\\packages\\OpenCover.4.6.519\\tools\\OpenCover.Console.exe'
160+
$targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'
161+
$filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
162+
& $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'
163+
164+
C:\\projects\\dotnet-standard-sdk\\packages\\ReportGenerator.2.4.5.0\\tools\\ReportGenerator.exe -reports:coverage\\coverage.xml -targetdir:coverage -verbosity:Error
165+
166+
if($env:COVERALLS_REPO_TOKEN)
167+
{
168+
C:\\projects\\dotnet-standard-sdk\\packages\\coveralls.net.0.7.0\\tools\\csmacnz.Coveralls.exe --opencover -i coverage\\coverage.xml --useRelativePaths
169+
}
170+
else
171+
{
172+
Write-Output \"There is no Coveralls Repo Token - not pushing coverage.\"
173+
}
174+
}
175+
else
176+
{
177+
Write-Output \"Pull request number is $env:APPVEYOR_PULL_REQUEST_NUMBER. Skipping integration tests.\"
178+
179+
if($folder.FullName.EndsWith("UnitTests"))
180+
{
181+
dotnet test $folder.FullName
182+
if($LastExitCode -ne 0)
183+
{
184+
$host.SetShouldExit($LastExitCode )
185+
}
186+
echo \"Test passed: $?\"
187+
echo \"LastExitCode: $LastExitCode\"
188+
}
189+
}
190+
}
108191
artifacts:
109192
- path: '\src\IBM.WatsonDeveloperCloud\bin\$(configuration)\*.nupkg'
110193
name: IBM.WatsonDeveloperCloud
@@ -114,6 +197,8 @@ artifacts:
114197
name: IBM.WatsonDeveloperCloud.Conversation.v1
115198
- path: '\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v2\bin\$(configuration)\*.nupkg'
116199
name: IBM.WatsonDeveloperCloud.LanguageTranslator.v2
200+
- path: '\src\IBM.WatsonDeveloperCloud.LanguageTranslator.v3\bin\$(configuration)\*.nupkg'
201+
name: IBM.WatsonDeveloperCloud.LanguageTranslator.v3
117202
- path: '\src\IBM.WatsonDeveloperCloud.PersonalityInsights.v3\bin\$(configuration)\*.nupkg'
118203
name: IBM.WatsonDeveloperCloud.PersonalityInsights.v3
119204
- path: '\src\IBM.WatsonDeveloperCloud.SpeechToText.v1\bin\$(configuration)\*.nupkg'
@@ -130,10 +215,13 @@ artifacts:
130215
name: IBM.WatsonDeveloperCloud.NaturalLanguageUnderstanding.v1
131216
- path: '\src\IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1\bin\$(configuration)\*.nupkg'
132217
name: IBM.WatsonDeveloperCloud.NaturalLanguageClassifier.v1
218+
before_deploy:
219+
- ps: npx semantic-release
133220
deploy:
134221
- provider: NuGet
135222
api_key:
136223
secure: jVMsvYb86JW+UMN2Gb2m1JazRkouGMzd58NHWxWVAY1BsQbehIU+YTxdsAeMo1qy
137224
on:
138225
branch: master
139226
APPVEYOR_REPO_TAG: true
227+

coverage.ps1

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
if((Test-Path -Path coverage))
1+
if(Test-Path -Path coverage)
22
{
33
Remove-Item .\coverage -recurse
44
}
@@ -21,21 +21,11 @@ Copy-Item .\test\IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests\Discover
2121

2222
$openCover = '.\packages\OpenCover.4.6.519\tools\OpenCover.Console.exe'
2323

24-
ForEach($projectFolder in (Get-ChildItem -Path .\src -Directory))
24+
ForEach ($folder in (Get-ChildItem -Path .\test -Directory))
2525
{
26-
$projectJson = $projectFolder.FullName + '\project.json'
27-
echo 'building ' $projectFolder.Name
28-
dotnet build $projectJson
29-
}
30-
31-
ForEach ($folder in (Get-ChildItem -Path .\test -Directory))
32-
{
33-
if(!$folder.Name.Contains("TextToSpeech"))
34-
{
35-
$targetArgs = '-targetargs: test \"' + $folder.FullName + '\" -c Debug -f netcoreapp1.0'
36-
$filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
37-
& $openCover '-target:C:\Program Files\dotnet\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\bin\Debug\netstandard1.6' '-output:coverage\coverage.xml'
38-
}
26+
$targetArgs = '-targetargs: test ' + $folder.FullName + ' -c Release -f netcoreapp1.0'
27+
$filter = '-filter:+[IBM.WatsonDeveloperCloud*]*-[*Tests*]*-[*Example*]*'
28+
& $openCover '-target:C:\\Program Files\\dotnet\\dotnet.exe' $targetArgs '-register:user' $filter '-oldStyle' '-mergeoutput' '-hideskipped:File' '-searchdirs:$testdir\\bin\\release\\netcoreapp1.0' '-output:coverage\\coverage.xml'
3929
}
4030

4131
$reportGenerator = '.\packages\ReportGenerator.2.4.5.0\tools\ReportGenerator.exe'

examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/IBM.WatsonDeveloperCloud.Conversation.v1.Example.csproj

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,16 @@
1313
<Version>2.6.0</Version>
1414
</PropertyGroup>
1515

16+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
17+
<DebugType>full</DebugType>
18+
<DebugSymbols>true</DebugSymbols>
19+
</PropertyGroup>
20+
21+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
22+
<DebugType>full</DebugType>
23+
<DebugSymbols>true</DebugSymbols>
24+
</PropertyGroup>
25+
1626
<ItemGroup>
1727
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud\IBM.WatsonDeveloperCloud.csproj" />
1828
<ProjectReference Include="..\..\src\IBM.WatsonDeveloperCloud.Conversation.v1\IBM.WatsonDeveloperCloud.Conversation.v1.csproj" />

0 commit comments

Comments
 (0)