From 85a1019d671157e8f79e8dee5c4ee33ddb0e46da Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Mon, 16 Nov 2020 11:55:31 +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 f7d6a429..dcf1bf12 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -1,4 +1,4 @@ -next-version: 3.0.3 +next-version: 3.0.4 mode: ContinuousDeployment continuous-delivery-fallback-tag: '' branches: From bed4599ce19aec94069406ad757495bc60e068ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2020 04:09:28 +0000 Subject: [PATCH 2/9] Bump ServiceStack from 5.10.0 to 5.10.2 Bumps [ServiceStack](https://github.com/ServiceStack/ServiceStack) from 5.10.0 to 5.10.2. - [Release notes](https://github.com/ServiceStack/ServiceStack/releases) - [Commits](https://github.com/ServiceStack/ServiceStack/compare/v5.10...v5.10.2) 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 e8e6b459..41e7a2af 100644 --- a/src/Snapx/Snapx.csproj +++ b/src/Snapx/Snapx.csproj @@ -31,7 +31,7 @@ - + From 9c38d4dad579614dec2f3c151386aaf232d415b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Nov 2020 04:07:29 +0000 Subject: [PATCH 3/9] Bump YamlDotNet from 8.1.2 to 9.1.0 Bumps [YamlDotNet](https://github.com/aaubry/YamlDotNet) from 8.1.2 to 9.1.0. - [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/v8.1.2...v9.1.0) 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 d5c0ec1f..5c5a39a6 100644 --- a/src/Snap/Snap.Deps.targets +++ b/src/Snap/Snap.Deps.targets @@ -8,7 +8,7 @@ - + From 643529402f3a21cefe6608631c3ab73f1bf1e161 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Nov 2020 04:04:12 +0000 Subject: [PATCH 4/9] Bump Moq from 4.15.1 to 4.15.2 Bumps [Moq](https://github.com/moq/moq4) from 4.15.1 to 4.15.2. - [Release notes](https://github.com/moq/moq4/releases) - [Changelog](https://github.com/moq/moq4/blob/master/CHANGELOG.md) - [Commits](https://github.com/moq/moq4/commits/v4.15.2) Signed-off-by: dependabot[bot] --- src/Snap.Installer.Tests/Snap.Installer.Tests.csproj | 2 +- src/Snap.Shared.Tests/Snap.Shared.Tests.csproj | 2 +- src/Snap.Tests/Snap.Tests.csproj | 2 +- src/Snapx.Tests/Snapx.Tests.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj index 2bc0030d..cc32326a 100644 --- a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj +++ b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj index e75a1b4b..1336075a 100644 --- a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj +++ b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj index a8ece1fd..528eddb0 100644 --- a/src/Snap.Tests/Snap.Tests.csproj +++ b/src/Snap.Tests/Snap.Tests.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj index 4cf6c0bb..7569f7f8 100644 --- a/src/Snapx.Tests/Snapx.Tests.csproj +++ b/src/Snapx.Tests/Snapx.Tests.csproj @@ -20,7 +20,7 @@ - + From e14eab7ea2b8b2f971e7ceb6c140b2bbbfb33386 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Nov 2020 04:17:26 +0000 Subject: [PATCH 5/9] Bump Jetbrains.Annotations from 2020.1.0 to 2020.3.0 Bumps Jetbrains.Annotations from 2020.1.0 to 2020.3.0. 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 5c5a39a6..461d2288 100644 --- a/src/Snap/Snap.Deps.targets +++ b/src/Snap/Snap.Deps.targets @@ -1,6 +1,6 @@ - + all From ee593781b9306f389eb66a1629751ca5af760f60 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 3 Dec 2020 04:03:41 +0000 Subject: [PATCH 6/9] Bump Microsoft.NET.Test.Sdk from 16.8.0 to 16.8.3 Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.8.0 to 16.8.3. - [Release notes](https://github.com/microsoft/vstest/releases) - [Commits](https://github.com/microsoft/vstest/compare/v16.8.0...v16.8.3) Signed-off-by: dependabot[bot] --- src/Snap.Installer.Tests/Snap.Installer.Tests.csproj | 2 +- src/Snap.Shared.Tests/Snap.Shared.Tests.csproj | 2 +- src/Snap.Tests/Snap.Tests.csproj | 2 +- src/Snapx.Tests/Snapx.Tests.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj index cc32326a..89a5752f 100644 --- a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj +++ b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj @@ -22,7 +22,7 @@ - + diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj index 1336075a..2be7dd75 100644 --- a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj +++ b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj index 528eddb0..e618a68f 100644 --- a/src/Snap.Tests/Snap.Tests.csproj +++ b/src/Snap.Tests/Snap.Tests.csproj @@ -19,7 +19,7 @@ - + diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj index 7569f7f8..5c2a6bc7 100644 --- a/src/Snapx.Tests/Snapx.Tests.csproj +++ b/src/Snapx.Tests/Snapx.Tests.csproj @@ -19,7 +19,7 @@ - + From 2e7cf2c2cca9186d1491be6b5d52b11663088e07 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Dec 2020 04:10:54 +0000 Subject: [PATCH 7/9] Bump NLog from 4.7.5 to 4.7.6 Bumps [NLog](https://github.com/NLog/NLog) from 4.7.5 to 4.7.6. - [Release notes](https://github.com/NLog/NLog/releases) - [Changelog](https://github.com/NLog/NLog/blob/v4.7.6/CHANGELOG.md) - [Commits](https://github.com/NLog/NLog/compare/v4.7.5...v4.7.6) Signed-off-by: dependabot[bot] --- src/Snap.Installer/Snap.Installer.Deps.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Snap.Installer/Snap.Installer.Deps.targets b/src/Snap.Installer/Snap.Installer.Deps.targets index 7014b2fe..58ca3f52 100644 --- a/src/Snap.Installer/Snap.Installer.Deps.targets +++ b/src/Snap.Installer/Snap.Installer.Deps.targets @@ -4,6 +4,6 @@ - + From da06c8f8f234dd7426542daf7942c462c56bf97a Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Tue, 8 Dec 2020 21:39:18 +0100 Subject: [PATCH 8/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 dd448f0f..575c971f 100644 --- a/.github/workflows/dotnetcore.yml +++ b/.github/workflows/dotnetcore.yml @@ -6,7 +6,7 @@ env: GITVERSION_VERSION: 5.5.0 MSVS_TOOLSET_VERSION: 16 DOTNET_FRAMEWORK_VERSION: net5.0 - DOTNET_SDK_VERSION: 5.0.100 + DOTNET_SDK_VERSION: 5.0.101 DOTNET_CLI_TELEMETRY_OPTOUT: 1 DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1 DOTNET_NOLOGO: 1 From af0d3f309d1dfa6a2a5e88700eb10251b85266ef Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Wed, 9 Dec 2020 06:35:31 +0100 Subject: [PATCH 9/9] Update docker image. --- build.ps1 | 7 +------ docker/Dockerfile | 14 +++++++++++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/build.ps1 b/build.ps1 index e1030193..b8499fb5 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.100", + [string] $DockerVersion = "3.0.101", [Parameter(Position = 4, ValueFromPipelineByPropertyName = $true)] [switch] $DockerLocal, [Parameter(Position = 5, ValueFromPipelineByPropertyName = $true)] @@ -70,7 +70,6 @@ switch -regex ($OSVersion) { $DockerFilenamePath = Join-Path $WorkingDir docker\Dockerfile $DockerGithubRegistryUrl = "docker.pkg.github.com/fintermobilityas/snapx" -$DockerContainerUrl = "mcr.microsoft.com/dotnet/sdk:5.0.100-rc.1-focal" $Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False $SummaryStopwatch = $Stopwatch::StartNew() @@ -512,10 +511,6 @@ switch ($Target) { } } "Publish-Docker-Image" { - $DockerFileContent = Get-Content $DockerFilenamePath - $DockerFileContent[0] = "FROM $DockerContainerUrl as env-build" - $DockerFileContent | Out-File $DockerFilenamePath -Encoding $Utf8NoBomEncoding - Invoke-Command-Colored $CommandDocker @( "build -f ""$DockerFilenamePath"" -t ${DockerGithubRegistryUrl}/${DockerImageName}:${DockerVersion} docker" ) diff --git a/docker/Dockerfile b/docker/Dockerfile index 160e2d4e..22f43761 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0.100-rc.1-focal as env-build +FROM ubuntu:20.04 as env-build ENV DEBIAN_FRONTEND=noninteractive @@ -35,14 +35,22 @@ RUN \ RUN \ apt-get update && \ apt-get install -y --no-install-recommends \ - cmake:amd64 make:amd64 gcc-8:amd64 g++-8:amd64 uuid-dev:amd64 lsb-core:amd64 curl:amd64 && \ + cmake:amd64 make:amd64 gcc-8:amd64 g++-8:amd64 uuid-dev:amd64 lsb-core:amd64 curl:amd64 wget:amd64 && \ rm -rf /var/lib/apt/lists/* +RUN \ + apt-get update && \ + apt-get install -y apt-transport-https:amd64 ca-certificates:amd64 && \ + wget --no-check-certificate https://packages.microsoft.com/config/ubuntu/20.10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb && \ + dpkg -i packages-microsoft-prod.deb && \ + apt-get update && \ + apt-get install -y dotnet-sdk-5.0:amd64 && \ + dotnet tool update powershell -g + RUN \ update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 FROM env-build as env-run -RUN mkdir /root/.dotnet/tools ENV PATH="/root/.dotnet/tools:${PATH}" ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 CMD ["sh", "-c", "(cd $SNAPX_DOCKER_WORKING_DIR && pwsh ./build.ps1 $BUILD_PS_PARAMETERS)"]