Skip to content

Commit 09ad11b

Browse files
authored
Merge pull request #11 from nmbro/cake26
Cake.Core 0.26.0
2 parents ddb8b8f + 0694d6a commit 09ad11b

File tree

5 files changed

+118
-25
lines changed

5 files changed

+118
-25
lines changed

.gitignore

Lines changed: 103 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
3+
##
4+
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
35

46
# User-specific files
57
*.suo
68
*.user
79
*.userosscache
810
*.sln.docstates
9-
.appveyorapitoken
1011

1112
# User-specific files (MonoDevelop/Xamarin Studio)
1213
*.userprefs
@@ -21,12 +22,16 @@ x86/
2122
bld/
2223
[Bb]in/
2324
[Oo]bj/
25+
[Ll]og/
2426

25-
# Visual Studio 2015 cache/options directory
27+
# Visual Studio 2015/2017 cache/options directory
2628
.vs/
2729
# Uncomment if you have tasks that create the project's static files in wwwroot
2830
#wwwroot/
2931

32+
# Visual Studio 2017 auto generated files
33+
Generated\ Files/
34+
3035
# MSTest test Results
3136
[Tt]est[Rr]esult*/
3237
[Bb]uild[Ll]og.*
@@ -40,10 +45,19 @@ TestResult.xml
4045
[Rr]eleasePS/
4146
dlldata.c
4247

43-
# DNX
48+
# Benchmark Results
49+
BenchmarkDotNet.Artifacts/
50+
51+
# .NET Core
4452
project.lock.json
53+
project.fragment.lock.json
4554
artifacts/
55+
**/Properties/launchSettings.json
4656

57+
# StyleCop
58+
StyleCopReport.xml
59+
60+
# Files built by Visual Studio
4761
*_i.c
4862
*_p.c
4963
*_i.h
@@ -80,13 +94,18 @@ ipch/
8094
*.opensdf
8195
*.sdf
8296
*.cachefile
97+
*.VC.db
98+
*.VC.VC.opendb
8399

84100
# Visual Studio profiler
85101
*.psess
86102
*.vsp
87103
*.vspx
88104
*.sap
89105

106+
# Visual Studio Trace Files
107+
*.e2e
108+
90109
# TFS 2012 Local Workspace
91110
$tf/
92111

@@ -107,6 +126,14 @@ _TeamCity*
107126
# DotCover is a Code Coverage Tool
108127
*.dotCover
109128

129+
# AxoCover is a Code Coverage Tool
130+
.axoCover/*
131+
!.axoCover/settings.json
132+
133+
# Visual Studio code coverage results
134+
*.coverage
135+
*.coveragexml
136+
110137
# NCrunch
111138
_NCrunch_*
112139
.*crunch*.local.xml
@@ -138,19 +165,27 @@ publish/
138165
# Publish Web Output
139166
*.[Pp]ublish.xml
140167
*.azurePubxml
141-
# TODO: Comment the next line if you want to checkin your web deploy settings
168+
# Note: Comment the next line if you want to checkin your web deploy settings,
142169
# but database connection strings (with potential passwords) will be unencrypted
143170
*.pubxml
144171
*.publishproj
145172

173+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
174+
# checkin your Azure Web App publish settings, but sensitive information contained
175+
# in these scripts will be unencrypted
176+
PublishScripts/
177+
146178
# NuGet Packages
147179
*.nupkg
148180
# The packages folder can be ignored because of Package Restore
149-
**/packages/*
181+
**/[Pp]ackages/*
150182
# except build/, which is used as an MSBuild target.
151-
!**/packages/build/
183+
!**/[Pp]ackages/build/
152184
# Uncomment if necessary however generally it will be regenerated when needed
153-
#!**/packages/repositories.config
185+
#!**/[Pp]ackages/repositories.config
186+
# NuGet v3's project.json files produces more ignorable files
187+
*.nuget.props
188+
*.nuget.targets
154189

155190
# Microsoft Azure Build Output
156191
csx/
@@ -160,12 +195,12 @@ csx/
160195
ecf/
161196
rcf/
162197

163-
# Microsoft Azure ApplicationInsights config file
164-
ApplicationInsights.config
165-
166-
# Windows Store app package directory
198+
# Windows Store app package directories and files
167199
AppPackages/
168200
BundleArtifacts/
201+
Package.StoreAssociation.xml
202+
_pkginfo.txt
203+
*.appx
169204

170205
# Visual Studio cache files
171206
# files ending in .cache can be ignored
@@ -179,11 +214,19 @@ ClientBin/
179214
*~
180215
*.dbmdl
181216
*.dbproj.schemaview
217+
*.jfm
182218
*.pfx
183219
*.publishsettings
184-
node_modules/
185220
orleans.codegen.cs
186221

222+
# Including strong name files can present a security risk
223+
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
224+
#*.snk
225+
226+
# Since there are multiple workflows, uncomment next line to ignore bower_components
227+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
228+
#bower_components/
229+
187230
# RIA/Silverlight projects
188231
Generated_Code/
189232

@@ -194,15 +237,18 @@ _UpgradeReport_Files/
194237
Backup*/
195238
UpgradeLog*.XML
196239
UpgradeLog*.htm
240+
ServiceFabricBackup/
197241

198242
# SQL Server files
199243
*.mdf
200244
*.ldf
245+
*.ndf
201246

202247
# Business Intelligence projects
203248
*.rdl.data
204249
*.bim.layout
205250
*.bim_*.settings
251+
*.rptproj.rsuser
206252

207253
# Microsoft Fakes
208254
FakesAssemblies/
@@ -212,13 +258,17 @@ FakesAssemblies/
212258

213259
# Node.js Tools for Visual Studio
214260
.ntvs_analysis.dat
261+
node_modules/
215262

216263
# Visual Studio 6 build log
217264
*.plg
218265

219266
# Visual Studio 6 workspace options file
220267
*.opt
221268

269+
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
270+
*.vbw
271+
222272
# Visual Studio LightSwitch build output
223273
**/*.HTMLClient/GeneratedArtifacts
224274
**/*.DesktopClient/GeneratedArtifacts
@@ -229,10 +279,49 @@ _Pvt_Extensions
229279

230280
# Paket dependency manager
231281
.paket/paket.exe
282+
paket-files/
232283

233284
# FAKE - F# Make
234285
.fake/
235286

287+
# JetBrains Rider
288+
.idea/
289+
*.sln.iml
290+
291+
# CodeRush
292+
.cr/
293+
294+
# Python Tools for Visual Studio (PTVS)
295+
__pycache__/
296+
*.pyc
297+
298+
# Cake - Uncomment if you are using it
299+
tools/**
300+
!tools/packages.config
301+
302+
# Tabs Studio
303+
*.tss
304+
305+
# Telerik's JustMock configuration file
306+
*.jmconfig
307+
308+
# BizTalk build output
309+
*.btp.cs
310+
*.btm.cs
311+
*.odx.cs
312+
*.xsd.cs
313+
314+
# OpenCover UI analysis results
315+
OpenCover/
316+
317+
# Azure Stream Analytics local run output
318+
ASALocalRun/
319+
320+
# MSBuild Binary and Structured Log
321+
*.binlog
322+
323+
# NVidia Nsight GPU debugger configuration file
324+
*.nvuser
325+
236326
BuildArtifacts/
237-
.vs/
238-
tools/
327+
.appveyorapitoken

src/Cake.AppVeyor.Tests/Cake.AppVeyor.Tests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
4+
<TargetFramework>netcoreapp2.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Cake.Core" Version="0.22.0" />
9-
<PackageReference Include="Cake.Testing" Version="0.22.0" />
8+
<PackageReference Include="Cake.Core" Version="0.26.0" />
9+
<PackageReference Include="Cake.Testing" Version="0.26.0" />
1010
<PackageReference Include="Refit" version="3.0.0" />
11-
<PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
11+
<PackageReference Include="xunit" Version="2.3.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

src/Cake.AppVeyor/Aliases.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ namespace Cake.AppVeyor
1313
/// Here is what including Cake.AppVeyor in your script should look like:
1414
/// <code>
1515
/// #addin package:?Cake.AppVeyor
16-
/// #addin package:?Refit&mp;version=3.0.0
17-
/// #addin package:?Newtonsoft.Json&mp;version=9.0.1
16+
/// #addin package:?Refit&amp;version=3.0.0
17+
/// #addin package:?Newtonsoft.Json&amp;version=9.0.1
1818
/// </code>
1919
/// </para>
2020
/// </summary>

src/Cake.AppVeyor/Cake.AppVeyor.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.6;net46</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
55
<NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.1</NetStandardImplicitPackageVersion>
66
<GenerateDocumentationFile>true</GenerateDocumentationFile>
77
</PropertyGroup>
@@ -20,8 +20,8 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Cake.Core" Version="0.22.0" />
24-
<PackageReference Include="Cake.Common" Version="0.22.0" />
23+
<PackageReference Include="Cake.Core" Version="0.26.0" />
24+
<PackageReference Include="Cake.Common" Version="0.26.0" />
2525
<PackageReference Include="Refit" Version="3.0.0" />
2626
</ItemGroup>
2727

tools/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Cake" version="0.26.0" />
4+
</packages>

0 commit comments

Comments
 (0)