diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7d7dbda..7481fec 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,11 +18,10 @@ jobs: - name: Checkout uses: actions/checkout@master - - name: Setup dotnet + - name: Setup dotnet 6.0.100 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: 6.0.100 - name: Setup Node.js uses: actions/setup-node@v2 @@ -85,11 +84,10 @@ jobs: with: dotnet-version: 5.0.301 - - name: Setup dotnet 6.0 + - name: Setup dotnet 6.0.100 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: 6.0.100 - name: Integration Tests shell: bash diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index e49aea7..e87bf9a 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -24,11 +24,10 @@ jobs: with: fetch-depth: 0 - - name: Setup dotnet + - name: Setup dotnet 6.0.100 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: 6.0.100 - name: Setup Node.js uses: actions/setup-node@v2 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 4374a65..f9d291c 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -24,11 +24,10 @@ jobs: - name: Checkout uses: actions/checkout@master - - name: Setup dotnet + - name: Setup dotnet 6.0.100 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: 6.0.100 - name: Build shell: bash @@ -73,11 +72,10 @@ jobs: with: dotnet-version: 5.0.301 - - name: Setup dotnet 6.0 + - name: Setup dotnet 6.0.100 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x - include-prerelease: true + dotnet-version: 6.0.100 - name: Build shell: bash diff --git a/build.cake b/build.cake index 67adadf..eb7375c 100644 --- a/build.cake +++ b/build.cake @@ -14,7 +14,7 @@ Task("Build") .IsDependentOn("Clean") .Does(context => { - DotNetCoreBuild("./src/Spectre.Console.sln", new DotNetCoreBuildSettings { + DotNetBuild("./src/Spectre.Console.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), MSBuildSettings = new DotNetCoreMSBuildSettings() @@ -26,7 +26,7 @@ Task("Build-Analyzer") .IsDependentOn("Build") .Does(context => { - DotNetCoreBuild("./src/Spectre.Console.Analyzer.sln", new DotNetCoreBuildSettings { + DotNetBuild("./src/Spectre.Console.Analyzer.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), MSBuildSettings = new DotNetCoreMSBuildSettings() @@ -38,7 +38,7 @@ Task("Build-Examples") .IsDependentOn("Build") .Does(context => { - DotNetCoreBuild("./examples/Examples.sln", new DotNetCoreBuildSettings { + DotNetBuild("./examples/Examples.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), MSBuildSettings = new DotNetCoreMSBuildSettings() @@ -52,13 +52,13 @@ Task("Test") .IsDependentOn("Build-Examples") .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, NoRestore = 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, NoRestore = true, NoBuild = true, @@ -69,7 +69,7 @@ Task("Package") .IsDependentOn("Test") .Does(context => { - context.DotNetCorePack($"./src/Spectre.Console.sln", new DotNetCorePackSettings { + context.DotNetPack($"./src/Spectre.Console.sln", new DotNetPackSettings { Configuration = configuration, NoRestore = true, NoBuild = true, @@ -78,7 +78,7 @@ Task("Package") .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); - context.DotNetCorePack($"./src/Spectre.Console.Analyzer.sln", new DotNetCorePackSettings { + context.DotNetPack($"./src/Spectre.Console.Analyzer.sln", new DotNetPackSettings { Configuration = configuration, NoRestore = true, NoBuild = true, @@ -134,7 +134,7 @@ Task("Publish-NuGet") foreach(var file in context.GetFiles("./.artifacts/*.nupkg")) { 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", ApiKey = apiKey, diff --git a/dotnet-tools.json b/dotnet-tools.json index 7105b84..3d4844f 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "1.1.0", + "version": "2.0.0-rc0001", "commands": [ "dotnet-cake" ] diff --git a/global.json b/global.json index c59adb2..7f4138d 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "projects": [ "src", "tests" ], "sdk": { - "version": "6.0.100-rc.2.21505.57", + "version": "6.0.100", "rollForward": "latestFeature" } }