Skip to content

Commit

Permalink
Merge branch 'release/1.1.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
nils-a committed Sep 21, 2021
2 parents 3ba696a + 51ea997 commit 01040e4
Show file tree
Hide file tree
Showing 35 changed files with 327 additions and 334 deletions.
18 changes: 0 additions & 18 deletions .github/dependabot.yml

This file was deleted.

16 changes: 16 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [ "github>nils-a/renovate-config" ],
"packageRules": [
{
"matchPackageNames": [
"cake.tool",
"Cake.Core",
"Microsoft.Build",
"Microsoft.Build.Framework",
"Microsoft.Build.Utilities.Core"
],
"enabled": false
}
]
}
13 changes: 0 additions & 13 deletions .github/workflows/dependabot-cake.yml

This file was deleted.

2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ or add the `PackageReference` manually

See [NuGet](https://www.nuget.org/packages/CakeContrib.Guidelines/) for the current version.

CakeContrib.Guidelines requires the use of `msbuild` version 16.8.0 or later.

## Guidelines

All [guidelines](https://cake-contrib.github.io/CakeContrib.Guidelines/guidelines) and [rules](https://cake-contrib.github.io/CakeContrib.Guidelines/rules) are documented at <https://cake-contrib.github.io/CakeContrib.Guidelines/>
Expand Down
10 changes: 4 additions & 6 deletions docs/input/_Bottom.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@
<i class="fa fa-github"></i>
GitHub
</a>
<script>
((window.gitter = {}).chat = {}).options = {
room: 'cake-contrib/Lobby'
};
</script>
<script src="https://sidecar.gitter.im/dist/sidecar.v1.js" async defer></script>
<a class="discussion-button" href="https://github.com/cake-build/cake/discussions" target="_blank">
<i class="fa fa-github"></i>
Discussion
</a>

<script type="text/javascript" src="@Context.GetLink("/assets/js/anchor.min.js")"></script>
<script type="text/javascript" src="@Context.GetLink("/assets/js/clipboard.min.js")"></script>
Expand Down
49 changes: 27 additions & 22 deletions docs/input/assets/css/override.less
Original file line number Diff line number Diff line change
Expand Up @@ -97,36 +97,41 @@ pre:hover .btn-copy {

@font-family-sans-serif: "Roboto", Helvetica, Arial, sans-serif;

/* For Gitter and GitHub */
/* For GitHub */
.bottom-footer {
margin-bottom: 40px !important; // Make room for Gitter and GitHub buttons
margin-bottom: 40px !important; // Make room for GitHub buttons
}

.gitter-open-chat-button {
background-color: #3c8dbc;
font-family: @font-family-sans-serif;
letter-spacing: normal;
right: 90px;
}

.gitter-open-chat-button:focus, .gitter-open-chat-button:hover,
.github-button:focus, .github-button:hover,
{
background-color: #4EABDD;
.github-button {
z-index: 100;
position: fixed;
bottom: 0px;
right: 255px;
padding: 1em 3em;
background-color: #367fa9;
border: 0;
border-top-left-radius: 0.5em;
border-top-right-radius: 0.5em;
font-family: sans-serif;
font-size: 9pt;
text-transform: uppercase;
text-align: center;
text-decoration: none;
cursor: pointer;
cursor: hand;
-webkit-transition: all .3s ease;
transition: all .3s ease;
color: #fff;
a, a:active, a:hover, a:focus {
color: #fff;
}
}

.gitter-chat-embed {
top: 49px;
border-top: 1px solid #000;
z-index: 10000;
}

.github-button {
.discussion-button {
z-index: 100;
position: fixed;
bottom: 0px;
right: 240px;
right: 80px;
padding: 1em 3em;
background-color: #367fa9;
border: 0;
Expand All @@ -145,4 +150,4 @@ pre:hover .btn-copy {
a, a:active, a:hover, a:focus {
color: #fff;
}
}
}
11 changes: 10 additions & 1 deletion docs/input/index.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ NoGutter: true

<div class="container text-center">
<div class="row slideanim">
<div class="col-sm-4">
<div class="col-xs-8 col-xs-offset-2 col-md-6 col-md-offset-3">
<span class="glyphicon glyphicon-heart logo-small"></span>
<h3 class="no-anchor">Open-Source</h3>
<p>
Expand All @@ -26,4 +26,13 @@ NoGutter: true
</p>
</div>
</div>
<div class="row slideanim">
<div class="col-xs-8 col-xs-offset-2 col-md-6 col-md-offset-3">
<span class="glyphicon glyphicon-wrench logo-small"></span>
<h3 class="no-anchor">Prerequisites</h3>
<p>
Using CakeContrib.Guidelines requires msbuild version 16.8.0 or later.
</p>
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion src/Guidelines/Guidelines.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net472</TargetFrameworks>
<IncludeBuildOutput>false</IncludeBuildOutput>
<IsPackageble>true</IsPackageble>
<IsPackable>true</IsPackable>
</PropertyGroup>

<PropertyGroup>
Expand Down
7 changes: 7 additions & 0 deletions src/Guidelines/build/CakeContrib.Guidelines.targets
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,11 @@
</CreateProperty>
</Target>

<Target Name="EnsureCorrectMsBuildVersion">
<PropertyGroup>
<RequiredMinimumVersion>16.8.0</RequiredMinimumVersion>
</PropertyGroup>
<Error Condition="$(MSBuildVersion) &lt; $(RequiredMinimumVersion)"
Text='CakeContrib.Guidelines needs at least MSBuild version $(RequiredMinimumVersion). (Current version: $(MSBuildVersion))' />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/Guidelines/build/Icon.targets
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Target Name="_EnsureCakeContribGuidelinesIcon"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild;SetNuspecProperties;GenerateNuspec;_GetPackageFiles"
DependsOnTargets="EnsureProjectTypeIsSet">
DependsOnTargets="EnsureProjectTypeIsSet;EnsureCorrectMsBuildVersion">
<PropertyGroup>
<CakeContribIconPath>$(MSBuildThisFileDirectory)/../images/cake-contrib-community-medium.png</CakeContribIconPath>
<CakeContribIconPath
Expand Down
3 changes: 2 additions & 1 deletion src/Guidelines/build/PrivateAssets.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
<Target
Name="_CheckPrivateAssets"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild">
BeforeTargets="CoreBuild"
DependsOnTargets="EnsureCorrectMsBuildVersion">
<ItemGroup>
<CakeContribGuidelinesPrivateReference Include="Cake.Core" />
<CakeContribGuidelinesPrivateReference Include="Cake.Common" />
Expand Down
2 changes: 1 addition & 1 deletion src/Guidelines/build/RecommendedCakeVersion.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Target Name="_checkRecommendedCakeVersion"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild"
DependsOnTargets="EnsureProjectTypeIsSet">
DependsOnTargets="EnsureProjectTypeIsSet;EnsureCorrectMsBuildVersion">
<ItemGroup>
<CakeReferenceToCheck Include="cake.core" />
<CakeReferenceToCheck Include="cake.common" />
Expand Down
2 changes: 1 addition & 1 deletion src/Guidelines/build/RecommendedTags.targets
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Target Name="_checkRecommendedTags"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild"
DependsOnTargets="EnsureProjectTypeIsSet"
DependsOnTargets="EnsureProjectTypeIsSet;EnsureCorrectMsBuildVersion"
Condition="$(IsPackable) != 'false'">
<ItemGroup>
<RecommendedTag Include="cake" />
Expand Down
2 changes: 1 addition & 1 deletion src/Guidelines/build/RequiredFiles.targets
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
Name="_CheckRequiredFiles"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild"
DependsOnTargets="EnsureProjectTypeIsSet">
DependsOnTargets="EnsureProjectTypeIsSet;EnsureCorrectMsBuildVersion">

<RequiredFileEditorconfig
OmitFiles="@(CakeContribGuidelinesOmitRecommendedConfigFile)"
Expand Down
2 changes: 1 addition & 1 deletion src/Guidelines/build/RequiredReferences.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Name="_CheckRequiredReferences"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild"
DependsOnTargets="EnsureProjectTypeIsSet">
DependsOnTargets="EnsureProjectTypeIsSet;EnsureCorrectMsBuildVersion">
<ItemGroup>
<CakeContribGuidelinesRequiredReference Include="StyleCop.Analyzers" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Guidelines/build/TargetFrameworkVersions.targets
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
Name="_CheckTargetFrameworkVersions"
AfterTargets="BeforeBuild"
BeforeTargets="CoreBuild"
DependsOnTargets="EnsureProjectTypeIsSet">
DependsOnTargets="EnsureProjectTypeIsSet;EnsureCorrectMsBuildVersion">

<!-- All other rules have some "configuration" here, this rules required/suggested targets are hard-coded in the task. Sadly. -->

Expand Down
Loading

0 comments on commit 01040e4

Please sign in to comment.