Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(GH-13) Target .NET Standard 2.0 and build against Cake 0.26.0 #14

Merged
merged 2 commits into from
Mar 7, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions nuspec/nuget/Cake.Issues.Testing.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Common helpers for testing add-ins based on Cake.Issues
<file src="net46\Cake.Issues.Testing.dll" target="lib\net46" />
<file src="net46\Cake.Issues.Testing.pdb" target="lib\net46" />
<file src="net46\Cake.Issues.Testing.xml" target="lib\net46" />
<file src="netstandard1.6\Cake.Issues.Testing.dll" target="lib\netstandard1.6" />
<file src="netstandard1.6\Cake.Issues.Testing.pdb" target="lib\netstandard1.6" />
<file src="netstandard1.6\Cake.Issues.Testing.xml" target="lib\netstandard1.6" />
<file src="netstandard2.0\Cake.Issues.Testing.dll" target="lib\netstandard2.0" />
<file src="netstandard2.0\Cake.Issues.Testing.pdb" target="lib\netstandard2.0" />
<file src="netstandard2.0\Cake.Issues.Testing.xml" target="lib\netstandard2.0" />
</files>
</package>
6 changes: 3 additions & 3 deletions nuspec/nuget/Cake.Issues.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ See the Project Site for an overview of the whole ecosystem of addins for workin
<file src="net46\Cake.Issues.dll" target="lib\net46" />
<file src="net46\Cake.Issues.pdb" target="lib\net46" />
<file src="net46\Cake.Issues.xml" target="lib\net46" />
<file src="netstandard1.6\Cake.Issues.dll" target="lib\netstandard1.6" />
<file src="netstandard1.6\Cake.Issues.pdb" target="lib\netstandard1.6" />
<file src="netstandard1.6\Cake.Issues.xml" target="lib\netstandard1.6" />
<file src="netstandard2.0\Cake.Issues.dll" target="lib\netstandard2.0" />
<file src="netstandard2.0\Cake.Issues.pdb" target="lib\netstandard2.0" />
<file src="netstandard2.0\Cake.Issues.xml" target="lib\netstandard2.0" />
</files>
</package>
12 changes: 6 additions & 6 deletions src/Cake.Issues.Testing/Cake.Issues.Testing.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<Description>Common helpers for testing addins based on Cake.Issues</Description>
<Authors>BBT Software AG</Authors>
<Company>BBT Software AG</Company>
Expand All @@ -15,12 +15,12 @@
<CodeAnalysisRuleSet>..\Cake.Issues.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
<DocumentationFile>bin\Debug\netstandard1.6\Cake.Issues.Testing.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Debug\netstandard2.0\Cake.Issues.Testing.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
<DocumentationFile>bin\Release\netstandard1.6\Cake.Issues.Testing.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Release\netstandard2.0\Cake.Issues.Testing.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
Expand All @@ -32,7 +32,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="0.22.0" />
<PackageReference Include="Cake.Core" Version="0.26.0" />
<PackageReference Include="Desktop.Analyzers" Version="1.1.0" />
<PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="1.1.0" />
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.Issues.Tests/Cake.Issues.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
<PackageReference Include="Cake.Core" Version="0.22.0" />
<PackageReference Include="Cake.Testing" Version="0.22.0" />
<PackageReference Include="Cake.Core" Version="0.26.0" />
<PackageReference Include="Cake.Testing" Version="0.26.0" />
<PackageReference Include="Shouldly" Version="2.8.3" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="xunit" Version="2.3.1" />
Expand Down
12 changes: 6 additions & 6 deletions src/Cake.Issues/Cake.Issues.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<Description>Addin for reading code analyzer or linter issues for the Cake build automation system</Description>
<Authors>BBT Software AG</Authors>
<Company>BBT Software AG</Company>
Expand All @@ -14,12 +14,12 @@
<CodeAnalysisRuleSet>..\Cake.Issues.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard1.6|AnyCPU'">
<DocumentationFile>bin\Debug\netstandard1.6\Cake.Issues.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Debug\netstandard2.0\Cake.Issues.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
<DocumentationFile>bin\Release\netstandard1.6\Cake.Issues.xml</DocumentationFile>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Release\netstandard2.0\Cake.Issues.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
Expand All @@ -31,7 +31,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="0.22.0" />
<PackageReference Include="Cake.Core" Version="0.26.0" />
<PackageReference Include="Desktop.Analyzers" Version="1.1.0" />
<PackageReference Include="Microsoft.AnalyzerPowerPack" Version="1.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="1.1.0" />
Expand Down