From 7aa230e83f50da748059e60c7a477db540609a02 Mon Sep 17 00:00:00 2001 From: Patrik Svensson Date: Thu, 10 Feb 2022 21:44:59 +0100 Subject: [PATCH] Update dependencies --- .github/workflows/ci.yaml | 9 ++------- .github/workflows/publish.yaml | 18 ++++-------------- build.cake | 12 ++++++------ dotnet-tools.json | 4 ++-- examples/Demo/Program.cs | 6 ------ global.json | 2 +- src/Directory.Build.props | 8 ++++---- src/Errata.Tests/Errata.Tests.csproj | 8 ++++---- src/Errata/Errata.csproj | 2 +- 9 files changed, 24 insertions(+), 45 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d17d477..e43be45 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,15 +37,10 @@ jobs: run: git fetch --tags shell: bash - - name: Setup dotnet 5.0 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.403 - - - name: Setup dotnet 6.0 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.100 + dotnet-version: 6.0.101 - name: Build shell: bash diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a5aac16..f35137e 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -43,15 +43,10 @@ jobs: run: git fetch --tags shell: bash - - name: Setup dotnet 5.0 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.403 - - - name: Setup dotnet 6.0 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.100 + dotnet-version: 6.0.101 - name: Build shell: bash @@ -78,15 +73,10 @@ jobs: run: git fetch --tags shell: bash - - name: Setup dotnet 5.0 + - name: Setup .NET SDK uses: actions/setup-dotnet@v1 with: - dotnet-version: 5.0.403 - - - name: Setup dotnet 6.0 - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 6.0.100 + dotnet-version: 6.0.101 - name: Publish shell: bash diff --git a/build.cake b/build.cake index 4348296..373253a 100644 --- a/build.cake +++ b/build.cake @@ -7,10 +7,10 @@ var configuration = Argument("configuration", "Release"); Task("Build") .Does(context => { - DotNetCoreBuild("./src/Errata.sln", new DotNetCoreBuildSettings { + DotNetBuild("./src/Errata.sln", new DotNetBuildSettings { Configuration = configuration, NoIncremental = context.HasArgument("rebuild"), - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); }); @@ -19,7 +19,7 @@ Task("Test") .IsDependentOn("Build") .Does(context => { - DotNetCoreTest("./src/Errata.sln", new DotNetCoreTestSettings { + DotNetTest("./src/Errata.sln", new DotNetTestSettings { Configuration = configuration, NoRestore = true, NoBuild = true, @@ -32,12 +32,12 @@ Task("Package") { context.CleanDirectory("./.artifacts"); - context.DotNetCorePack($"./src/Errata.sln", new DotNetCorePackSettings { + context.DotNetPack($"./src/Errata.sln", new DotNetPackSettings { Configuration = configuration, NoRestore = true, NoBuild = true, OutputDirectory = "./.artifacts", - MSBuildSettings = new DotNetCoreMSBuildSettings() + MSBuildSettings = new DotNetMSBuildSettings() .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error) }); }); @@ -56,7 +56,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 b9fc15e..4f0ce6b 100644 --- a/dotnet-tools.json +++ b/dotnet-tools.json @@ -3,13 +3,13 @@ "isRoot": true, "tools": { "cake.tool": { - "version": "2.0.0-rc0001", + "version": "2.0.0", "commands": [ "dotnet-cake" ] }, "dotnet-example": { - "version": "1.4.0", + "version": "1.6.0", "commands": [ "dotnet-example" ] diff --git a/examples/Demo/Program.cs b/examples/Demo/Program.cs index 9e6a6d8..135a1af 100644 --- a/examples/Demo/Program.cs +++ b/examples/Demo/Program.cs @@ -35,12 +35,6 @@ namespace Example .WithLabel(new Label("Demo/Files/Program.cs", 174..176, "Code should not contain trailing whitespace") .WithColor(Color.Blue)); - report.AddDiagnostic( - Diagnostic.Info("Fix formatting") - .WithCode("IDE0055")) - .WithLabel(new Label("Demo/Files/Program.cs", 1742..1762, "Code should not contain trailing whitespace") - .WithColor(Color.Blue)); - // Markdown report.AddDiagnostic( Diagnostic.Error("There were markdown errors") diff --git a/global.json b/global.json index ae0afb2..ced699f 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "projects": [ "src" ], "sdk": { - "version": "6.0.100", + "version": "6.0.101", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ce61481..069fa55 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ true - 9.0 + 10 true embedded true @@ -34,15 +34,15 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + All - + All diff --git a/src/Errata.Tests/Errata.Tests.csproj b/src/Errata.Tests/Errata.Tests.csproj index 54e3de2..ddd3647 100644 --- a/src/Errata.Tests/Errata.Tests.csproj +++ b/src/Errata.Tests/Errata.Tests.csproj @@ -21,11 +21,11 @@ - + - - - + + + all diff --git a/src/Errata/Errata.csproj b/src/Errata/Errata.csproj index 0efbc32..8120a68 100644 --- a/src/Errata/Errata.csproj +++ b/src/Errata/Errata.csproj @@ -27,7 +27,7 @@ - +