From 51d7599eb1e5868d6359f5bd415f9b52de5a44b0 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Fri, 11 Dec 2020 17:36:42 +0100 Subject: [PATCH 1/9] v-next. --- GitVersion.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GitVersion.yml b/GitVersion.yml index d3a86c96..e082264a 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 3.0.6 +next-version: 3.0.7 mode: ContinuousDeployment continuous-delivery-fallback-tag: '' branches: From 371c187a26f8cced3ec93f04c69efa0781ebe6fa Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Sat, 12 Dec 2020 09:29:05 +0100 Subject: [PATCH 2/9] Create codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 67 +++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..a57ad0e7 --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,67 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL" + +on: + push: + branches: [ develop, master ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ develop ] + schedule: + - cron: '43 14 * * 0' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + language: [ 'cpp', 'csharp' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 From af116b343401a77a3f4daf6ac9d29ca50a92cc7e Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Sat, 12 Dec 2020 09:30:52 +0100 Subject: [PATCH 3/9] Delete codeql-analysis.yml --- .github/workflows/codeql-analysis.yml | 67 --------------------------- 1 file changed, 67 deletions(-) delete mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml deleted file mode 100644 index a57ad0e7..00000000 --- a/.github/workflows/codeql-analysis.yml +++ /dev/null @@ -1,67 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL" - -on: - push: - branches: [ develop, master ] - pull_request: - # The branches below must be a subset of the branches above - branches: [ develop ] - schedule: - - cron: '43 14 * * 0' - -jobs: - analyze: - name: Analyze - runs-on: ubuntu-latest - - strategy: - fail-fast: false - matrix: - language: [ 'cpp', 'csharp' ] - # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] - # Learn more: - # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v1 - with: - languages: ${{ matrix.language }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - # queries: ./path/to/local/query, your-org/your-repo/queries@main - - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). - # If this step fails, then you should remove it and run the build manually (see below) - - name: Autobuild - uses: github/codeql-action/autobuild@v1 - - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 https://git.io/JvXDl - - # ✏ī¸ If the Autobuild fails above, remove it and uncomment the following three lines - # and modify them (or add more) to build your code if your project - # uses a compiled language - - #- run: | - # make bootstrap - # make release - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v1 From 8232d42827432fe2d947b099d08da0fbcbc99108 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 04:02:31 +0000 Subject: [PATCH 4/9] Bump YamlDotNet from 9.1.0 to 9.1.1 Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 9.1.0 to 9.1.1. - [Release notes](https://github.com/aaubry/YamlDotNet/releases) - [Changelog](https://github.com/aaubry/YamlDotNet/blob/master/RELEASE_NOTES.md) - [Commits](https://github.com/aaubry/YamlDotNet/compare/v9.1.0...9.1.1) Signed-off-by: dependabot[bot] --- src/Snap/Snap.Deps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap/Snap.Deps.targets b/src/Snap/Snap.Deps.targets index 359e13b0..07b2e60f 100644 --- a/src/Snap/Snap.Deps.targets +++ b/src/Snap/Snap.Deps.targets @@ -6,7 +6,7 @@ - + From 9e574749e025371e8fd4d664ce00f8a376b385bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Jan 2021 04:04:25 +0000 Subject: [PATCH 5/9] Bump SharpCompress from 0.26.0 to 0.27.0 Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.26.0 to 0.27.0. - [Release notes](https://github.com/adamhathcock/sharpcompress/releases) - [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.26...0.27) Signed-off-by: dependabot[bot] --- src/Snap/Snap.Deps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap/Snap.Deps.targets b/src/Snap/Snap.Deps.targets index 07b2e60f..521f229f 100644 --- a/src/Snap/Snap.Deps.targets +++ b/src/Snap/Snap.Deps.targets @@ -7,7 +7,7 @@ - + From 75f3a9f7bed240c4179b893e8a2877df6160f71c Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Tue, 12 Jan 2021 20:14:42 +0100 Subject: [PATCH 6/9] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index 575c971f..f9fe2255 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -3,7 +3,7 @@ name: snapx on: push env: - GITVERSION_VERSION: 5.5.0 + GITVERSION_VERSION: 5.6.3 MSVS_TOOLSET_VERSION: 16 DOTNET_FRAMEWORK_VERSION: net5.0 DOTNET_SDK_VERSION: 5.0.101 From 7ddb86fd5642b9fc153b656bc8aa9d0b85aad6dd Mon Sep 17 00:00:00 2001 From: Peter Rekdal Khan-Sunde Date: Tue, 12 Jan 2021 20:21:56 +0100 Subject: [PATCH 7/9] Update dotnetcore.yml --- .github/workflows/dotnetcore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml index f9fe2255..f41835a5 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -6,7 +6,7 @@ env: GITVERSION_VERSION: 5.6.3 MSVS_TOOLSET_VERSION: 16 DOTNET_FRAMEWORK_VERSION: net5.0 - DOTNET_SDK_VERSION: 5.0.101 + DOTNET_SDK_VERSION: 5.0.102 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 From d5dd80132ff35b2a3fc9c06f5d7afe96b0b57b3c Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Tue, 12 Jan 2021 20:41:48 +0100 Subject: [PATCH 8/9] Update docker image. --- build.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.ps1 b/build.ps1 index b8499fb5..ec8015d5 100644 --- a/build.ps1 +++ b/build.ps1 @@ -8,7 +8,7 @@ param( [Parameter(Position = 2, ValueFromPipelineByPropertyName = $true)] [string] $DockerImageName = "snapx", [Parameter(Position = 3, ValueFromPipelineByPropertyName = $true)] - [string] $DockerVersion = "3.0.101", + [string] $DockerVersion = "6.1", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] @@ -512,7 +512,7 @@ switch ($Target) { } "Publish-Docker-Image" { Invoke-Command-Colored $CommandDocker @( - "build -f ""$DockerFilenamePath"" -t ${DockerGithubRegistryUrl}/${DockerImageName}:${DockerVersion} docker" + "build --no-cache -f ""$DockerFilenamePath"" -t ${DockerGithubRegistryUrl}/${DockerImageName}:${DockerVersion} docker" ) Invoke-Command-Colored $CommandDocker @( From 03861146a63ba2b4bb76ac57140c0cdcf5997783 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 13 Jan 2021 04:04:30 +0000 Subject: [PATCH 9/9] Bump ServiceStack from 5.10.2 to 5.10.4 Bumps [ServiceStack](https://github.com/ServiceStack/ServiceStack) from 5.10.2 to 5.10.4. - [Release notes](https://github.com/ServiceStack/ServiceStack/releases) - [Commits](https://github.com/ServiceStack/ServiceStack/compare/v5.10.2...v5.10.4) Signed-off-by: dependabot[bot] --- src/Snapx/Snapx.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj index 41e7a2af..37f182b9 100644 --- a/src/Snapx/Snapx.csproj +++ b/src/Snapx/Snapx.csproj @@ -31,7 +31,7 @@ - +