Upgrade .NET SDK to 6.0.100 (#616)

* Update to .NET 6.0.100

* Update Cake to 2.0.0-rc0001
This commit is contained in:
Patrik Svensson 2021-11-09 08:19:36 +01:00 committed by GitHub
parent ba4b7b97f8
commit 9c9eb04f91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 25 deletions

View File

@ -18,11 +18,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@master uses: actions/checkout@master
- name: Setup dotnet - name: Setup dotnet 6.0.100
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.x dotnet-version: 6.0.100
include-prerelease: true
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v2 uses: actions/setup-node@v2
@ -85,11 +84,10 @@ jobs:
with: with:
dotnet-version: 5.0.301 dotnet-version: 5.0.301
- name: Setup dotnet 6.0 - name: Setup dotnet 6.0.100
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.x dotnet-version: 6.0.100
include-prerelease: true
- name: Integration Tests - name: Integration Tests
shell: bash shell: bash

View File

@ -24,11 +24,10 @@ jobs:
with: with:
fetch-depth: 0 fetch-depth: 0
- name: Setup dotnet - name: Setup dotnet 6.0.100
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.x dotnet-version: 6.0.100
include-prerelease: true
- name: Setup Node.js - name: Setup Node.js
uses: actions/setup-node@v2 uses: actions/setup-node@v2

View File

@ -24,11 +24,10 @@ jobs:
- name: Checkout - name: Checkout
uses: actions/checkout@master uses: actions/checkout@master
- name: Setup dotnet - name: Setup dotnet 6.0.100
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.x dotnet-version: 6.0.100
include-prerelease: true
- name: Build - name: Build
shell: bash shell: bash
@ -73,11 +72,10 @@ jobs:
with: with:
dotnet-version: 5.0.301 dotnet-version: 5.0.301
- name: Setup dotnet 6.0 - name: Setup dotnet 6.0.100
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 6.0.x dotnet-version: 6.0.100
include-prerelease: true
- name: Build - name: Build
shell: bash shell: bash

View File

@ -14,7 +14,7 @@ Task("Build")
.IsDependentOn("Clean") .IsDependentOn("Clean")
.Does(context => .Does(context =>
{ {
DotNetCoreBuild("./src/Spectre.Console.sln", new DotNetCoreBuildSettings { DotNetBuild("./src/Spectre.Console.sln", new DotNetBuildSettings {
Configuration = configuration, Configuration = configuration,
NoIncremental = context.HasArgument("rebuild"), NoIncremental = context.HasArgument("rebuild"),
MSBuildSettings = new DotNetCoreMSBuildSettings() MSBuildSettings = new DotNetCoreMSBuildSettings()
@ -26,7 +26,7 @@ Task("Build-Analyzer")
.IsDependentOn("Build") .IsDependentOn("Build")
.Does(context => .Does(context =>
{ {
DotNetCoreBuild("./src/Spectre.Console.Analyzer.sln", new DotNetCoreBuildSettings { DotNetBuild("./src/Spectre.Console.Analyzer.sln", new DotNetBuildSettings {
Configuration = configuration, Configuration = configuration,
NoIncremental = context.HasArgument("rebuild"), NoIncremental = context.HasArgument("rebuild"),
MSBuildSettings = new DotNetCoreMSBuildSettings() MSBuildSettings = new DotNetCoreMSBuildSettings()
@ -38,7 +38,7 @@ Task("Build-Examples")
.IsDependentOn("Build") .IsDependentOn("Build")
.Does(context => .Does(context =>
{ {
DotNetCoreBuild("./examples/Examples.sln", new DotNetCoreBuildSettings { DotNetBuild("./examples/Examples.sln", new DotNetBuildSettings {
Configuration = configuration, Configuration = configuration,
NoIncremental = context.HasArgument("rebuild"), NoIncremental = context.HasArgument("rebuild"),
MSBuildSettings = new DotNetCoreMSBuildSettings() MSBuildSettings = new DotNetCoreMSBuildSettings()
@ -52,13 +52,13 @@ Task("Test")
.IsDependentOn("Build-Examples") .IsDependentOn("Build-Examples")
.Does(context => .Does(context =>
{ {
DotNetCoreTest("./test/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetCoreTestSettings { DotNetTest("./test/Spectre.Console.Tests/Spectre.Console.Tests.csproj", new DotNetTestSettings {
Configuration = configuration, Configuration = configuration,
NoRestore = true, NoRestore = true,
NoBuild = true, NoBuild = true,
}); });
DotNetCoreTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetCoreTestSettings { DotNetTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetTestSettings {
Configuration = configuration, Configuration = configuration,
NoRestore = true, NoRestore = true,
NoBuild = true, NoBuild = true,
@ -69,7 +69,7 @@ Task("Package")
.IsDependentOn("Test") .IsDependentOn("Test")
.Does(context => .Does(context =>
{ {
context.DotNetCorePack($"./src/Spectre.Console.sln", new DotNetCorePackSettings { context.DotNetPack($"./src/Spectre.Console.sln", new DotNetPackSettings {
Configuration = configuration, Configuration = configuration,
NoRestore = true, NoRestore = true,
NoBuild = true, NoBuild = true,
@ -78,7 +78,7 @@ Task("Package")
.TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
}); });
context.DotNetCorePack($"./src/Spectre.Console.Analyzer.sln", new DotNetCorePackSettings { context.DotNetPack($"./src/Spectre.Console.Analyzer.sln", new DotNetPackSettings {
Configuration = configuration, Configuration = configuration,
NoRestore = true, NoRestore = true,
NoBuild = true, NoBuild = true,
@ -134,7 +134,7 @@ Task("Publish-NuGet")
foreach(var file in context.GetFiles("./.artifacts/*.nupkg")) foreach(var file in context.GetFiles("./.artifacts/*.nupkg"))
{ {
context.Information("Publishing {0}...", file.GetFilename().FullPath); context.Information("Publishing {0}...", file.GetFilename().FullPath);
DotNetCoreNuGetPush(file.FullPath, new DotNetCoreNuGetPushSettings DotNetNuGetPush(file.FullPath, new DotNetNuGetPushSettings
{ {
Source = "https://api.nuget.org/v3/index.json", Source = "https://api.nuget.org/v3/index.json",
ApiKey = apiKey, ApiKey = apiKey,

View File

@ -3,7 +3,7 @@
"isRoot": true, "isRoot": true,
"tools": { "tools": {
"cake.tool": { "cake.tool": {
"version": "1.1.0", "version": "2.0.0-rc0001",
"commands": [ "commands": [
"dotnet-cake" "dotnet-cake"
] ]

View File

@ -1,7 +1,7 @@
{ {
"projects": [ "src", "tests" ], "projects": [ "src", "tests" ],
"sdk": { "sdk": {
"version": "6.0.100-rc.2.21505.57", "version": "6.0.100",
"rollForward": "latestFeature" "rollForward": "latestFeature"
} }
} }