Skip to content

Commit

Permalink
Merge branch 'feature/version-upgrades' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ashthos
Ashthos committed Oct 4, 2017
2 parents f513e07 + 89c9f3e commit 8706e32
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 32 deletions.
21 changes: 15 additions & 6 deletions Cake.Stylecop/Cake.StyleCop.csproj
View file
Expand Up @@ -9,8 +9,9 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Cake.StyleCop</RootNamespace>
<AssemblyName>Cake.StyleCop</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand All @@ -32,12 +33,12 @@
<DocumentationFile>bin\Release\Cake.StyleCop.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cake.Common, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Common.0.17.0\lib\net45\Cake.Common.dll</HintPath>
<Reference Include="Cake.Common, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Common.0.22.0\lib\net46\Cake.Common.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Cake.Core, Version=0.17.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.17.0\lib\net45\Cake.Core.dll</HintPath>
<Reference Include="Cake.Core, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.22.0\lib\net46\Cake.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="StyleCop">
Expand Down Expand Up @@ -72,8 +73,13 @@
<Compile Include="StyleCopSettingsExtensions.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Cake.Stylecop.nuspec" />
<None Include="Cake.Stylecop.nuspec">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="Stylecop.xss">
<DependentUpon>Stylecop.xsd</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<Content Include="resources\error.png">
Expand All @@ -94,6 +100,9 @@
<Content Include="StylecopStyleSheet.xslt">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="Stylecop.xsc">
<DependentUpon>Stylecop.xsd</DependentUpon>
</None>
<None Include="Stylecop.xsd" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
24 changes: 12 additions & 12 deletions Cake.Stylecop/Cake.StyleCop.nuspec
View file
Expand Up @@ -15,16 +15,16 @@
<tags>Cake StyleCop</tags>
</metadata>
<files>
<file src="bin/Release/StyleCopStyleSheet.xslt" target="lib/net45" />
<file src="bin/Release/StyleCop.dll" target="lib/net45" />
<file src="bin/Release/StyleCop.CSharp.dll" target="lib/net45" />
<file src="bin/Release/StyleCop.CSharp.Rules.dll" target="lib/net45" />
<file src="bin/Release/Cake.StyleCop.dll" target="lib/net45" />
<file src="bin/Release/Cake.StyleCop.XML" target="lib/net45" />
<file src="bin/Release/resources/error.png" target="lib/net45/resources" />
<file src="bin/Release/resources/minus.png" target="lib/net45/resources" />
<file src="bin/Release/resources/plus.png" target="lib/net45/resources" />
<file src="bin/Release/resources/report.js" target="lib/net45/resources" />
<file src="bin/Release/resources/stylecop.css" target="lib/net45/resources" />
<file src="bin/Release/StyleCopStyleSheet.xslt" target="lib\net46" />
<file src="bin/Release/StyleCop.dll" target="lib\net46" />
<file src="bin/Release/StyleCop.CSharp.dll" target="lib\net46" />
<file src="bin/Release/StyleCop.CSharp.Rules.dll" target="lib\net46" />
<file src="bin/Release/Cake.StyleCop.dll" target="lib\net46" />
<file src="bin/Release/Cake.StyleCop.XML" target="lib\net46" />
<file src="bin/Release/resources/error.png" target="lib\net46\resources" />
<file src="bin/Release/resources/minus.png" target="lib\net46\resources" />
<file src="bin/Release/resources/plus.png" target="lib\net46\resources" />
<file src="bin/Release/resources/report.js" target="lib\net46\resources" />
<file src="bin/Release/resources/stylecop.css" target="lib\net46\resources" />
</files>
</package>
</package>
6 changes: 3 additions & 3 deletions Cake.Stylecop/packages.config
View file
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake.Common" version="0.17.0" targetFramework="net45" />
<package id="Cake.Core" version="0.17.0" targetFramework="net45" />
<package id="StyleCop.MSBuild" version="4.7.55.0" targetFramework="net45" />
<package id="Cake.Common" version="0.22.0" targetFramework="net46" />
<package id="Cake.Core" version="0.22.0" targetFramework="net46" />
<package id="StyleCop.MSBuild" version="4.7.55.0" targetFramework="net46" />
</packages>
8 changes: 2 additions & 6 deletions build.cake
View file
Expand Up @@ -47,12 +47,8 @@ const string Configuration = "Release";
Information("Restoring Nuget Packages");
NuGetRestore(solutionFile);
var settings = new MSBuildSettings();
settings.Configuration = Configuration;
settings.WithTarget("build");
Information("Compiling Solution");
MSBuild(solutionFile, settings);
DotNetBuild(solutionFile, settings => settings.SetConfiguration(Configuration).WithTarget("build"));
});

Expand Down Expand Up @@ -102,7 +98,7 @@ const string Configuration = "Release";
.Does(() => {
var nuGetPackSettings = new NuGetPackSettings {
Version = "1.1.3",
Version = "1.1.4",
BasePath = "./Cake.StyleCop",
OutputDirectory = nupkgDestDir
};
Expand Down
6 changes: 1 addition & 5 deletions build.ps1
View file
Expand Up @@ -5,14 +5,11 @@
##########################################################################

<#
.SYNOPSIS
This is a Powershell script to bootstrap a Cake build.
.DESCRIPTION
This Powershell script will download NuGet if missing, restore NuGet tools (including Cake)
and execute your Cake build script with the parameters you provide.
.PARAMETER Script
The build script to execute.
.PARAMETER Target
Expand All @@ -35,12 +32,11 @@ Remaining arguments are added here.
.LINK
http://cakebuild.net
#>

[CmdletBinding()]
Param(
[string]$Script = "build.cake",
[string]$Script = "./build.cake",
[string]$Target = "Default",
[ValidateSet("Release", "Debug")]
[string]$Configuration = "Release",
Expand Down

0 comments on commit 8706e32

Please sign in to comment.