Now re-point the CI configs and build/package scripts.

keenlabs · Nov 11, 2017 · b92b201 · b92b201
1 parent a70f875
commit b92b201
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -96,13 +96,13 @@ test_script:
   #
   # Also use -oldStyle flag which uses an alternate instrumentation hook that is available for .NET Core
   # Some comments on this can be found here: https://github.com/OpenCover/opencover/issues/601
-  - .\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:dotnet.exe -targetargs:"test --logger \"trx;LogFileName=netstandard_test_results.xml\" .\Keen.NetStandard.Test\Keen.NetStandard.Test.csproj /property:DebugType=Full" -mergeoutput -output:coverage.xml -filter:"+[*]* -[*.Test]* -[Moq*]*" -oldStyle -returntargetcode -register:user
+  - .\tools\OpenCover.4.6.519\tools\OpenCover.Console.exe -target:dotnet.exe -targetargs:"test --logger \"trx;LogFileName=dotnetcore_test_results.xml\" .\Keen.Test\Keen.Test.csproj /property:DebugType=Full" -mergeoutput -output:coverage.xml -filter:"+[*]* -[*.Test]* -[Moq*]*" -oldStyle -returntargetcode -register:user
 
   # Upload merged coverage results from both test runs
   - .\tools\coveralls.net.0.8.0-unstable0013\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml
 
   # Upload netstandard test results to appveyor
-  - ps: (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\Keen.NetStandard.Test\TestResults\netstandard_test_results.xml))
+  - ps: (New-Object 'System.Net.WebClient').UploadFile("https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\Keen.Test\TestResults\dotnetcore_test_results.xml))
 
 #---------------------------------#
 #         notifications           #

diff --git a/.travis.yml b/.travis.yml
@@ -19,5 +19,5 @@ osx_image: xcode8.3
 
 # Build and run the Keen.NetStandard project and run its tests
 script: |
-  cd Keen.NetStandard.Test
+  cd Keen.Test
   dotnet test
diff --git a/NewSemVer.ps1 b/NewSemVer.ps1
@@ -48,7 +48,7 @@ function Update-AssemblyVersionAttributes ([string] $version) {
     $majMinPatchVersion = Get-MajMinPatchVersion($version)
     $newNetStandardVersion = "<Version>$majMinPatchVersion</Version>"
 
-    Get-ChildItem -r -filter .\* -Include Keen.NetStandard.csproj | ForEach-Object {
+    Get-ChildItem -r -filter .\* -Include Keen.csproj | ForEach-Object {
         $filename = $_.Directory.ToString() + [IO.Path]::DirectorySeparatorChar + $_.Name
         "Setting version to $version in $filename"
 
@@ -71,7 +71,7 @@ Update-AssemblyVersionAttributes $version
 
 
 # Create another .nupkg for the .NET Standard stuff based on the .csproj, which will be the only .nupkg going forward
-& pushd .\Keen.NetStandard
+& pushd .\Keen
 & dotnet clean
 & dotnet pack -c Release
 & popd