Merge branch 'develop'

fintermobilityas · Dec 9, 2020 · bcbc4d3 · bcbc4d3
2 parents bfd461a + af0d3f3
commit bcbc4d3
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 23 deletions.
diff --git 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

diff --git 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:

diff --git 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
@@ -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)"]
diff --git a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj
@@ -22,8 +22,8 @@
 
     <ItemGroup>
         <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-        <PackageReference Include="Moq" Version="4.15.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+        <PackageReference Include="Moq" Version="4.15.2" />
         <PackageReference Include="System.CodeDom" Version="5.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/src/Snap.Installer/Snap.Installer.Deps.targets b/src/Snap.Installer/Snap.Installer.Deps.targets
@@ -4,6 +4,6 @@
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
         <PackageReference Include="LightInject" Version="6.4.0" />
-        <PackageReference Include="NLog" Version="4.7.5" />
+        <PackageReference Include="NLog" Version="4.7.6" />
     </ItemGroup>
 </Project>
diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj
@@ -9,10 +9,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
-        <PackageReference Include="Moq" Version="4.15.1" />
+        <PackageReference Include="Moq" Version="4.15.2" />
         <PackageReference Include="XunitXml.TestLogger" Version="2.1.26" />
     </ItemGroup>
 

diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj
@@ -19,8 +19,8 @@
 
     <ItemGroup>
         <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-        <PackageReference Include="Moq" Version="4.15.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+        <PackageReference Include="Moq" Version="4.15.2" />
         <PackageReference Include="System.CodeDom" Version="5.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/src/Snap/Snap.Deps.targets b/src/Snap/Snap.Deps.targets
@@ -1,14 +1,14 @@
 <Project>
     <ItemGroup>
-        <PackageReference Include="Jetbrains.Annotations" Version="2020.1.0">
+        <PackageReference Include="Jetbrains.Annotations" Version="2020.3.0">
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
         <PackageReference Include="Mono.Cecil" Version="0.11.3"/>
         <PackageReference Include="NuGet.Packaging" Version="5.8.0"/>
         <PackageReference Include="NuGet.Protocol" Version="5.8.0"/>
-        <PackageReference Include="YamlDotNet" Version="8.1.2"/>
+        <PackageReference Include="YamlDotNet" Version="9.1.0"/>
         <PackageReference Include="SharpCompress" Version="0.26.0"/>
         <PackageReference Include="MessagePack" Version="2.2.60" />
         <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />

diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj
@@ -19,8 +19,8 @@
 
     <ItemGroup>
         <PackageReference Include="Castle.Core" Version="4.4.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
-        <PackageReference Include="Moq" Version="4.15.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+        <PackageReference Include="Moq" Version="4.15.2" />
         <PackageReference Include="System.CodeDom" Version="5.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="5.0.0" />
         <PackageReference Include="xunit" Version="2.4.1" />

diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj
@@ -31,7 +31,7 @@
 
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
-        <PackageReference Include="ServiceStack" Version="5.10.0" />
+        <PackageReference Include="ServiceStack" Version="5.10.2" />
         <PackageReference Include="Mono.Posix.NETStandard" Version="1.0.0" />
     </ItemGroup>