Implement projection tooling for simple P/Invoke cases

.gitignore

@@ -190,3 +190,15 @@ Session.vim
 
 # VS debug support files
 launchSettings.json
+
+# Swift output files
+*.swiftinterface*
+*.swiftdoc*
+*.swiftmodule*
+*.abi*
+*.swiftsourceinfo*
+*.dylib
+
+# Testing artifacts
+testing/
+src/samples/**/*Bindings.cs

Directory.Build.targets

@@ -8,7 +8,7 @@
                         TargetingPackVersion="$(MicrosoftNETCoreAppVersion)" />
   </ItemGroup>
 
-  <Import Condition="'$(IsTestProject)' == 'true'" Project="$(RepositoryEngineeringDir)testing\runsettings.targets" />
+  <!-- <Import Condition="'$(IsTestProject)' == 'true'" Project="$(RepositoryEngineeringDir)testing\runsettings.targets" /> -->
 
   <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 </Project>

README.md

@@ -2,9 +2,18 @@
 
 This is a collection of tools designed to consume a compiled Apple Swift library and generate bindings and wrappers that enable it to be used as a .NET library.
 
-## Current Status
-
-The components are currently undergoing iterative reviews and will be moved from https://github.com/xamarin/binding-tools-for-swift.
+## Installation and usage
+
+The tool will be available as a NuGet CLI package in the [`dotnet-experimental`](https://dev.azure.com/dnceng/public/_packaging?_a=feed&feed=dotnet-experimental) feed.
+
+Options:
+```
+  -d, --dylib             Required. Path to the dynamic library.
+  -s, --swiftinterface    Required. Path to the Swift interface file.
+  -o, --output            Required. Output directory for generated bindings.
+  -v, --verbose           Information about work in process.
+  -h, --help              Display this help message.
+```
 
 ## .NET Foundation
 

SwiftBindings.sln

@@ -0,0 +1,132 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.26124.0
+MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftBindings", "src\SwiftBindings\src\SwiftBindings.csproj", "{B7977360-6671-4707-9A1C-1C29D5BE2674}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftBindings.Tests", "src\SwiftBindings\tests\SwiftBindings.Tests.csproj", "{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftReflector.Tests", "src\SwiftReflector\tests\SwiftReflector.Tests.csproj", "{1C381A63-38D7-4801-97CB-5FA7F683E28A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftReflector", "src\SwiftReflector\src\SwiftReflector.csproj", "{EF015979-24E8-490E-B940-F28988EC5C19}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftRuntimeLibrary", "src\SwiftRuntimeLibrary\src\SwiftRuntimeLibrary.csproj", "{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SwiftRuntimeLibrary.Tests", "src\SwiftRuntimeLibrary\tests\SwiftRuntimeLibrary.Tests.csproj", "{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxDynamo", "src\SyntaxDynamo\src\SyntaxDynamo.csproj", "{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SyntaxDynamo.Tests", "src\SyntaxDynamo\tests\SyntaxDynamo.Tests.csproj", "{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x64.Build.0 = Debug|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Debug|x86.Build.0 = Debug|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x64.ActiveCfg = Release|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x64.Build.0 = Release|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x86.ActiveCfg = Release|Any CPU
+		{B7977360-6671-4707-9A1C-1C29D5BE2674}.Release|x86.Build.0 = Release|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x64.Build.0 = Debug|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Debug|x86.Build.0 = Debug|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x64.ActiveCfg = Release|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x64.Build.0 = Release|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x86.ActiveCfg = Release|Any CPU
+		{CE81B6BD-CCCC-4223-9069-B28435A4A5C1}.Release|x86.Build.0 = Release|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Debug|x64.Build.0 = Debug|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Debug|x86.Build.0 = Debug|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Release|x64.ActiveCfg = Release|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Release|x64.Build.0 = Release|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Release|x86.ActiveCfg = Release|Any CPU
+		{1C381A63-38D7-4801-97CB-5FA7F683E28A}.Release|x86.Build.0 = Release|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Debug|x64.Build.0 = Debug|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Debug|x86.Build.0 = Debug|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Release|x64.ActiveCfg = Release|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Release|x64.Build.0 = Release|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Release|x86.ActiveCfg = Release|Any CPU
+		{EF015979-24E8-490E-B940-F28988EC5C19}.Release|x86.Build.0 = Release|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Release|x64.Build.0 = Release|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E9013BE-01BD-4F4C-8BF7-E8C71FA6608E}.Release|x86.Build.0 = Release|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Debug|x64.Build.0 = Debug|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Debug|x86.Build.0 = Debug|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Release|x64.ActiveCfg = Release|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Release|x64.Build.0 = Release|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Release|x86.ActiveCfg = Release|Any CPU
+		{61F74BC6-1CCA-49FA-B5B8-6C9EABC1D0AB}.Release|x86.Build.0 = Release|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Debug|x64.Build.0 = Debug|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Debug|x86.Build.0 = Debug|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Release|x64.ActiveCfg = Release|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Release|x64.Build.0 = Release|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Release|x86.ActiveCfg = Release|Any CPU
+		{E05ECC4A-7212-4077-AD30-E4183CA3C1AF}.Release|x86.Build.0 = Release|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Debug|x64.Build.0 = Debug|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Debug|x86.Build.0 = Debug|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Release|x64.ActiveCfg = Release|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Release|x64.Build.0 = Release|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Release|x86.ActiveCfg = Release|Any CPU
+		{0C13F0AC-76F1-4FCB-AF42-9CB910A9471B}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+EndGlobal

eng/Versions.props

@@ -13,7 +13,7 @@
     <UsingToolXliff>false</UsingToolXliff>
     <!-- Libs -->
     <MicrosoftNETTestSdkVersion>16.7.1</MicrosoftNETTestSdkVersion>
-    <XUnitVersion>2.4.1</XUnitVersion>
+    <XUnitVersion>2.4.2</XUnitVersion>
     <XUnitRunnerVisualStudioVersion>2.4.3</XUnitRunnerVisualStudioVersion>
     <!-- Set the custom NETCoreApp version -->
     <MicrosoftNETCoreAppVersion>7.0.0-preview.7.22375.6</MicrosoftNETCoreAppVersion>

eng/pipelines/runtimelab.yml

@@ -49,16 +49,33 @@ stages:
 - stage: build
   displayName: Build
   jobs:
-  - template: /eng/pipelines/templates/build-job.yml
-    parameters:
-      osGroup: OSX
-      archType: x64
-      ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+  - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/pipelines/templates/build-job.yml
+      parameters:
+        osGroup: OSX
+        archType: x64
         isOfficialBuild: true
         runTests: false
         pool:
           vmImage: 'macOS-latest'
 
+  - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}:
+    - template: /eng/pipelines/templates/build-job.yml
+      parameters:
+        osGroup: OSX
+        archType: arm64
+        runTests: true
+        pool:
+          vmImage: 'macOS-latest'
+
+    - template: /eng/pipelines/templates/build-job.yml
+      parameters:
+        osGroup: OSX
+        archType: x64
+        runTests: true
+        pool:
+          vmImage: 'macOS-latest'
+
 # Publish and validation steps. Only run in official builds
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - template: \eng\common\templates\post-build\post-build.yml

global.json

@@ -8,6 +8,6 @@
     "dotnet": "8.0.100"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24102.4"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22430.3"
   }
 }

src/SwiftBindings/src/BindingsCompiler.cs

@@ -0,0 +1,59 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using SyntaxDynamo;
+using SyntaxDynamo.CSLang;
+using SwiftReflector.SwiftXmlReflection;
+using SwiftReflector.TypeMapping;
+
+namespace SwiftReflector
+{
+    public class BindingsCompiler
+    {
+        UnicodeMapper UnicodeMapper;
+        TypeMapper TypeMapper;
+        FunctionCompiler TLFCompiler;
+
+        public BindingsCompiler()
+        {
+            UnicodeMapper = new UnicodeMapper();
+            TypeMapper = new TypeMapper(null, UnicodeMapper);
+            TLFCompiler = new FunctionCompiler(TypeMapper);
+        }
+
+        public void CompileModule(ModuleDeclaration decl, string outputDirectory, ErrorHandling errors)
+        {
+            var namespaceName = $"{decl.Name}Bindings";
+            var csNamespace = new CSNamespace(namespaceName);
+            var csUsingPackages = new CSUsingPackages("System", "System.Runtime.InteropServices");
+            var csClass = new CSClass(CSVisibility.Public, decl.Name);
+
+            var csFile = new CSFile(csUsingPackages, new CSNamespace[] { csNamespace });
+            csNamespace.Block.Add(csClass);
+            IEnumerable<CSMethod> methods = CompileFunctions(decl.Functions, errors);
+            csClass.Methods.AddRange(methods);
+
+            string csOutputPath = Path.Combine(outputDirectory, string.Format("{0}.cs", namespaceName));
+            CodeWriter.WriteToFile(csOutputPath, csFile);
+        }
+
+        IEnumerable<CSMethod> CompileFunctions(IEnumerable<FunctionDeclaration> decls, ErrorHandling errors)
+        {
+            List<CSMethod> methods = new List<CSMethod>();
+            foreach (FunctionDeclaration decl in decls)
+            {
+                var piMethod = TLFCompiler.CompileMethod(decl, true);
+                methods.Add(piMethod);
+                var publicMethod = TLFCompiler.CompileMethod(decl, false);
+                methods.Add(publicMethod);
+
+                var marshaler = new MarshalEngine(null, null, TypeMapper, null);
+                var lines = marshaler.MarshalFunctionCall(decl, publicMethod, piMethod);
+                publicMethod.Body.AddRange(lines);
+            }
+
+            return methods;
+        }
+    }
+}