Merge pull request #4 from nieznanysprawiciel/CI-tests

First attempt to msbuild CI

.github/workflows/test.yml

@@ -0,0 +1,40 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+
+name: Build
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+env:
+  # Path to the solution file relative to the root of the project.
+  SOLUTION_FILE_PATH: ./swGUI/GUI.sln
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        BUILD_CONFIGURATION: [Release, Debug]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/setup-msbuild@v1.0.2
+      with:
+        msbuild-architecture: x64
+
+    - name: Build
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      # Add additional options to the MSBuild command line here (like platform or verbosity level).
+      # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
+      run: msbuild /m /verbosity:minimal /p:Configuration=${{matrix.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

.gitignore

@@ -1,2 +1,10 @@
 swGUI/ProjectDir/Output/TMP/
-swCommonLib/.vs/
+
+_Target/*
+*/_Target
+
+*/.vs/
+*/.idea/
+
+.idea
+.vs 

swCommonLib/Common/Buffers/BufferRaw.h

@@ -8,7 +8,7 @@
 #include "swCommonLib/Common/TypesDefinitions.h"
 #include "swCommonLib/Common/RTTR.h"
 
-#include <allocators>
+#include <memory>
 
 
 

swCommonLib/Common/Buffers/BufferTyped.h

@@ -10,7 +10,7 @@
 
 #include "BufferRaw.h"
 
-#include <allocators>
+#include <memory>
 #include <assert.h>
 
 

swCommonLib/Common/Converters/Convert.h

@@ -135,6 +135,10 @@ inline sw::Nullable< typename std::enable_if< std::is_enum< DstType >::value, Ds
 //			Wstring to string	
 //====================================================================================//
 
+// std::codecvt_utf8 deprecated since C++17 without replacement.
+#pragma warning( push )
+#pragma warning( disable: 4996 )
+
 // ================================ //
 //
 template<>
@@ -157,6 +161,8 @@ inline sw::Nullable< typename std::enable_if< std::is_same< SrcType, std::wstrin
 	return converter.from_bytes( value );
 }
 
+#pragma warning( pop )
+
 //====================================================================================//
 //				    Arithemetic types
 //====================================================================================//

swCommonLib/Common/Exceptions/Nullable.h

@@ -106,8 +106,8 @@ class Nullable
     std::string             GetErrorReason      () const;
     ErrorType				GetError            () const;
 
-    bool						operator==          ( const ContentType& that );
-    bool						operator!=          ( const ContentType& that );
+    bool						operator==          ( const ContentType& that ) const;
+    bool						operator!=          ( const ContentType& that ) const;
 	Nullable< ContentType >&	operator=			( const Nullable< ContentType >& that );
 
     const ContentType &				Get			() const&;
@@ -307,15 +307,15 @@ inline typename Nullable< ContentType >::ErrorType		Nullable< ContentType >::Get
 // ================================ //
 //
 template< typename ContentType >
-inline bool						Nullable< ContentType >::operator==      ( const ContentType & that ) 
+inline bool						Nullable< ContentType >::operator==      ( const ContentType & that ) const
 { 
     return m_isValid && Content == that; 
 }
 
 // ================================ //
 //
 template< typename ContentType >
-inline bool						Nullable< ContentType >::operator!=      ( const ContentType & that ) 
+inline bool						Nullable< ContentType >::operator!=      ( const ContentType & that ) const
 { 
     return !( *this == that ); 
 }

swCommonLib/Common/Macros/DefineFmtFormatter.h

@@ -25,7 +25,7 @@ struct ::fmt::formatter< ClassType >                                        \
     auto parse( ParseContext& ctx ) { return ctx.begin(); }                 \
                                                                             \
     template< typename FormatContext >                                      \
-    auto format( const ClassType& d, FormatContext& ctx ) {                 \
+    auto format( const ClassType& d, FormatContext& ctx ) const {           \
         return format_to( ctx.out(), FormatString, FOR_EACH( _APPEND_INST ,__VA_ARGS__ ) );   \
     }                                                                       \
 };
@@ -52,7 +52,7 @@ struct ::fmt::formatter< ClassType >                                        \
     auto parse( ParseContext& ctx ) { return ctx.begin(); }                 \
                                                                             \
     template< typename FormatContext >                                      \
-    auto format( const ClassType& d, FormatContext& ctx ) {                 \
+    auto format( const ClassType& d, FormatContext& ctx ) const {           \
         return format_to( ctx.out(), "{}", Function( d ) );                 \
     }                                                                       \
 };

swCommonLib/Common/Macros/GenerateOperators.h

@@ -17,11 +17,12 @@ namespace sw
 #define _APPEND_INSTANCE_OBJ2( member ) _APPEND_INSTANCE( obj2, member )
 
 #define _GENERATE_OPERATOR( OP, ClassType, ... ) \
-inline bool     operator##OP( const ClassType& obj1, const ClassType& obj2 )\
-{                                                                           \
-    return std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ1, __VA_ARGS__ ) )       \
-        OP std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ2, __VA_ARGS__ ) );      \
-}
+inline static bool     operator##OP( const ClassType& obj1, const ClassType& obj2 ) \
+{                                                                                   \
+    return std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ1, __VA_ARGS__ ) )               \
+        OP std::tie( FOR_EACH( _APPEND_INSTANCE_OBJ2, __VA_ARGS__ ) );              \
+}                                                                                   \
+
 
 /**@brief Generates operator== function for ClassType.
 Pass all class members as variadic parameters.*/

swCommonLib/Common/Nullable.h

@@ -78,7 +78,7 @@ struct Nullable
 	}
 
 
-	bool operator!()
+	bool operator!() const
 	{
 		return !IsValid;
 	}

swCommonLib/Common/Version.cpp

@@ -78,7 +78,7 @@ std::string                 Version::ToString   () const
 
 // ================================ //
 //
-bool                    Version::operator<      ( const Version& other )
+bool                    Version::operator<      ( const Version& other ) const
 {
     if( Major < other.Major )
         return true;
@@ -100,7 +100,7 @@ bool                    Version::operator<      ( const Version& other )
 
 // ================================ //
 //
-bool                    Version::operator==     ( const Version& other )
+bool                    Version::operator==     ( const Version& other ) const
 {
     return Major == other.Major
         && Minor == other.Minor

swCommonLib/Common/Version.h

@@ -71,10 +71,10 @@ struct Version
     static Nullable< Version >      From                ( const std::string& versionStr );
 
     /**@brief Version comparision.*/
-    bool                            operator<           ( const Version& other );
+    bool                            operator<           ( const Version& other ) const;
 
     /**@brief Version comparision.*/
-    bool                            operator==          ( const Version& other );
+    bool                            operator==          ( const Version& other ) const;
 
     /**@brief Conversts to string.
     String has the same fromat as Version::From function expects as input.*/

swCommonLib/Common/fmt.h

@@ -8,6 +8,7 @@
 // This is kind of joke!!
 // Disable including windows.h.
 #define FMT_USE_WINDOWS_H 0
+#define FMT_UNICODE 0
 
 #include "swCommonLib/External/fmt/format.h"