Merge branch 'release/0.5.0'

* release/0.5.0: (GH-7) Added suggestions from audit
cake-contrib · Jun 20, 2018 · b2d18d9 · b2d18d9
2 parents 3fc6a1c + b75f9c8
commit b2d18d9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 22 deletions.
diff --git a/Source/Cake.Chocolatey.Module.Tests/Cake.Chocolatey.Module.Tests.csproj b/Source/Cake.Chocolatey.Module.Tests/Cake.Chocolatey.Module.Tests.csproj
@@ -5,10 +5,10 @@
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Cake.Core" Version="0.26.0">
+ <PackageReference Include="Cake.Core" Version="0.28.0">
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="Cake.Testing" Version="0.26.0">
+ <PackageReference Include="Cake.Testing" Version="0.28.0">
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />

diff --git a/Source/Cake.Chocolatey.Module/Cake.Chocolatey.Module.csproj b/Source/Cake.Chocolatey.Module/Cake.Chocolatey.Module.csproj
@@ -1,31 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
  <PropertyGroup>
- <TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
- <TargetFrameworkProfile />
+ <TargetFrameworks>netstandard2.0</TargetFrameworks>
+ <GenerateDocumentationFile>true</GenerateDocumentationFile>
  </PropertyGroup>
  <PropertyGroup>
  <CodeAnalysisRuleSet>Cake.Chocolatey.Module.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
- <DefineConstants>TRACE;DEBUG;net46;</DefineConstants>
- </PropertyGroup>
  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
  <DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
  </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
- <DocumentationFile>bin\Debug\net46\Cake.Chocolatey.Module.xml</DocumentationFile>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net46|AnyCPU'">
- <DocumentationFile>bin\Release\net46\Cake.Chocolatey.Module.xml</DocumentationFile>
- </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Cake.Core" Version="0.26.0" />
+ <PackageReference Include="Cake.Core" Version="0.28.0" PrivateAssets="All" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Net" />
- <Reference Include="System.Net.Http" />
- </ItemGroup>
 </Project>
diff --git a/nuspec/nuget/Cake.Chocolatey.Module.nuspec b/nuspec/nuget/Cake.Chocolatey.Module.nuspec
@@ -15,10 +15,8 @@
  <tags>Cake, Script, Build, Chocolatey, Module</tags>
  </metadata>
  <files>
- <file src="net46\Cake.Chocolatey.Module.dll" target="lib\net46" />
- <file src="net46\Cake.Chocolatey.Module.pdb" target="lib\net46" />
- <file src="net46\Cake.Chocolatey.Module.xml" target="lib\net46" />
  <file src="netstandard2.0\Cake.Chocolatey.Module.dll" target="lib/netstandard2.0" />
  <file src="netstandard2.0\Cake.Chocolatey.Module.pdb" target="lib/netstandard2.0" />
+ <file src="netstandard2.0\Cake.Chocolatey.Module.xml" target="lib/netstandard2.0" />
  </files>
 </package>