From 9aff96cc8765deca1f824b2c13474aa37b98d510 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 02:35:18 +0300 Subject: [PATCH 01/18] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 7511e1d..adbf54d 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +test + # Sieve ⚗️ Sieve is a simple, clean, and extensible framework for .NET Core that **adds sorting, filtering, and pagination functionality out of the box**. Most common use case would be for serving ASP.NET Core GET queries. From 9ecb9538e33a99daa7b82303ecb65c2ee6503dd6 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 02:38:51 +0300 Subject: [PATCH 02/18] nuke test --- .github/workflows/ci.yml | 2 +- .github/workflows/ci_publish.yml | 2 +- .nuke/build.schema.json | 10 +++++++++- build/_build.csproj | 5 ++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c7c592..4729864 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,6 @@ jobs: name: ubuntu-latest runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Run './build.cmd Ci' run: ./build.cmd Ci diff --git a/.github/workflows/ci_publish.yml b/.github/workflows/ci_publish.yml index 1ff5730..b2fa7a1 100644 --- a/.github/workflows/ci_publish.yml +++ b/.github/workflows/ci_publish.yml @@ -28,7 +28,7 @@ jobs: name: ubuntu-latest runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v3 - name: Run './build.cmd CiPublish' run: ./build.cmd CiPublish env: diff --git a/.nuke/build.schema.json b/.nuke/build.schema.json index 6c8135f..8e950d4 100644 --- a/.nuke/build.schema.json +++ b/.nuke/build.schema.json @@ -29,14 +29,18 @@ "AppVeyor", "AzurePipelines", "Bamboo", + "Bitbucket", "Bitrise", "GitHubActions", "GitLab", "Jenkins", + "Rider", "SpaceAutomation", "TeamCity", "Terminal", - "TravisCI" + "TravisCI", + "VisualStudio", + "VSCode" ] }, "NoLogo": { @@ -46,6 +50,10 @@ "NUGET_API_KEY": { "type": "string" }, + "Partition": { + "type": "string", + "description": "Partition to use on CI" + }, "Plan": { "type": "boolean", "description": "Shows the execution plan (HTML)" diff --git a/build/_build.csproj b/build/_build.csproj index c432dd2..eaabf3a 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 CS0649;CS0169 .. @@ -10,8 +10,7 @@ - - + From b94c98662e8c053e1f40c4c39be136bc94676e72 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 02:46:36 +0300 Subject: [PATCH 03/18] gitversion.commandline added --- build/_build.csproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build/_build.csproj b/build/_build.csproj index eaabf3a..fcd60f5 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -10,6 +10,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From f20abb97f2b724b9d92aef1a7c5056da2cf2156c Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 02:49:04 +0300 Subject: [PATCH 04/18] target framework change --- build/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/_build.csproj b/build/_build.csproj index fcd60f5..5255a3c 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net5.0 CS0649;CS0169 .. From 491ffe02878c0730c2205c346e65ca236fda8533 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:04:00 +0300 Subject: [PATCH 05/18] spec change --- build/Build.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index 4fbd27e..9dc10a9 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -14,11 +14,13 @@ using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; [ShutdownDotNetAfterServerBuild] -[GitHubActions("ci", GitHubActionsImage.UbuntuLatest, +[GitHubActions("ci", GitHubActionsImage.Ubuntu2004, OnPullRequestBranches = new[] {"master", "releases/*"}, AutoGenerate = true, InvokedTargets = new[] {nameof(Ci)}, - CacheKeyFiles = new string[0])] + CacheKeyFiles = new string[0], + ) +] [GitHubActions("ci_publish", GitHubActionsImage.UbuntuLatest, OnPushBranches = new[] { "releases/*" }, OnPushTags = new[] { "v*" }, From 61b58e5210a7fe9a25ef0dd249f25da39fa2aa0a Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:05:40 +0300 Subject: [PATCH 06/18] fix --- build/Build.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Build.cs b/build/Build.cs index 9dc10a9..beee3fd 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -18,7 +18,7 @@ using static Nuke.Common.Tools.DotNet.DotNetTasks; OnPullRequestBranches = new[] {"master", "releases/*"}, AutoGenerate = true, InvokedTargets = new[] {nameof(Ci)}, - CacheKeyFiles = new string[0], + CacheKeyFiles = new string[0] ) ] [GitHubActions("ci_publish", GitHubActionsImage.UbuntuLatest, From 61287bb58b218ccc097145fc9b52ff5aa4ee025b Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:07:57 +0300 Subject: [PATCH 07/18] yoruldum --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4729864..f70d4ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,8 +24,8 @@ on: jobs: ubuntu-latest: - name: ubuntu-latest - runs-on: ubuntu-latest + name: ubuntu-20.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 - name: Run './build.cmd Ci' From f615980408084de7c45e59cad05e75be1326c140 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:15:46 +0300 Subject: [PATCH 08/18] pof --- build/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/_build.csproj b/build/_build.csproj index 5255a3c..fcd60f5 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 CS0649;CS0169 .. From f4a0432977c10227a923f1c60bf98f65e565a1ce Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:17:45 +0300 Subject: [PATCH 09/18] asdlkhasdlkjh --- build/Build.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Build.cs b/build/Build.cs index beee3fd..dc80ed3 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -35,7 +35,7 @@ class Build : NukeBuild [GitRepository] readonly GitRepository GitRepository; - [GitVersion] readonly GitVersion GitVersion; + [GitVersion(Framework = "netcoreapp3.1")] readonly GitVersion GitVersion; [Solution] readonly Solution Solution; From 01ba3914ae1da404b6072b83f93b1c68a1eb8ddc Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:19:31 +0300 Subject: [PATCH 10/18] asdasklhlskdjhg --- build/_build.csproj | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/build/_build.csproj b/build/_build.csproj index fcd60f5..e941599 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -10,11 +10,8 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + From a6dbcedf94627e0187859e25abdeccb393506c61 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 03:57:01 +0300 Subject: [PATCH 11/18] acaba? --- .github/workflows/ci.yml | 6 ++++-- build/Build.cs | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f70d4ab..503b225 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,10 +23,12 @@ on: - 'releases/*' jobs: - ubuntu-latest: - name: ubuntu-20.04 + ubuntu-20_04: + name: ubuntu-20_04 runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Run './build.cmd Ci' run: ./build.cmd Ci diff --git a/build/Build.cs b/build/Build.cs index dc80ed3..6310937 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -18,7 +18,8 @@ using static Nuke.Common.Tools.DotNet.DotNetTasks; OnPullRequestBranches = new[] {"master", "releases/*"}, AutoGenerate = true, InvokedTargets = new[] {nameof(Ci)}, - CacheKeyFiles = new string[0] + CacheKeyFiles = new string[0], + FetchDepth = 0 ) ] [GitHubActions("ci_publish", GitHubActionsImage.UbuntuLatest, From c5a977e5c9ab788ce027a9114da4753982f93265 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 04:00:22 +0300 Subject: [PATCH 12/18] last test --- .github/workflows/ci.yml | 6 +++--- build/Build.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 503b225..8a5a4b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,9 +23,9 @@ on: - 'releases/*' jobs: - ubuntu-20_04: - name: ubuntu-20_04 - runs-on: ubuntu-20.04 + ubuntu-latest: + name: ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 with: diff --git a/build/Build.cs b/build/Build.cs index 6310937..7f4c5fd 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -14,7 +14,7 @@ using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; [ShutdownDotNetAfterServerBuild] -[GitHubActions("ci", GitHubActionsImage.Ubuntu2004, +[GitHubActions("ci", GitHubActionsImage.UbuntuLatest, OnPullRequestBranches = new[] {"master", "releases/*"}, AutoGenerate = true, InvokedTargets = new[] {nameof(Ci)}, From ad7178ef96f3ac49903d6b395b0b1fdd4a4207eb Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 04:16:20 +0300 Subject: [PATCH 13/18] =?UTF-8?q?asdlkal=C5=9Fdja?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/Build.cs | 10 +++++----- build/_build.csproj | 7 +++++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index 7f4c5fd..ca3f8a6 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -15,14 +15,14 @@ using static Nuke.Common.Tools.DotNet.DotNetTasks; [ShutdownDotNetAfterServerBuild] [GitHubActions("ci", GitHubActionsImage.UbuntuLatest, + FetchDepth = 0, OnPullRequestBranches = new[] {"master", "releases/*"}, AutoGenerate = true, InvokedTargets = new[] {nameof(Ci)}, - CacheKeyFiles = new string[0], - FetchDepth = 0 - ) -] + CacheKeyFiles = new string[0] + )] [GitHubActions("ci_publish", GitHubActionsImage.UbuntuLatest, + FetchDepth = 0, OnPushBranches = new[] { "releases/*" }, OnPushTags = new[] { "v*" }, AutoGenerate = true, @@ -36,7 +36,7 @@ class Build : NukeBuild [GitRepository] readonly GitRepository GitRepository; - [GitVersion(Framework = "netcoreapp3.1")] readonly GitVersion GitVersion; + [GitVersion] readonly GitVersion GitVersion; [Solution] readonly Solution Solution; diff --git a/build/_build.csproj b/build/_build.csproj index e941599..5255a3c 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net5.0 CS0649;CS0169 .. @@ -10,8 +10,11 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + - From 1d64e4caf9a6217bfcf96a797d629cca43cdc38f Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 04:17:47 +0300 Subject: [PATCH 14/18] asdads --- build/_build.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/_build.csproj b/build/_build.csproj index 5255a3c..fcd60f5 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -2,7 +2,7 @@ Exe - net5.0 + net6.0 CS0649;CS0169 .. From 721beb7fe1b422fe8470f44b200dbc05d2cac950 Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 04:30:13 +0300 Subject: [PATCH 15/18] final? --- build/Build.cs | 6 +++--- build/_build.csproj | 5 +---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build/Build.cs b/build/Build.cs index ca3f8a6..2277cc6 100644 --- a/build/Build.cs +++ b/build/Build.cs @@ -14,14 +14,14 @@ using static Nuke.Common.IO.FileSystemTasks; using static Nuke.Common.Tools.DotNet.DotNetTasks; [ShutdownDotNetAfterServerBuild] -[GitHubActions("ci", GitHubActionsImage.UbuntuLatest, +[GitHubActions("ci", GitHubActionsImage.Ubuntu2004, FetchDepth = 0, OnPullRequestBranches = new[] {"master", "releases/*"}, AutoGenerate = true, InvokedTargets = new[] {nameof(Ci)}, CacheKeyFiles = new string[0] )] -[GitHubActions("ci_publish", GitHubActionsImage.UbuntuLatest, +[GitHubActions("ci_publish", GitHubActionsImage.Ubuntu2004, FetchDepth = 0, OnPushBranches = new[] { "releases/*" }, OnPushTags = new[] { "v*" }, @@ -36,7 +36,7 @@ class Build : NukeBuild [GitRepository] readonly GitRepository GitRepository; - [GitVersion] readonly GitVersion GitVersion; + [GitVersion(Framework = "netcoreapp3.1")] readonly GitVersion GitVersion; [Solution] readonly Solution Solution; diff --git a/build/_build.csproj b/build/_build.csproj index fcd60f5..e941599 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -10,11 +10,8 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + From affa6c80c2630929b8a33336dcbe7f85fe90772c Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 04:31:31 +0300 Subject: [PATCH 16/18] final!!! --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a5a4b5..503b225 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,9 +23,9 @@ on: - 'releases/*' jobs: - ubuntu-latest: - name: ubuntu-latest - runs-on: ubuntu-latest + ubuntu-20_04: + name: ubuntu-20_04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 with: From 5a2ae9f5d9b98c8e81fc01bd931cf62d85a7a84d Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Thu, 23 Feb 2023 04:35:57 +0300 Subject: [PATCH 17/18] hede --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index adbf54d..7511e1d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ -test - # Sieve ⚗️ Sieve is a simple, clean, and extensible framework for .NET Core that **adds sorting, filtering, and pagination functionality out of the box**. Most common use case would be for serving ASP.NET Core GET queries. From 5627a3a5ed0797886ad4dcab3ceb8cab5e53c93b Mon Sep 17 00:00:00 2001 From: Hasan Manzak Date: Mon, 27 Feb 2023 17:15:31 +0300 Subject: [PATCH 18/18] publish config change --- .github/workflows/ci_publish.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_publish.yml b/.github/workflows/ci_publish.yml index b2fa7a1..191711a 100644 --- a/.github/workflows/ci_publish.yml +++ b/.github/workflows/ci_publish.yml @@ -24,11 +24,13 @@ on: - 'v*' jobs: - ubuntu-latest: - name: ubuntu-latest - runs-on: ubuntu-latest + ubuntu-20_04: + name: ubuntu-20_04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v3 + with: + fetch-depth: 0 - name: Run './build.cmd CiPublish' run: ./build.cmd CiPublish env: