Synced our CppSharp fork with main

.github/workflows/llvm-win.yml

@@ -9,8 +9,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: windows-2019, platform: x86, vs: 2019 }
-          - { os: windows-2019, platform: x64, vs: 2019 }
+          - { os: windows-2022, platform: x86, vs: 2022 }
+          - { os: windows-2022, platform: x64, vs: 2022 }
 
     runs-on: ${{ matrix.config.os }}
 
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Inject slug/short variables
-        uses: rlespinasse/github-slug-action@v3.x
+        uses: rlespinasse/github-slug-action@v4
 
       - name: Check out
         shell: cmd
@@ -35,7 +35,7 @@ jobs:
       - name: Environment
         shell: cmd
         run: |
-          call "C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
+          call "C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" %PLATFORM%
           :: Loop over all environment variables and make them global using set-env.
           :: See: https://stackoverflow.com/a/39184941
           setlocal
@@ -60,7 +60,7 @@ jobs:
         working-directory: C:\CppSharp
 
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: llvm
           path: C:\CppSharp\build\llvm\llvm-*-*.*

.github/workflows/llvm.yml

@@ -9,9 +9,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-20.04, platform: x64, cxx: g++-9, cc: gcc-9 }
-          - { os: ubuntu-20.04, platform: x64, cxx: g++-10, cc: gcc-10 }
-          - { os: macos-10.15, platform: x64, cxx: clang++, cc: clang }
+          - { os: ubuntu-22.04, platform: x64, cxx: g++-11, cc: gcc-11 }
+          - { os: macos-11, platform: x64, cxx: clang++, cc: clang }
+          - { os: macos-12, platform: x64, cxx: clang++, cc: clang }
 
     runs-on: ${{ matrix.config.os }}
 
@@ -22,7 +22,7 @@ jobs:
       ACTIONS_ALLOW_UNSECURE_COMMANDS: true
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: lukka/get-cmake@latest
 
       - name: Clone LLVM
@@ -38,7 +38,7 @@ jobs:
         run: build/build.sh package_llvm -platform $PLATFORM
 
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: llvm
           path: build/llvm/llvm-*-*.*

.github/workflows/main.yml

@@ -73,8 +73,8 @@ jobs:
     runs-on: windows-2019
     needs: build
     if: |
-      (github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.ref, 'nuget'))) ||
-      (github.event.pull_request.head.repo.full_name != github.repository && contains(github.event.pull_request.head.ref, 'nuget'))
+      (github.event_name == 'push' && (github.ref == 'refs/heads/main' || contains(github.ref, 'nuget') || startsWith(github.ref, 'refs/tags/v'))) ||
+      (github.event.pull_request.head.repo.full_name != github.repository && (contains(github.event.pull_request.head.ref, 'nuget') || startsWith(github.event.pull_request.head.ref, 'refs/tags/v')))
 
     env:
       DOTNET_NOLOGO: true
@@ -111,3 +111,9 @@ jobs:
         run: |
           cd artifacts
           dotnet nuget push "*.nupkg" --api-key ${{ secrets.GITHUB_TOKEN }} --source "https://nuget.pkg.github.com/mono/index.json" --skip-duplicate
+
+      - name: Publish package to nuget.org
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          cd artifacts
+          dotnet nuget push "*.nupkg" --api-key ${{ secrets.NUGET_API_KEY }} --source "https://api.nuget.org/v3/index.json" --skip-duplicate

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "build/modules/premake-qt"]
-	path = build/modules/premake-qt
-	url = https://github.com/dcourtois/premake-qt.git

Directory.Build.props

@@ -34,7 +34,7 @@
     <GeneratorFileExtension>dll</GeneratorFileExtension>
     <DotNetCmd Condition="'$(PlatformTarget)' == 'x86' AND Exists('$(MSBuildProgramFiles32)\dotnet\dotnet.exe')">"$(MSBuildProgramFiles32)\dotnet\dotnet.exe"</DotNetCmd>
     <DotNetCmd Condition="'$(PlatformTarget)' == 'x64' AND Exists('$(ProgramW6432)\dotnet\dotnet.exe')">"$(ProgramW6432)\dotnet\dotnet.exe"</DotNetCmd>
-    <RID Condition="$(IsWindows)">win</RID>    
+    <RID Condition="$(IsWindows)">win</RID>
     <RID Condition="$(IsLinux)">linux</RID>
     <RID Condition="$(IsMacOSX)">osx</RID>
     <RID>$(RID)-$(PlatformTarget)</RID>

README.md

@@ -76,8 +76,6 @@ Please see the following resources for more information:
 
 Feel free to open up issues on Github for any problems you find.
 
-You can also join us at our [#managed-interop](https://gitter.im/managed-interop) Gitter discussion channel.
-
 ## Support
 
 For building wrappers and priority support please write to cppsharp@protonmail.com.

build/Helpers.lua

@@ -43,11 +43,16 @@ newoption {
   description = "Only generate configuration file",
 }
 
+newoption {
+  trigger = "target-framework",
+  description = ".NET target framework version",
+}
+
 rootdir = path.getabsolute("../")
 srcdir = path.join(rootdir, "src");
 incdir = path.join(rootdir, "include");
 examplesdir = path.join(rootdir, "examples");
-testsdir = path.join(rootdir, "tests");
+testsdir = path.join(rootdir, "tests/dotnet");
 builddir = path.join(rootdir, "build")
 bindir = path.join(rootdir, "bin")
 objsdir = path.join(builddir, "obj");
@@ -61,7 +66,17 @@ msvc_cpp_defines = { }
 default_gcc_version = "9.0.0"
 generate_build_config = true
 premake.path = premake.path .. ";" .. path.join(builddir, "modules")
-targetframework = "netcoreapp3.1"
+
+function string.isempty(s)
+  return s == nil or s == ''
+end
+
+local function target_framework()
+  local value =  _OPTIONS["target-framework"]
+  return string.isempty(value) and "net6.0" or value
+end
+
+targetframework = target_framework()
 
 function string.starts(str, start)
    if str == nil then return end

build/build.sh

@@ -6,6 +6,7 @@ vs=vs2019
 configuration=Release
 build_only=false
 ci=false
+target_framework=
 verbosity=minimal
 rootdir="$builddir/.."
 bindir="$rootdir/bin"
@@ -46,18 +47,18 @@ build()
 
 generate_config()
 {
-  "$builddir/premake.sh" --file="$builddir/premake5.lua" $vs --os=$os --arch=$platform --configuration=$configuration --config_only
+  "$builddir/premake.sh" --file="$builddir/premake5.lua" $vs --os=$os --arch=$platform --configuration=$configuration --target-framework=$target_framework --config_only
 }
 
 generate()
 {
   download_llvm
 
   if [ "$os" = "linux" ] || [ "$os" = "macosx" ]; then
-    "$builddir/premake.sh" --file="$builddir/premake5.lua" gmake2 --os=$os --arch=$platform --configuration=$configuration "$@"
+    "$builddir/premake.sh" --file="$builddir/premake5.lua" gmake2 --os=$os --arch=$platform --configuration=$configuration --target-framework=$target_framework "$@"
   fi
 
-  "$builddir/premake.sh" --file="$builddir/premake5.lua" $vs --os=$os --arch=$platform --configuration=$configuration
+  "$builddir/premake.sh" --file="$builddir/premake5.lua" $vs --os=$os --arch=$platform --configuration=$configuration --target-framework=$target_framework
 }
 
 restore()
@@ -194,6 +195,11 @@ while [[ $# > 0 ]]; do
       os=$2
       shift
       ;;
+    -target-framework)
+      target_framework=$2
+      echo $target_framework
+      shift
+      ;;
     -ci)
       ci=true
       export CI=true

build/llvm/Directory.Build.props

@@ -0,0 +1,3 @@
+<Project>
+  <!-- This empty file is to workaround MSBuild picking up the root Directy.Build.props when building LLVM. -->
+</Project>

build/llvm/LLVM.lua

@@ -53,13 +53,15 @@ end
 
 function get_vs_version()
   local function map_msvc_to_vs_version(major, minor)
-    if major == "19" and minor >= "20" then return "vs2019"
+	if major == "19" and minor >= "30" then return "vs2022"
+    elseif major == "19" and minor >= "20" then return "vs2019"
     elseif major == "19" and minor >= "10" then return "vs2017"
     end
   end
 
   local function map_msbuild_to_vs_version(major, minor)
-    if major == "16" then return "vs2019"
+	if major == "17" then return "vs2022"
+    elseif major == "16" then return "vs2019"
     elseif major == "15" then return "vs2017"
 	end
   end
@@ -379,8 +381,6 @@ function cmake(gen, conf, builddir, options)
 		.. ' -DCLANG_TOOL_C_INDEX_TEST_BUILD=false'
 		.. ' -DCLANG_TOOL_DIAGTOOL_BUILD=false'
 		.. ' -DCLANG_TOOL_DRIVER_BUILD=false'
-		.. ' -DCLANG_TOOL_HANDLE_CXX_BUILD=false'
-		.. ' -DCLANG_TOOL_HANDLE_LLVM_BUILD=false'
 		.. ' -DCLANG_TOOL_LIBCLANG_BUILD=false'
 		.. ' -DCLANG_TOOL_SCAN_BUILD_BUILD=false'
 		.. ' -DCLANG_TOOL_SCAN_BUILD_PY_BUILD=false'
@@ -399,7 +399,9 @@ end
 
 function get_cmake_generator()
 	local vsver = get_vs_version()
-	if vsver == "vs2019" then
+	if vsver == "vs2022" then
+		return "Visual Studio 17 2022", (target_architecture() == "x86") and "-A Win32" or nil
+	elseif vsver == "vs2019" then
 		return "Visual Studio 16 2019", (target_architecture() == "x86") and "-A Win32" or nil
 	elseif vsver == "vs2017" then
 		return "Visual Studio 15 2017" .. (target_architecture() == "x64" and " Win64" or ""), nil

build/premake5.lua

@@ -44,7 +44,7 @@ workspace "CppSharp"
   workspacefiles(path.join(builddir, "premake5.lua"))
   workspacefiles(path.join(builddir, "*.sh"))
   workspacefiles(path.join(rootdir, ".github/workflows/*.yml"))
-  workspacefiles(path.join(rootdir, "tests/Test*.props"))
+  workspacefiles(path.join(testsdir, "Test*.props"))
 
   group "Libraries"
     if EnableNativeProjects() then

docs/GettingStarted.md

@@ -35,27 +35,46 @@ make sure those are installed on your system.
 
 ## Compiling on Windows/Visual Studio
 
+The following steps should be called from the VS developer command prompt.
+
 1. Generate the VS solution
 
     ```shell
     cd <CppSharp>\build
-    ./build.sh generate -configuration Release -platform x64
+    <sh> build.sh generate -configuration Release -platform x64
     ```
 
+> :information_source: You can use the `-target-framework` option to target any valid .NET target framework.
+
 2. Compile the VS projects
 
     You can open `CppSharp.sln` and hit F5 or compile via the command line:
 
     ```
-    ./build.sh -configuration Release -platform x64
+    <sh> build.sh -configuration Release -platform x64
     ```
 
 Building in *Release* is recommended because else we will use the Clang parser
 debug configuration, which will be too slow for practical use beyond debugging.
 
+The solution generated will be for Visual Studio 2019.
+
+If you have a more recent version of Visual Studio, you can either:
+- install Visual Studio 2019 
+- install Visual Studio 2019 build tools, from [Visual Studio Installer](https://visualstudio.microsoft.com/downloads/)
+  - select the payload *MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.29-16.11)*
+
+Please note that Windows isn't natively able to run sh scripts, to remediate this, you can either:
+
+- use the one from Visual Studio if present
+  - e.g. `C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\TeamFoundation\Team Explorer\Git\usr\bin\sh.exe`
+- use the one from [Git for Windows](https://gitforwindows.org/)
+  - e.g. `C:\Program Files\Git\bin\sh.exe`
+
+When opening the solution for the first time on a more recent version than Visual Studio 2019, you will be prompted to retarget projects to one of the platform toolset available on your system.
+
 ## Compiling on macOS or Linux
 
-The following steps should be called from the VS developer command prompt.
 
 1. Generate the VS solution and makefiles 
 
@@ -65,6 +84,8 @@ The following steps should be called from the VS developer command prompt.
     ./build.sh generate -configuration Release -platform x64
     ```
 
+> :information_source: You can use the `-target-framework` option to target any valid .NET target framework.
+
 2. Compile the csproj files and makefiles
 
     ```

docs/UsersManual.md

@@ -39,6 +39,7 @@ There is also experimental support for these JavaScript-related targets:
 - N-API (Node.js)
 - QuickJS
 - TypeScript
+- Emscripten
 
 # 3. Native Targets
 

examples/Parser/Parser.cs

@@ -23,12 +23,12 @@ public static void Main(string[] args)
             ParseSourceFile(file);
         }
 
-        public static bool ParseSourceFile(string file)
+        private static bool ParseSourceFile(string file)
         {
             // Lets setup the options for parsing the file.
             var parserOptions = new ParserOptions
             {
-                LanguageVersion = LanguageVersion.CPP11,
+                LanguageVersion = LanguageVersion.CPP20_GNU,
 
                 // Verbose here will make sure the parser outputs some extra debugging
                 // information regarding include directories, which can be helpful when
@@ -37,13 +37,10 @@ public static bool ParseSourceFile(string file)
             };
 
             // This will setup the necessary system include paths and arguments for parsing.
-            // It will probe into the registry (on Windows) and filesystem to find the paths
-            // of the system toolchains and necessary include directories.
-            parserOptions.Setup();
+            parserOptions.Setup(Platform.Host);
 
             // We create the Clang parser and parse the source code.
-            var parser = new ClangParser();
-            var parserResult = parser.ParseSourceFile(file, parserOptions);
+            var parserResult = ClangParser.ParseSourceFile(file, parserOptions);
 
             // If there was some kind of error parsing, then lets print some diagnostics.
             if (parserResult.Kind != ParserResultKind.Success)

src/AST/ASTContext.cs

@@ -11,7 +11,8 @@ public enum CppAbi
         Microsoft,
         ARM,
         iOS,
-        iOS64
+        iOS64,
+        WebAssembly
     }
 
     /// <summary>

src/AST/Class.cs

@@ -291,6 +291,11 @@ public Method FindMethodByUSR(string usr)
                 .FirstOrDefault(m => m.USR == usr);
         }
 
+        public Variable FindVariable(string name)
+        {
+            return Variables.FirstOrDefault(m => m.Name == name);
+        }
+
         public override T Visit<T>(IDeclVisitor<T> visitor)
         {
             return visitor.VisitClassDecl(this);

src/AST/ClassLayout.cs

@@ -31,14 +31,7 @@ public struct VTableComponent
         public Declaration Declaration;
 
         /// Method declaration (if Kind == FunctionPointer).
-        public Method Method
-        {
-            get
-            {
-                Debug.Assert(Kind == VTableComponentKind.FunctionPointer);
-                return Declaration as Method;
-            }
-        }
+        public Method Method => Declaration as Method;
     }
 
     /// <summary>