Merge branch 'develop'

fintermobilityas · Sep 16, 2022 · 4bcedc2 · 4bcedc2
2 parents f541d35 + 8d39f78
commit 4bcedc2
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 28 deletions.
diff --git a/.github/workflows/dotnetcore.yml b/.github/workflows/dotnetcore.yml
@@ -15,8 +15,8 @@ env:
   GITVERSION_VERSION: 5.10.3
   MSVS_TOOLSET_VERSION: 16
   SNAPX_DOTNET_FRAMEWORK_VERSION: net6.0
-  DOTNET_NET60_VERSION: 6.0.400
-  DOTNET_NET70_VERSION: 7.0.100-preview.7.22377.5
+  DOTNET_NET60_VERSION: 6.0.401
+  DOTNET_NET70_VERSION: 7.0.100-rc.1.22431.12
   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: 4.0.10
+next-version: 4.0.12
 mode: ContinuousDeployment
 continuous-delivery-fallback-tag: ''
 branches:

diff --git a/bootstrap.ps1 b/bootstrap.ps1
@@ -411,7 +411,6 @@ function Invoke-Dotnet-UnitTests
         $BuildProperties = @(
             "/p:SnapInstallerAllowElevatedContext=" + ($CIBuild ? "True" : "False")
             "/p:SnapRid=$Rid"
-            "/p:Platform=$Platform"
             "/p:TargetFrameworks=$ProjectDotnetFramework"
         )
 
@@ -420,7 +419,8 @@ function Invoke-Dotnet-UnitTests
             $BuildProperties
             "--configuration $Configuration"
             "--framework $ProjectDotnetFramework"
-            "$ProjectSrcDirectory"
+            "--arch $Platform"
+            $ProjectSrcDirectory
         )
 
         if($BuildOnly) {
@@ -431,10 +431,11 @@ function Invoke-Dotnet-UnitTests
 
         Invoke-Command-Colored $CommandDotnet @(
             "test"
+            $ProjectSrcDirectory
             $BuildProperties
-            "$ProjectSrcDirectory"
             "--configuration $Configuration"
             "--framework $ProjectDotnetFramework"
+            "--arch $Platform"
             "--verbosity normal"
             "--no-build"
             "--logger:""xunit;LogFileName=TestResults.xml"""

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 = "15.0",
+	[string] $DockerVersion = "16.0",
 	[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 = "ghcr.io/fintermobilityas"
-$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False
 
 $SummaryStopwatch = $Stopwatch::StartNew()
 $SummaryStopwatch.Restart()

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -3,8 +3,8 @@ FROM ubuntu:20.04 as env-build
 ENV DEBIAN_FRONTEND=noninteractive
 ENV SNAPX_DOCKER_WORKING_DIR /build/snapx
 
-ARG DOTNET_60_SDK_VERSION=6.0.400
-ARG DOTNET_70_SDK_VERSION=7.0.100-preview.7.22377.5
+ARG DOTNET_60_SDK_VERSION=6.0.401
+ARG DOTNET_70_SDK_VERSION=7.0.100-rc.1.22431.12
 ARG DOTNET_RID=linux-x64
 
 

diff --git a/src/Snap.CoreRun.Pal/src/include/pal/pal.hpp b/src/Snap.CoreRun.Pal/src/include/pal/pal.hpp
@@ -35,10 +35,10 @@
 #define PAL_API __declspec( dllexport )
 #define PAL_CALLING_CONVENTION __cdecl
 #elif PAL_PLATFORM_LINUX
-#include <limits.h>
+#include <climits>
 #include <cstdio>
-#include <wait.h>
 #include <cstdint>
+#include <sys/wait.h>
 #include <sys/stat.h> // mode_t
 #define PAL_MAX_PATH PATH_MAX
 #define PAL_DIRECTORY_SEPARATOR_STR "/"

diff --git a/src/Snap.CoreRun.Pal/src/pal.cpp b/src/Snap.CoreRun.Pal/src/pal.cpp
@@ -11,15 +11,14 @@
 #include "vendor/rcedit/rcedit.hpp"
 #include <system_error>
 #elif defined(PAL_PLATFORM_LINUX)
-#include <sys/types.h> // O_RDONLY
 #include <sys/wait.h> // wait
 #include <unistd.h> // getcwd
 #include <fcntl.h> // open
 #include <dirent.h> // opendir
 #include <libgen.h> // dirname
 #include <dlfcn.h> // dlopen
-#include <signal.h> // kill
-#include <time.h> // nanosleep
+#include <csignal> // kill
+#include <ctime> // nanosleep
 static const char* symlink_entrypoint_executable = "/proc/self/exe";
 #endif
 

diff --git a/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj b/src/Snap.Installer.Tests/Snap.Installer.Tests.csproj
@@ -22,7 +22,7 @@
 
     <ItemGroup>
         <PackageReference Include="Castle.Core" Version="5.1.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
         <PackageReference Include="Moq" Version="4.18.2" />
         <PackageReference Include="System.CodeDom" Version="6.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />

diff --git a/src/Snap.Installer/Snap.Installer.Deps.targets b/src/Snap.Installer/Snap.Installer.Deps.targets
@@ -2,7 +2,7 @@
     <ItemGroup>
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="LightInject" Version="6.5.0" />
-        <PackageReference Include="NLog" Version="5.0.2" />    
+        <PackageReference Include="LightInject" Version="6.5.2" />
+        <PackageReference Include="NLog" Version="5.0.4" />    
     </ItemGroup>
 </Project>
diff --git a/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj b/src/Snap.Shared.Tests/Snap.Shared.Tests.csproj
@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
         <PackageReference Include="xunit" Version="2.4.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
         <PackageReference Include="Moq" Version="4.18.2" />

diff --git a/src/Snap.Tests/Snap.Tests.csproj b/src/Snap.Tests/Snap.Tests.csproj
@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="Castle.Core" Version="5.1.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
         <PackageReference Include="Moq" Version="4.18.2" />
         <PackageReference Include="System.CodeDom" Version="6.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />

diff --git a/src/Snap/CoreRunLib.cs b/src/Snap/CoreRunLib.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Runtime.InteropServices;
 using Snap.Core;
@@ -210,13 +210,13 @@ public override bool Equals(object obj)
             public static bool operator !=(pid_t v1, pid_t v2) => v1.Value != v2.Value;
         }
 
-        [DllImport("libdl", SetLastError = true, EntryPoint = "dlsym", CharSet = CharSet.Ansi)]
+        [DllImport("libdl.so.2", SetLastError = true, EntryPoint = "dlsym", CharSet = CharSet.Ansi)]
         public static extern IntPtr dlsym(IntPtr handle, string symbol);
-        [DllImport("libdl", SetLastError = true, EntryPoint = "dlopen", CharSet = CharSet.Ansi)]
+        [DllImport("libdl.so.2", SetLastError = true, EntryPoint = "dlopen", CharSet = CharSet.Ansi)]
         public static extern IntPtr dlopen(string filename, int flags);
-        [DllImport("libdl", SetLastError = true, EntryPoint = "dlclose")]
+        [DllImport("libdl.so.2", SetLastError = true, EntryPoint = "dlclose")]
         public static extern int dlclose(IntPtr hModule);            
-        [DllImport("libc", SetLastError = true, EntryPoint = "kill")]
+        [DllImport("libdl.so.2", SetLastError = true, EntryPoint = "kill")]
         public static extern int kill (pid_t pid, int sig);
     }
 

diff --git a/src/Snapx.Tests/Snapx.Tests.csproj b/src/Snapx.Tests/Snapx.Tests.csproj
@@ -19,7 +19,7 @@
 
     <ItemGroup>
         <PackageReference Include="Castle.Core" Version="5.1.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
         <PackageReference Include="Moq" Version="4.18.2" />
         <PackageReference Include="System.CodeDom" Version="6.0.0" />
         <PackageReference Include="System.Security.Permissions" Version="6.0.0" />

diff --git a/src/Snapx/Snapx.csproj b/src/Snapx/Snapx.csproj
@@ -31,7 +31,7 @@
 
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.9.1" />
-        <PackageReference Include="ServiceStack.HttpClient" Version="6.2.0" />
+        <PackageReference Include="ServiceStack.HttpClient" Version="6.3.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Vendor/gtest b/src/Vendor/gtest
+6 −3		.github/workflows/gtest-ci.yml
+13 −2		BUILD.bazel
+5 −1		CMakeLists.txt
+4 −4		CONTRIBUTING.md
+16 −39		README.md
+28 −6		WORKSPACE
+11 −3		ci/linux-presubmit.sh
+4 −2		ci/macos-presubmit.sh
+1 −1		docs/_layouts/default.html
+13 −7		docs/advanced.md
+30 −30		docs/faq.md
+81 −37		docs/gmock_cook_book.md
+6 −6		docs/gmock_for_dummies.md
+1 −1		docs/quickstart-bazel.md
+6 −5		docs/quickstart-cmake.md
+7 −3		docs/reference/matchers.md
+3 −1		docs/reference/mocking.md
+1 −1		docs/samples.md
+755 −152		googlemock/include/gmock/gmock-actions.h
+3 −3		googlemock/include/gmock/gmock-function-mocker.h
+45 −23		googlemock/include/gmock/gmock-matchers.h
+2 −1		googlemock/include/gmock/gmock-more-actions.h
+38 −7		googlemock/include/gmock/gmock-more-matchers.h
+25 −9		googlemock/include/gmock/gmock-nice-strict.h
+232 −155		googlemock/include/gmock/gmock-spec-builders.h
+6 −14		googlemock/include/gmock/internal/gmock-internal-utils.h
+47 −20		googlemock/include/gmock/internal/gmock-port.h
+2 −1		googlemock/src/gmock-cardinalities.cc
+6 −5		googlemock/src/gmock-internal-utils.cc
+19 −142		googlemock/src/gmock-spec-builders.cc
+675 −69		googlemock/test/gmock-actions_test.cc
+2 −1		googlemock/test/gmock-cardinalities_test.cc
+33 −11		googlemock/test/gmock-function-mocker_test.cc
+10 −4		googlemock/test/gmock-matchers-arithmetic_test.cc
+82 −14		googlemock/test/gmock-matchers-comparisons_test.cc
+52 −17		googlemock/test/gmock-matchers-containers_test.cc
+12 −5		googlemock/test/gmock-matchers-misc_test.cc
+54 −16		googlemock/test/gmock-matchers_test.h
+6 −3		googlemock/test/gmock-nice-strict_test.cc
+72 −62		googlemock/test/gmock-spec-builders_test.cc
+2 −1		googlemock/test/gmock_leak_test_.cc
+2 −1		googlemock/test/gmock_link_test.h
+2 −1		googlemock/test/gmock_output_test_.cc
+4 −4		googlemock/test/gmock_output_test_golden.txt
+4 −4		googletest/README.md
+12 −3		googletest/cmake/internal_utils.cmake
+5 −0		googletest/include/gtest/gtest-assertion-result.h
+12 −7		googletest/include/gtest/gtest-matchers.h
+5 −2		googletest/include/gtest/gtest-param-test.h
+2 −2		googletest/include/gtest/gtest-printers.h
+12 −6		googletest/include/gtest/gtest-spi.h
+4 −2		googletest/include/gtest/gtest-test-part.h
+18 −9		googletest/include/gtest/gtest.h
+0 −14		googletest/include/gtest/internal/custom/README.md
+6 −3		googletest/include/gtest/internal/gtest-death-test-internal.h
+45 −45		googletest/include/gtest/internal/gtest-internal.h
+15 −5		googletest/include/gtest/internal/gtest-param-util.h
+148 −106		googletest/include/gtest/internal/gtest-port.h
+2 −2		googletest/src/gtest-death-test.cc
+22 −10		googletest/src/gtest-internal-inl.h
+15 −12		googletest/src/gtest-port.cc
+1 −1		googletest/src/gtest-printers.cc
+76 −49		googletest/src/gtest.cc
+4 −0		googletest/test/BUILD.bazel
+3 −3		googletest/test/googletest-filepath-test.cc
+7 −4		googletest/test/googletest-param-test-test.cc
+5 −8		googletest/test/googletest-port-test.cc
+2 −2		googletest/test/gtest-unittest-api_test.cc
+41 −26		googletest/test/gtest_help_test.py
+73 −40		googletest/test/gtest_unittest.cc