Merge pull request #75 from csMACnz/release-1.0.0

update develop with latest 1.0.0 beta changes
csMACnz · May 26, 2018 · d283b7c · d283b7c
2 parents 48bc2d2 + 3c56457
commit d283b7c
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -18,5 +18,5 @@ install:
 script:
   - dotnet build ./csmacnz.Coveralls.sln -c Release
   - dotnet test ./src/csmacnz.Coveralls.Tests/csmacnz.Coveralls.Tests.csproj -c Release
-  - dotnet publish ./src/csmacnz.Coveralls/csmacnz.Coveralls.csproj -f netcoreapp2.0 -c Release -o "/home/travis/build/csMACnz/coveralls.net/Package/Archive/linux" -r linux-x64
+  - dotnet publish ./src/csmacnz.Coveralls/csmacnz.Coveralls.csproj -f netcoreapp2.1 -c Release -o "/home/travis/build/csMACnz/coveralls.net/Package/Archive/linux" -r linux-x64
   - dotnet test ./src/csmacnz.Coveralls.Tests.Integration/csmacnz.Coveralls.Tests.Integration.csproj -c Release
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/csmacnz.Coveralls/bin/Debug/netcoreapp2.0/csmacnz.Coveralls.dll",
+            "program": "${workspaceFolder}/src/csmacnz.Coveralls/bin/Debug/netcoreapp2.1/csmacnz.Coveralls.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/csmacnz.Coveralls",
             // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window

diff --git a/default.ps1 b/default.ps1
@@ -267,9 +267,9 @@ task archive-only {
         Remove-Item $osx_archive_filename
     }
     mkdir $archive_dir
-    dotnet publish $app_project -f netcoreapp2.0 -c $configuration -o "$archive_dir\windows" -r win-x64
-    dotnet publish $app_project -f netcoreapp2.0 -c $configuration -o "$archive_dir\linux" -r linux-x64
-    dotnet publish $app_project -f netcoreapp2.0 -c $configuration -o "$archive_dir\osx" -r osx-x64
+    dotnet publish $app_project -f netcoreapp2.1 -c $configuration -o "$archive_dir\windows" -r win-x64
+    dotnet publish $app_project -f netcoreapp2.1 -c $configuration -o "$archive_dir\linux" -r linux-x64
+    dotnet publish $app_project -f netcoreapp2.1 -c $configuration -o "$archive_dir\osx" -r osx-x64
 
     Add-Type -assembly "system.io.compression.filesystem"
 

diff --git a/src/csmacnz.Coveralls.Tests.Integration/CoverallsTestRunner.cs b/src/csmacnz.Coveralls.Tests.Integration/CoverallsTestRunner.cs
@@ -68,7 +68,7 @@ private static string GetCoverallsDll()
 #else
             var configuration = "Release";
 #endif
-            return Path.Combine("..", "..", "..", "..", "csmacnz.Coveralls", "bin", configuration, "netcoreapp2.0", "csmacnz.Coveralls.dll");
+            return Path.Combine("..", "..", "..", "..", "csmacnz.Coveralls", "bin", configuration, "netcoreapp2.1", "csmacnz.Coveralls.dll");
         }
     }
 }
diff --git a/src/csmacnz.Coveralls.Tests.Integration/csmacnz.Coveralls.Tests.Integration.csproj b/src/csmacnz.Coveralls.Tests.Integration/csmacnz.Coveralls.Tests.Integration.csproj
@@ -3,7 +3,7 @@
 <PropertyGroup>
     <Description>Integration Tests for csmacnz.Coveralls</Description>
     <AssemblyTitle>Integration Tests for csmacnz.Coveralls</AssemblyTitle>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <AssemblyName>csmacnz.Coveralls.Tests.Integration</AssemblyName>
     <PackageId>csmacnz.Coveralls.Tests.Integration</PackageId>
     <PackageLicenseUrl>https://github.com/csMACnz/BCLExtensions/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/csmacnz.Coveralls.Tests/csmacnz.Coveralls.Tests.csproj b/src/csmacnz.Coveralls.Tests/csmacnz.Coveralls.Tests.csproj
@@ -3,7 +3,7 @@
 <PropertyGroup>
     <Description>Tests for csmacnz.Coveralls</Description>
     <AssemblyTitle>Tests for csmacnz.Coveralls</AssemblyTitle>
-    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1</TargetFrameworks>
     <AssemblyName>csmacnz.Coveralls.Tests</AssemblyName>
     <PackageId>csmacnz.Coveralls.Tests</PackageId>
     <PackageLicenseUrl>https://github.com/csMACnz/BCLExtensions/blob/master/LICENSE</PackageLicenseUrl>

diff --git a/src/csmacnz.Coveralls/csmacnz.Coveralls.csproj b/src/csmacnz.Coveralls/csmacnz.Coveralls.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>csmacnz.Coveralls</RootNamespace>
     <AssemblyName>csmacnz.Coveralls</AssemblyName>
     <AssemblyTitle>csmacnz.Coveralls</AssemblyTitle>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <Title>coveralls.net - Coveralls.io uploader for .NET Code Coverage</Title>
     <Description>Coveralls.io uploader for .NET Code Coverage. Supports opencover and visual studio's codecoverage.exe on windows, and monocov for mono</Description>