Skip to content
This repository has been archived by the owner on Mar 5, 2022. It is now read-only.

Commit

Permalink
Merge branch 'features/cake-global-tool'
Browse files Browse the repository at this point in the history
  • Loading branch information
gabrielweyer committed Jan 13, 2019
2 parents 40f0243 + bde9368 commit 9c7338b
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 246 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,4 @@ bin/
# Cake

tools/*
!tools/packages.config
artifacts/
10 changes: 4 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ branches:
# We'll also build whenever there is a new commit on any branch starting with `features/`
- /features\/.+/
build_script:
- ps: .\build.ps1 -pack
- ps: |
dotnet cake build.cake --bootstrap
dotnet cake build.cake --pack
assembly_info:
# No thank you, I'll do this myself
patch: false
Expand Down Expand Up @@ -76,12 +78,8 @@ environment:
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
# `install` will run before `build_script`
install:
# `dotnet-install.ps1` is available at: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
# `Cake.dll` is targeting `.NET Core` `1.0.9`, so we need to install the latest `1.0.x` runtime
# The runtime is required to run a `.NET Core` application, it's part of the `SDK`
# https://github.com/dotnet/core/blob/master/release-notes/download-archive.md
- ps: .\build\dotnet-install.ps1 -SharedRuntime -Version 1.0.9
# `dotnet-wad-to-csv` is targeting `netcoreapp2.1`, so we can safely install the latest `SDK`
# The `SDK` is required to restore, build, publish... a `.NET Core` application
# https://www.microsoft.com/net/download/windows
- ps: .\build\dotnet-install.ps1 -Channel Current
- ps: dotnet tool install --global Cake.Tool --version 0.31.0
3 changes: 3 additions & 0 deletions bootstrap.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dotnet tool install Cake.Tool --global --version 0.31.0
dotnet cake build.cake --bootstrap
dotnet cake build.cake
3 changes: 3 additions & 0 deletions bootstrap.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
dotnet tool install Cake.Tool --global --version 0.31.0
dotnet cake build.cake --bootstrap
dotnet cake build.cake
4 changes: 4 additions & 0 deletions build.cake
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#module nuget:?package=Cake.DotNetTool.Module&version=0.1.0

#tool dotnet:?package=GitVersion.Tool&version=4.0.1-beta1-58

var target = Argument("target", "Default");
var configuration = Argument("configuration", "Release");

Expand Down
232 changes: 0 additions & 232 deletions build.ps1

This file was deleted.

2 changes: 1 addition & 1 deletion src/dotnet-blob-to-csv/dotnet-blob-to-csv.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<PackAsTool>true</PackAsTool>
<RootNamespace>DotNet.BlobToCsv</RootNamespace>
<AssemblyName>dotnet-blob-to-csv</AssemblyName>
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet-wad-to-csv/dotnet-wad-to-csv.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp2.1</TargetFramework>
<PackAsTool>true</PackAsTool>
<RootNamespace>DotNet.WadToCsv</RootNamespace>
<AssemblyName>dotnet-wad-to-csv</AssemblyName>
Expand Down
5 changes: 0 additions & 5 deletions tools/packages.config

This file was deleted.

0 comments on commit 9c7338b

Please sign in to comment.