From 7b26c783c93b6fe52cd227dc8ea9d45648c03be7 Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Wed, 22 Jun 2022 08:52:09 +0300 Subject: [PATCH] Upgrade to NUKE 6.3.0 --- .github/workflows/build.yml | 6 +++--- .github/workflows/pr.yml | 4 ++-- .nuke/build.schema.json | 1 + build/Build.cs | 2 +- build/_build.csproj | 2 +- src/NJsonSchema.sln | 14 -------------- 6 files changed, 8 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 39cd48565..aeba679e1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,9 +32,9 @@ jobs: name: windows-latest runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Cache .nuke/temp, ~/.nuget/packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | .nuke/temp @@ -45,7 +45,7 @@ jobs: env: NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }} MYGET_API_KEY: ${{ secrets.MYGET_API_KEY }} - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: artifacts path: artifacts diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index d5a550eda..e5eb48bb9 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -30,9 +30,9 @@ jobs: name: windows-latest runs-on: windows-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Cache .nuke/temp, ~/.nuget/packages - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | .nuke/temp diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index c9aa5705a..afa5ad80c 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -29,6 +29,7 @@ "AppVeyor", "AzurePipelines", "Bamboo", + "Bitbucket", "Bitrise", "GitHubActions", "GitLab", diff --git a/build/Build.cs b/build/Build.cs index 3f2a63bd7..f706b457f 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -75,7 +75,7 @@ protected override void OnBuildInitialized() VersionSuffix = $"dev-{DateTime.UtcNow:yyyyMMdd-HHmm}"; } - using var _ = Block("BUILD SETUP"); + Serilog.Log.Information("BUILD SETUP"); Serilog.Log.Information("Configuration:\t{Configuration}", Configuration); Serilog.Log.Information("Version prefix:\t{VersionPrefix}", VersionPrefix); Serilog.Log.Information("Version suffix:\t{VersionSuffix}", VersionSuffix); diff --git a/build/_build.csproj b/build/_build.csproj index 607315eb7..13c759c78 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/NJsonSchema.sln b/src/NJsonSchema.sln index 4b0542c9d..770b622be 100644 --- a/src/NJsonSchema.sln +++ b/src/NJsonSchema.sln @@ -235,20 +235,6 @@ Global {990EF464-C967-4E08-8C3D-0568A47B6D2A}.Release|x64.Build.0 = Release|Any CPU {990EF464-C967-4E08-8C3D-0568A47B6D2A}.Release|x86.ActiveCfg = Release|Any CPU {990EF464-C967-4E08-8C3D-0568A47B6D2A}.Release|x86.Build.0 = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|ARM.Build.0 = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|x64.ActiveCfg = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|x64.Build.0 = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|x86.ActiveCfg = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Debug|x86.Build.0 = Debug|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|ARM.ActiveCfg = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|ARM.Build.0 = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|x64.ActiveCfg = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|x64.Build.0 = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|x86.ActiveCfg = Release|Any CPU - {8E4E5A64-B5B7-4718-A92F-CB6B08512264}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE