Merge branch 'develop'

cake-contrib · Mar 14, 2018 · 7ea9d5e · 7ea9d5e
2 parents ecc8757 + c28c8e0
commit 7ea9d5e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -7,7 +7,7 @@ Cake addin that extends Cake for creating and deploying SQL Server databases and
 
 |Develop|Master|
 |:--:|:--:|
-|[![Build status](https://ci.appveyor.com/api/projects/status/fexosj1c5ho9f2kd/branch/develop?svg=true)](https://ci.appveyor.com/project/RLittlesII/cake-sqlpackage/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/fexosj1c5ho9f2kd/branch/develop?svg=true)](https://ci.appveyor.com/project/RLittlesII/cake-sqlpackage/branch/master)|
+|[![Build status](https://ci.appveyor.com/api/projects/status/fexosj1c5ho9f2kd/branch/develop?svg=true)](https://ci.appveyor.com/project/RLittlesII/cake-sqlpackage/branch/develop)|[![Build status](https://ci.appveyor.com/api/projects/status/fexosj1c5ho9f2kd/branch/master?svg=true)](https://ci.appveyor.com/project/RLittlesII/cake-sqlpackage/branch/master)|
 
 | Nuget |
 | :--: |

diff --git a/nuspec/nuget/Cake.SqlPackage.nuspec b/nuspec/nuget/Cake.SqlPackage.nuspec
@@ -12,13 +12,13 @@
         <projectUrl>https://github.com/RLittlesII/Cake.SqlPackage</projectUrl>
         <iconUrl>https://cdn.rawgit.com/cake-contrib/graphics/a5cf0f881c390650144b2243ae551d5b9f836196/png/cake-contrib-medium.png</iconUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <copyright>Copyright (c) Rodney Littles II 2017</copyright>
+        <copyright>Copyright (c) Rodney Littles II 2018</copyright>
         <tags>Cake Script SQL DACPAC</tags>
     </metadata>    
     <files>
-       <file src="net46\Cake.SqlPackage.dll" target="lib/net46" /> 
-        <file src="net46\Cake.SqlPackage.pdb" target="lib/net46" />
-       <file src="netstandard1.6\Cake.SqlPackage.dll" target="lib/netstandard1.6" /> 
-        <file src="netstandard1.6\Cake.SqlPackage.pdb" target="lib/netstandard1.6" />
+      <file src="net46\Cake.SqlPackage.dll" target="lib/net46" /> 
+      <file src="net46\Cake.SqlPackage.pdb" target="lib/net46" />
+      <file src="netstandard2.0\Cake.SqlPackage.dll" target="lib/netstandard2.0" />
+      <file src="netstandard2.0\Cake.SqlPackage.pdb" target="lib/netstandard2.0" />
     </files>
 </package>
diff --git a/src/Cake.SqlPackage/Cake.SqlPackage.csproj b/src/Cake.SqlPackage/Cake.SqlPackage.csproj
@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <VersionPrefix>0.0.0</VersionPrefix>
-    <TargetFrameworks>net46;netstandard1.6</TargetFrameworks>
+    <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Cake.SqlPackage</AssemblyName>
     <PackageId>Cake.SqlPackage</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <Copyright>Copyright 2017 (c) Rodney Littles II and contributors</Copyright>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/RLittlesII/Cake.SqlPackage</PackageProjectUrl>
@@ -18,20 +17,8 @@
     <PackageLicenseUrl>https://raw.githubusercontent.com/RLittlesII/blob/master/LICENSE</PackageLicenseUrl>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net452|AnyCPU'">
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|AnyCPU'">
-    <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net45|AnyCPU'">
-    <DocumentationFile>obj\Release\net45\Cake.SqlPackage.xml</DocumentationFile>
-  </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="Cake.Core" Version="0.23.0">
+    <PackageReference Include="Cake.Core" Version="0.26.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
   </ItemGroup>

diff --git a/test/Cake.SqlPackage.UnitTests/Cake.SqlPackage.UnitTests.csproj b/test/Cake.SqlPackage.UnitTests/Cake.SqlPackage.UnitTests.csproj
@@ -1,17 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+ <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
+    <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <RuntimeFrameworkVersion>2.0.3</RuntimeFrameworkVersion>
     <AssemblyName>Cake.SqlPackage.UnitTests</AssemblyName>
     <PackageId>Cake.SqlPackage.UnitTests</PackageId>
   </PropertyGroup>
 
   <PropertyGroup>
     <PackageTargetFallback Condition="'$(TargetFramework)' == 'netcoreapp1.0'">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
     <PackageTargetFallback Condition="'$(TargetFramework)' == 'netstandard1.6'">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
-    <RuntimeFrameworkVersion Condition="'$(TargetFramework)' == 'netcoreapp1.0'">1.0.4</RuntimeFrameworkVersion>
-    <NetStandardImplicitPackageVersion Condition="'$(TargetFramework)' == 'netcoreapp1.0'">1.6.0</NetStandardImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion Condition="'$(TargetFramework)' == 'netcoreapp2.0'">2.0.3</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
   <!-- Runtime identifiers for standalone build -->
@@ -23,8 +22,8 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
     <PackageReference Include="xunit" Version="2.3.0-beta2-build3683" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta2-build1317" />
-    <PackageReference Include="Cake.Core" Version="0.23.0" />
-    <PackageReference Include="Cake.Testing" Version="0.23.0" />
+    <PackageReference Include="Cake.Core" Version="0.26.0" />
+    <PackageReference Include="Cake.Testing" Version="0.26.0" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta2-build3683" />
   </ItemGroup>
 
@@ -41,7 +40,7 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.6'">
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
     <DefineConstants>$(DefineConstants);NETCORE</DefineConstants>
     <DebugType>portable</DebugType>
   </PropertyGroup>