C# Build Integration (#316)

* Adding the C# build to the Azure Pipeline.
* Standardizing names of projects and aligning project and folder names.
* Removing the C# unit test's runtime dependency on the Binary folder.

CMakeLists.txt

@@ -181,6 +181,14 @@ set(TARGET_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 
 # CMake doesn't set the target processor correctly for MSVC
 if ("${CMAKE_C_COMPILER_ID}" STREQUAL "MSVC")
+    if ("${CMAKE_CONFIGURATION_TYPES}" STREQUAL "")
+		set(K4A_BINARY_DIR_DEBUG ${PROJECT_BINARY_DIR}/bin)
+		set(K4A_BINARY_DIR_RELEASE ${PROJECT_BINARY_DIR}/bin)
+    else()
+		set(K4A_BINARY_DIR_DEBUG ${PROJECT_BINARY_DIR}/bin/Debug)
+		set(K4A_BINARY_DIR_RELEASE ${PROJECT_BINARY_DIR}/bin/RelWithDebInfo)
+    endif()
+
     if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         set(TARGET_ARCH "amd64")
 		configure_file(k4a.props.in ${CMAKE_CURRENT_SOURCE_DIR}/src/csharp/k4a.x64.props)

StubGenerator.xml.in

@@ -1,6 +1,4 @@
 <Paths>
-    <K4A_BINARY_DIR>@PROJECT_BINARY_DIR@</K4A_BINARY_DIR>
-    <K4A_SOURCE_DIR>@PROJ_DIR@</K4A_SOURCE_DIR>
     <CMAKE_CXX_COMPILER>@CMAKE_CXX_COMPILER@</CMAKE_CXX_COMPILER>
     <CMAKE_LINKER>@CMAKE_LINKER@</CMAKE_LINKER>
     <INCLUDE>$ENV{INCLUDE}</INCLUDE>

azure-pipelines.yml

@@ -30,83 +30,115 @@ jobs:
         CMakeArch: 'amd64'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'debug'
+        MSBuildPlatform: 'x64'
+        MSBuildConfiguration: 'Debug'
         vmImage: 'vs2017-win2016'
       VS2017_x64-msvc_rel_ninja:
         CMakeArch: 'amd64'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'relwithdebinfo'
+        MSBuildPlatform: 'x64'
+        MSBuildConfiguration: 'Release'
         vmImage: 'vs2017-win2016'
       VS2017_x64-msvc_debug_msbuild:
         CMakeArch: 'amd64'
         BuildGenerator: 'Visual Studio 15 2017 Win64'
         CMakeConfiguration: 'debug'
+        MSBuildPlatform: 'x64'
+        MSBuildConfiguration: 'Debug'
         vmImage: 'vs2017-win2016'
       VS2017_x64-msvc_rel_msbuild:
         CMakeArch: 'amd64'
         BuildGenerator: 'Visual Studio 15 2017 Win64'
         CMakeConfiguration: 'relwithdebinfo'
+        MSBuildPlatform: 'x64'
+        MSBuildConfiguration: 'Release'
         vmImage: 'vs2017-win2016'
       VS2017_x86-msvc_debug_ninja:
         CMakeArch: 'x86'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'debug'
+        MSBuildPlatform: 'x86'
+        MSBuildConfiguration: 'Debug'
         vmImage: 'vs2017-win2016'
       VS2017_x86-msvc_rel_ninja:
         CMakeArch: 'x86'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'relwithdebinfo'
+        MSBuildPlatform: 'x86'
+        MSBuildConfiguration: 'Release'
         vmImage: 'vs2017-win2016'
       VS2017_x86-msvc_debug_msbuild:
         CMakeArch: 'x86'
         BuildGenerator: 'Visual Studio 15 2017'
         CMakeConfiguration: 'debug'
+        MSBuildPlatform: 'x86'
+        MSBuildConfiguration: 'Debug'
         vmImage: 'vs2017-win2016'
       VS2017_x86-msvc_rel_msbuild:
         CMakeArch: 'x86'
         BuildGenerator: 'Visual Studio 15 2017'
         CMakeConfiguration: 'relwithdebinfo'
+        MSBuildPlatform: 'x86'
+        MSBuildConfiguration: 'Release'
         vmImage: 'vs2017-win2016'
       VS2019_x64-msvc_debug_ninja:
         CMakeArch: 'amd64'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'debug'
+        MSBuildPlatform: 'x64'
+        MSBuildConfiguration: 'Debug'
         vmImage: 'windows-2019'
       VS2019_x64-msvc_rel_ninja:
         CMakeArch: 'amd64'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'relwithdebinfo'
+        MSBuildPlatform: 'x64'
+        MSBuildConfiguration: 'Release'
         vmImage: 'windows-2019'
       # VS2019 msbuild generators blocked by issue Microsoft/azure-pipelines-image-generation#754
       # VS2019_x86_64-pc-windows-msvc_debug_msbuild:
       #   CMakeArch: 'amd64'
       #   BuildGenerator: 'Visual Studio 16 2019'
       #   CMakeConfiguration: 'debug'
+      #   MSBuildPlatform: 'x64'
+      #   MSBuildConfiguration: 'Debug'
       #   vmImage: 'windows-2019'
       # VS2019_x86_64-pc-windows-msvc_relwithdebinfo_msbuild:
       #   CMakeArch: 'amd64'
       #   BuildGenerator: 'Visual Studio 16 2019'
       #   CMakeConfiguration: 'relwithdebinfo'
+      #   MSBuildPlatform: 'x64'
+      #   MSBuildConfiguration: 'Release'
       #   vmImage: 'windows-2019'
       VS2019_x86-msvc_debug_ninja:
         CMakeArch: 'x86'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'debug'
+        MSBuildPlatform: 'x86'
+        MSBuildConfiguration: 'Debug'
         vmImage: 'windows-2019'
       VS2019_x86-msvc_rel_ninja:
         CMakeArch: 'x86'
         BuildGenerator: 'Ninja'
         CMakeConfiguration: 'relwithdebinfo'
+        MSBuildPlatform: 'x86'
+        MSBuildConfiguration: 'Release'
         vmImage: 'windows-2019'
       # VS2019 msbuild generators blocked by issue Microsoft/azure-pipelines-image-generation#754
       # VS2019_x86-pc-windows-msvc_debug_msbuild:
       #   CMakeArch: 'x86'
       #   BuildGenerator: 'Visual Studio 16 2019'
       #   CMakeConfiguration: 'debug'
+      #   MSBuildPlatform: 'x86'
+      #   MSBuildConfiguration: 'Debug'
       #   vmImage: 'windows-2019'
       # VS2019_x86-pc-windows-msvc_relwithdebinfo_msbuild:
       #   CMakeArch: 'x86'
       #   BuildGenerator: 'Visual Studio 16 2019'
       #   CMakeConfiguration: 'relwithdebinfo'
+      #   MSBuildPlatform: 'x86'
+      #   MSBuildConfiguration: 'Release'
       #   vmImage: 'windows-2019'
   pool:
     vmImage: $(vmImage)
@@ -233,6 +265,68 @@ jobs:
       testRunTitle: 'Unit Tests'
     condition: succeededOrFailed()
 
+  # Create a placeholder version of the depth engine to satisfy MSBuild copy rules.
+  # This version is not needed for actual execution.
+  # In the future we should fetch the real version from a valid source.
+  - powershell: |
+      if ("$(BuildGenerator)" -eq "Ninja")
+      {
+        IF(-Not (Test-Path "$(Build.BinariesDirectory)\bin\depthengine_1_0.dll")) { Add-Content "$(Build.BinariesDirectory)\bin\depthengine_1_0.dll" "Placeholder file, please download real depth engine." }
+      }
+      elseif ("$(BuildGenerator)" -like "Visual Studio *")
+      {
+        IF(-Not (Test-Path "$(Build.BinariesDirectory)\bin\$(CMakeConfiguration)\depthengine_1_0.dll")) { Add-Content "$(Build.BinariesDirectory)\bin\$(CMakeConfiguration)\depthengine_1_0.dll" "Placeholder file, please download real depth engine." }
+      }
+      else
+      {
+        Write-Error "Unknown Generator <<$(BuildGenerator)>>"
+      }
+    displayName: 'Create placeholder depth engine'
+
+  - task: NuGetToolInstaller@0
+    inputs:
+      versionSpec: '>=4.3.1' 
+
+  - task: 333b11bd-d341-40d9-afcf-b32d5ce6f23b@2 # NuGetCommand@2
+    inputs:
+      command: 'restore'
+      solution: '$(Build.SourcesDirectory)\src\csharp\K4a.sln'
+
+  - task: VSBuild@1
+    displayName: 'Build C# Wrappers'
+    inputs:
+      solution: '$(Build.SourcesDirectory)\src\csharp\K4a.sln'
+      msbuildArgs: '/p:BaseOutputPath="$(Build.BinariesDirectory)\$(MSBuildConfiguration)\\"'
+      platform: '$(MSBuildPlatform)'
+      configuration: '$(MSBuildConfiguration)'
+
+  - task: VSTest@2
+    displayName: 'Run C# Unit Tests'
+    inputs:
+      testSelector: 'testAssemblies'
+      searchFolder: '$(Build.BinariesDirectory)'
+      platform: '$(MSBuildPlatform)'
+      configuration: '$(MSBuildConfiguration)'
+      testAssemblyVer2: |
+        **/*UnitTests.dll
+        !**/obj/**
+  
+  # Clean up any placeholder version of the depth engine that were created.
+  - powershell: |
+      if ("$(BuildGenerator)" -eq "Ninja")
+      {
+        IF(Test-Path "$(Build.BinariesDirectory)\bin\depthengine_1_0.dll") { Remove-Item "$(Build.BinariesDirectory)\bin\depthengine_1_0.dll" }
+      }
+      elseif ("$(BuildGenerator)" -like "Visual Studio *")
+      {
+        IF(Test-Path "$(Build.BinariesDirectory)\bin\$(CMakeConfiguration)\depthengine_1_0.dll") { Remove-Item "$(Build.BinariesDirectory)\bin\$(CMakeConfiguration)\depthengine_1_0.dll" }        
+      }
+      else
+      {
+        Write-Error "Unknown Generator <<$(BuildGenerator)>>"
+      }
+    displayName: 'Clean up temp depth engine'
+
   - task: CopyFiles@2
     displayName: 'Copy build folder to Staging'
     inputs:
@@ -472,6 +566,8 @@ jobs:
       - Agent.OS -equals Windows_NT
 
     steps:
+    - task: VisualStudioTestPlatformInstaller@1
+
     - checkout: self
       clean: true
       lfs: false
@@ -497,7 +593,6 @@ jobs:
          Invoke-WebRequest -uri "$(ResourceBaseUrl)/firmware/AzureKinectDK_Fw_$(firmware_version).bin$(ResourceToken)" -OutFile "$(System.ArtifactsDirectory)\firmware\AzureKinectDK_Fw_$(firmware_version).bin"
       displayName: 'Download Resources'
 
-
     - task: CopyFiles@2
       displayName: "Copy DepthEnginePlugin into bin folder"
       inputs:
@@ -531,13 +626,24 @@ jobs:
       timeoutInMinutes: 15
       continueOnError: true
 
+    # Issue #322, figure out the dependencies to be able to run the functional tests.
+    # - task: VSTest@2
+    #   displayName: 'Run C# Functional Tests'
+    #   inputs:
+    #     testSelector: 'testAssemblies'
+    #     searchFolder: '$(Build.BinariesDirectory)'
+    #     platform: '$(MSBuildPlatform)'
+    #     configuration: '$(MSBuildConfiguration)'
+    #     testAssemblyVer2: |
+    #       **/*FunctionalTests.dll
+    #       !**/obj/**
+
     - task: PowerShell@2
       inputs:
         targetType: 'filePath'
         filePath: './scripts/Reset-Device.ps1'
       displayName: 'Reset K4A Device'
 
-
 - ${{ if eq(variables['System.CollectionId'], 'cb55739e-4afe-46a3-970f-1b49d8ee7564') }}:
   - job: LinuxFunctionalTests
     displayName: Linux Functional Test

k4a.props.in

@@ -1,5 +1,11 @@
 <Project>
   <PropertyGroup>
-    <K4aBinaryDirectory>@PROJECT_BINARY_DIR@</K4aBinaryDirectory>
-  </PropertyGroup>  
+    <K4aGeneratorSourcesDirectory>@PROJECT_BINARY_DIR@/src</K4aGeneratorSourcesDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <K4aBinaryDirectory>@K4A_BINARY_DIR_DEBUG@</K4aBinaryDirectory>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <K4aBinaryDirectory>@K4A_BINARY_DIR_RELEASE@</K4aBinaryDirectory>
+  </PropertyGroup>
 </Project>

src/csharp/K4a.sln

@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28809.33
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.572
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AzureKinect.Examples.WPFViewer", "Microsoft.AzureKinect.Examples.WPFViewer\Microsoft.AzureKinect.Examples.WPFViewer.csproj", "{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureKinect", "Microsoft.AzureKinect\Microsoft.AzureKinect.csproj", "{847B31D5-C253-4766-BF81-032F4670589D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureKinect.FunctionalTests", "WrapperTests\Microsoft.AzureKinect.FunctionalTests.csproj", "{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureKinect.FunctionalTests", "Microsoft.AzureKinect.FunctionalTests\Microsoft.AzureKinect.FunctionalTests.csproj", "{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubValidator", "StubValidator\StubValidator.csproj", "{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}"
 EndProject
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureKinect.UnitT
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "StubGenerator", "StubGenerator", "{5C3A9F92-56B4-4A7B-86EC-BACBE07C5AAE}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureKinect.Test.StubGenerator.Test", "Microsoft.AzureKinect.Test.StubGenerator.Test\Microsoft.AzureKinect.Test.StubGenerator.Test.csproj", "{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AzureKinect.Test.StubGenerator.UnitTests", "Microsoft.AzureKinect.Test.StubGenerator.UnitTests\Microsoft.AzureKinect.Test.StubGenerator.UnitTests.csproj", "{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AzureKinect.WPF", "Microsoft.AzureKinect.WPF\Microsoft.AzureKinect.WPF.csproj", "{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}"
 EndProject
@@ -27,122 +27,88 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AzureKinect.WinFo
 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(ProjectConfigurationPlatforms) = postSolution
-		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Debug|x64.ActiveCfg = Debug|x64
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Debug|x64.Build.0 = Debug|x64
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Debug|x86.ActiveCfg = Debug|x86
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Debug|x86.Build.0 = Debug|x86
-		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Release|x64.ActiveCfg = Release|x64
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Release|x64.Build.0 = Release|x64
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Release|x86.ActiveCfg = Release|x86
 		{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}.Release|x86.Build.0 = Release|x86
-		{847B31D5-C253-4766-BF81-032F4670589D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{847B31D5-C253-4766-BF81-032F4670589D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Debug|x64.Build.0 = Debug|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Debug|x86.Build.0 = Debug|Any CPU
-		{847B31D5-C253-4766-BF81-032F4670589D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{847B31D5-C253-4766-BF81-032F4670589D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Release|x64.ActiveCfg = Release|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Release|x64.Build.0 = Release|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Release|x86.ActiveCfg = Release|Any CPU
 		{847B31D5-C253-4766-BF81-032F4670589D}.Release|x86.Build.0 = Release|Any CPU
-		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Debug|x64.ActiveCfg = Debug|x64
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Debug|x64.Build.0 = Debug|x64
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Debug|x86.ActiveCfg = Debug|x86
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Debug|x86.Build.0 = Debug|x86
-		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Release|Any CPU.ActiveCfg = Release|x86
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Release|x64.ActiveCfg = Release|x64
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Release|x64.Build.0 = Release|x64
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Release|x86.ActiveCfg = Release|x86
 		{41510BD0-7F25-470B-A1DC-12E1DB1AB3B7}.Release|x86.Build.0 = Release|x86
-		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Debug|x64.ActiveCfg = Debug|x64
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Debug|x64.Build.0 = Debug|x64
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Debug|x86.ActiveCfg = Debug|x86
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Debug|x86.Build.0 = Debug|x86
-		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Release|Any CPU.ActiveCfg = Release|x86
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Release|x64.ActiveCfg = Release|x64
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Release|x64.Build.0 = Release|x64
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Release|x86.ActiveCfg = Release|x86
 		{9C78ECE9-FDCF-4E72-979A-6C93E1201DA9}.Release|x86.Build.0 = Release|x86
-		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Debug|x64.Build.0 = Debug|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Debug|x86.Build.0 = Debug|Any CPU
-		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Release|x64.ActiveCfg = Release|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Release|x64.Build.0 = Release|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Release|x86.ActiveCfg = Release|Any CPU
 		{FCD1E629-1E96-4BDD-A247-35B50F31137A}.Release|x86.Build.0 = Release|Any CPU
-		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Debug|x64.ActiveCfg = Debug|x64
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Debug|x64.Build.0 = Debug|x64
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Debug|x86.ActiveCfg = Debug|x86
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Debug|x86.Build.0 = Debug|x86
-		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Release|Any CPU.ActiveCfg = Release|x86
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Release|x64.ActiveCfg = Release|x64
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Release|x64.Build.0 = Release|x64
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Release|x86.ActiveCfg = Release|x86
 		{6D4EC05A-3A81-4B92-8881-96F499F5986B}.Release|x86.Build.0 = Release|x86
-		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Debug|Any CPU.ActiveCfg = Debug|x86
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Debug|x64.ActiveCfg = Debug|x64
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Debug|x64.Build.0 = Debug|x64
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Debug|x86.ActiveCfg = Debug|x86
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Debug|x86.Build.0 = Debug|x86
-		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Release|Any CPU.ActiveCfg = Release|x86
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Release|x64.ActiveCfg = Release|x64
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Release|x64.Build.0 = Release|x64
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Release|x86.ActiveCfg = Release|x86
 		{E1B3CC41-BC1C-47B7-A6A6-AA50E6994C05}.Release|x86.Build.0 = Release|x86
-		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Debug|x64.Build.0 = Debug|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Debug|x86.Build.0 = Debug|Any CPU
-		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Release|Any CPU.Build.0 = Release|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Release|x64.ActiveCfg = Release|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Release|x64.Build.0 = Release|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Release|x86.ActiveCfg = Release|Any CPU
 		{4762DD42-3CF3-4742-9AEA-5D39781FD2A6}.Release|x86.Build.0 = Release|Any CPU
-		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Debug|x64.ActiveCfg = Debug|x64
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Debug|x64.Build.0 = Debug|x64
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Debug|x86.ActiveCfg = Debug|x86
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Debug|x86.Build.0 = Debug|x86
-		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Release|Any CPU.Build.0 = Release|Any CPU
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Release|x64.ActiveCfg = Release|x64
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Release|x64.Build.0 = Release|x64
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Release|x86.ActiveCfg = Release|x86
 		{8A14FB66-07CD-4E4C-A533-89DE0AFF4FCB}.Release|x86.Build.0 = Release|x86
-		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Debug|x64.Build.0 = Debug|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Debug|x86.ActiveCfg = Debug|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Debug|x86.Build.0 = Debug|Any CPU
-		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Release|Any CPU.Build.0 = Release|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Release|x64.ActiveCfg = Release|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Release|x64.Build.0 = Release|Any CPU
 		{618E28C5-0624-463F-9ADB-040BA5DAED68}.Release|x86.ActiveCfg = Release|Any CPU

src/csharp/Microsoft.AzureKinect.Examples.WPFViewer/Microsoft.AzureKinect.Examples.WPFViewer.csproj

@@ -7,8 +7,8 @@
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
     <ProjectGuid>{CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>K4aWpfTestApplication</RootNamespace>
-    <AssemblyName>K4aWpfTestApplication</AssemblyName>
+    <RootNamespace>Microsoft.AzureKinect.Examples.WPFViewer</RootNamespace>
+    <AssemblyName>Microsoft.AzureKinect.Examples.WPFViewer</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
@@ -122,15 +122,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(K4aBinaryDirectory)\bin\k4a.dll">
+    <Content Include="$(K4aBinaryDirectory)\k4a.dll">
       <Link>k4a.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(K4aBinaryDirectory)\bin\libusb-1.0.dll">
-      <Link>libusb-1.0.dll</Link>
+    <Content Include="$(K4aBinaryDirectory)\k4a.pdb">
+      <Link>k4a.pdb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(K4aBinaryDirectory)\bin\depthengine_1_0.dll">
+    <Content Include="$(K4aBinaryDirectory)\depthengine_1_0.dll">
       <Link>depthengine_1_0.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/csharp/Microsoft.AzureKinect.Examples.WinForms/Microsoft.AzureKinect.Examples.WinForms.csproj

@@ -107,15 +107,15 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="$(K4aBinaryDirectory)\bin\k4a.dll">
+    <Content Include="$(K4aBinaryDirectory)\k4a.dll">
       <Link>k4a.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(K4aBinaryDirectory)\bin\libusb-1.0.dll">
-      <Link>libusb-1.0.dll</Link>
+    <Content Include="$(K4aBinaryDirectory)\k4a.pdb">
+      <Link>k4a.pdb</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="$(K4aBinaryDirectory)\bin\depthengine_1_0.dll">
+    <Content Include="$(K4aBinaryDirectory)\depthengine_1_0.dll">
       <Link>depthengine_1_0.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>

src/csharp/Microsoft.AzureKinect.FunctionalTests/Microsoft.AzureKinect.FunctionalTests.csproj

@@ -11,15 +11,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="$(K4aBinaryDirectory)\bin\k4a.dll" Link="k4a.dll">
+    <Content Include="$(K4aBinaryDirectory)\k4a.dll" Link="k4a.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="$(K4aBinaryDirectory)\bin\k4a.pdb" Link="k4a.pdb">
+    </Content>
+    <Content Include="$(K4aBinaryDirectory)\k4a.pdb" Link="k4a.pdb">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="$(K4aBinaryDirectory)\bin\libusb-1.0.dll" Link="libusb-1.0.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>

src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/Microsoft.AzureKinect.Test.StubGenerator.Test.csproj

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\k4a.props" />
-
-  <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-
-    <Platforms>x64;x86</Platforms>
-    <OutputPath>$(BaseOutputPath)$(AssemblyName)\</OutputPath>
-  </PropertyGroup>
-  
-  <ItemGroup>
-    <Content Include="..\StubGenerator.$(Platform).xml">
-      <Link>appsettings.xml</Link>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="nunit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Microsoft.AzureKinect.Test.StubGenerator\Microsoft.AzureKinect.Test.StubGenerator.csproj" />
-  </ItemGroup>
-
-</Project>

src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/Microsoft.AzureKinect.Test.StubGenerator.UnitTests.csproj

@@ -0,0 +1,55 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Import Project="..\k4a.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
+
+    <IsPackable>false</IsPackable>
+
+    <Platforms>x64;x86</Platforms>
+    <OutputPath>$(BaseOutputPath)$(AssemblyName)\</OutputPath>
+  </PropertyGroup>
+  
+  <ItemGroup>
+    <Content Include="..\StubGenerator.$(Platform).xml" Link="appsettings.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\include\k4a\k4a.h" Link="k4a\k4a.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\include\k4a\k4atypes.h" Link="k4a\k4atypes.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aGeneratorSourcesDirectory)\sdk\include\k4a\k4aversion.h" Link="k4a\k4aversion.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aGeneratorSourcesDirectory)\sdk\include\k4a\k4a_export.h" Link="k4a\k4a_export.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aBinaryDirectory)\k4a.dll" Link="k4a\k4a.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aBinaryDirectory)\k4a.pdb" Link="k4a\k4a.pdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Microsoft.AzureKinect.Test.StubGenerator\Stub.cpp" Link="stub\Stub.cpp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Microsoft.AzureKinect.Test.StubGenerator\Stub.h" Link="stub\Stub.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Microsoft.AzureKinect.Test.StubGenerator\StubImplementation.h" Link="stub\StubImplementation.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="nunit" Version="3.10.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.AzureKinect.Test.StubGenerator\Microsoft.AzureKinect.Test.StubGenerator.csproj" />
+  </ItemGroup>
+</Project>

src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/StubTests.cs

@@ -50,8 +50,8 @@ namespace Tests
         public Tests()
         {
             NativeInterface k4ainterface = NativeInterface.Create(
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_BINARY_DIR%\bin\k4a.dll"),
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_SOURCE_DIR%\include\k4a\k4a.h"));
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.dll"),
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.h"));
 
             k4a = StubbedModule.Create("k4a", k4ainterface);
         }

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Compiler.cs

@@ -49,14 +49,14 @@ namespace Microsoft.AzureKinect.Test.StubGenerator
             }
             foreach (DirectoryInfo includePath in options.IncludePaths)
             {
-                compilerArguments.Append($" \"/I{includePath.FullName}\"");
+                compilerArguments.Append($" \"/I{includePath.FullName.TrimEnd('\\')}\"");
             }
 
             // Linker options
             compilerArguments.Append(" /link");
             foreach (DirectoryInfo libraryPath in options.LibraryPaths)
             {
-                compilerArguments.Append($" \"/LIBPATH:{libraryPath.FullName}\"");
+                compilerArguments.Append($" \"/LIBPATH:{libraryPath.FullName.TrimEnd('\\')}\"");
             }
 
             compilerArguments.Append($" \"/OUT:{moduleName}\"");

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/CompilerOptions.cs

@@ -29,9 +29,8 @@ namespace Microsoft.AzureKinect.Test.StubGenerator
 
             this.IncludePaths = new DirectoryInfo[]
                 {
-                    EnvironmentInfo.CalculateDirectoryLocation(@"%K4A_SOURCE_DIR%\include"),
-                    EnvironmentInfo.CalculateDirectoryLocation(@"%K4A_BINARY_DIR%\src\sdk\include"),
-                    EnvironmentInfo.CalculateDirectoryLocation(@"%K4A_SOURCE_DIR%\src\csharp\K4aStub")
+                    EnvironmentInfo.CalculateDirectoryLocation(@".\"),
+                    EnvironmentInfo.CalculateDirectoryLocation(@".\stub")
                 };
 
             this.LibraryPaths = new DirectoryInfo[] { };
@@ -40,7 +39,7 @@ namespace Microsoft.AzureKinect.Test.StubGenerator
             this.BinaryPath = new DirectoryInfo(Path.Combine(baseTempPath, @"binaries"));
             this.TempPath = new DirectoryInfo(Path.Combine(baseTempPath, @"compilation"));
 
-            this.StubFile = new FileInfo("Stub.cpp");
+            this.StubFile = new FileInfo(@".\stub\Stub.cpp");
         }
 
         private CompilerOptions(CompilerOptions other)

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/EnvironmentInfo.cs

@@ -26,8 +26,6 @@ namespace Microsoft.AzureKinect.Test.StubGenerator
                 XmlDocument appSettings = new XmlDocument();
                 appSettings.Load("appsettings.xml");
 
-                Environment.SetEnvironmentVariable("K4A_BINARY_DIR", appSettings.DocumentElement["K4A_BINARY_DIR"].InnerXml);
-                Environment.SetEnvironmentVariable("K4A_SOURCE_DIR", appSettings.DocumentElement["K4A_SOURCE_DIR"].InnerXml);
                 Environment.SetEnvironmentVariable("CMAKE_CXX_COMPILER", appSettings.DocumentElement["CMAKE_CXX_COMPILER"].InnerXml);
                 Environment.SetEnvironmentVariable("CMAKE_LINKER", appSettings.DocumentElement["CMAKE_LINKER"].InnerXml);
                 Environment.SetEnvironmentVariable("INCLUDE", appSettings.DocumentElement["INCLUDE"].InnerXml);

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Microsoft.AzureKinect.Test.StubGenerator.csproj

@@ -3,6 +3,8 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
+	
+    <OutputPath Condition="'$(BaseOutputPath)' != ''">$(BaseOutputPath)$(AssemblyName)\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Stub.h

@@ -13,7 +13,7 @@
 #endif
 
 // These functions are exported by the Stub module itself and are callable by either
-// The test application or the stub implementaitons.
+// The test application or the stub implementations.
 extern "C" {
 STUB_EXPORT extern FARPROC Stub_GetFunctionPointer(std::string functionName);
 STUB_EXPORT extern void Stub_RecordCall(char *szFunction);

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubImplementation.h

@@ -4,7 +4,7 @@ typedef void(RaiseError)(char *szFile, int line, char *expression);
 RaiseError *g_ErrorHandler = NULL;
 
 // These functions are exported by the Stub module itself and are callable by either
-// The test application or the stub implementaitons.
+// The test application or the stub implementations.
 extern "C" {
 __declspec(dllexport) extern void Stub_SetErrorFunction(RaiseError *pfnErrorHandler);
 }

src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubbedModule.cs

@@ -48,8 +48,7 @@ namespace Microsoft.AzureKinect.Test.StubGenerator
                 filestream.WriteLine(stubCode.Code);
             }
 
-
-            System.IO.File.Copy("Stub.cpp", Path.Combine(options.TempPath.FullName, "Stub.cpp"), true);
+            options.StubFile.CopyTo(Path.Combine(options.TempPath.FullName, "Stub.cpp"), true);
             System.IO.File.Copy("Stub.h", Path.Combine(options.TempPath.FullName, "Stub.h"), true);
             System.IO.File.Copy("StubImplementation.h", Path.Combine(options.TempPath.FullName, "StubImplementation.h"), true);
 

src/csharp/Microsoft.AzureKinect.UnitTests/CalibrationFunctionTests.cs

@@ -14,8 +14,8 @@ namespace Microsoft.AzureKinect.UnitTests
             if (NativeK4a == null)
             {
                 NativeInterface k4ainterface = NativeInterface.Create(
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_BINARY_DIR%\bin\k4a.dll"),
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_SOURCE_DIR%\include\k4a\k4a.h"));
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.dll"),
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.h"));
 
                 NativeK4a = StubbedModule.Create("k4a", k4ainterface);
             }

src/csharp/Microsoft.AzureKinect.UnitTests/CaptureFunctionTests.cs

@@ -13,8 +13,8 @@ namespace Microsoft.AzureKinect.UnitTests
             if (NativeK4a == null)
             {
                 NativeInterface k4ainterface = NativeInterface.Create(
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_BINARY_DIR%\bin\k4a.dll"),
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_SOURCE_DIR%\include\k4a\k4a.h"));
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.dll"),
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.h"));
 
                 NativeK4a = StubbedModule.Create("k4a", k4ainterface);
             }

src/csharp/Microsoft.AzureKinect.UnitTests/DeviceFunctionTests.cs

@@ -23,8 +23,8 @@ namespace Microsoft.AzureKinect.UnitTests
             if (NativeK4a == null)
             {
                 NativeInterface k4ainterface = NativeInterface.Create(
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_BINARY_DIR%\bin\k4a.dll"),
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_SOURCE_DIR%\include\k4a\k4a.h"));
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.dll"),
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.h"));
 
                 NativeK4a = StubbedModule.Create("k4a", k4ainterface);
             }

src/csharp/Microsoft.AzureKinect.UnitTests/ImageFunctionTests.cs

@@ -14,8 +14,8 @@ namespace Microsoft.AzureKinect.UnitTests
             if (NativeK4a == null)
             {
                 NativeInterface k4ainterface = NativeInterface.Create(
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_BINARY_DIR%\bin\k4a.dll"),
-                    EnvironmentInfo.CalculateFileLocation(@"%K4A_SOURCE_DIR%\include\k4a\k4a.h"));
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.dll"),
+                    EnvironmentInfo.CalculateFileLocation(@"k4a\k4a.h"));
 
                 NativeK4a = StubbedModule.Create("k4a", k4ainterface);
             }

src/csharp/Microsoft.AzureKinect.UnitTests/Microsoft.AzureKinect.UnitTests.csproj

@@ -11,8 +11,34 @@
   </PropertyGroup>
   
   <ItemGroup>
-    <Content Include="..\StubGenerator.$(Platform).xml">
-      <Link>appsettings.xml</Link>
+    <Content Include="..\StubGenerator.$(Platform).xml" Link="appsettings.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\include\k4a\k4a.h" Link="k4a\k4a.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\..\..\include\k4a\k4atypes.h" Link="k4a\k4atypes.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aGeneratorSourcesDirectory)\sdk\include\k4a\k4aversion.h" Link="k4a\k4aversion.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aGeneratorSourcesDirectory)\sdk\include\k4a\k4a_export.h" Link="k4a\k4a_export.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aBinaryDirectory)\k4a.dll" Link="k4a\k4a.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="$(K4aBinaryDirectory)\k4a.pdb" Link="k4a\k4a.pdb">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Microsoft.AzureKinect.Test.StubGenerator\Stub.cpp" Link="stub\Stub.cpp">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Microsoft.AzureKinect.Test.StubGenerator\Stub.h" Link="stub\Stub.h">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="..\Microsoft.AzureKinect.Test.StubGenerator\StubImplementation.h" Link="stub\StubImplementation.h">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
@@ -27,5 +53,4 @@
     <ProjectReference Include="..\Microsoft.AzureKinect.Test.StubGenerator\Microsoft.AzureKinect.Test.StubGenerator.csproj" />
     <ProjectReference Include="..\Microsoft.AzureKinect\Microsoft.AzureKinect.csproj" />
   </ItemGroup>
-
 </Project>

src/csharp/Microsoft.AzureKinect.WPF/Microsoft.AzureKinect.WPF.csproj

@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <OutputPath Condition="'$(BaseOutputPath)' != ''">$(BaseOutputPath)$(AssemblyName)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,7 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Debug\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)' == ''">bin\Debug\</OutputPath>	
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -30,7 +31,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <OutputPath>bin\Release\</OutputPath>
+    <OutputPath Condition="'$(OutputPath)' == ''">bin\Release\</OutputPath>	
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />

src/csharp/Microsoft.AzureKinect.WinForms/Microsoft.AzureKinect.WinForms.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\k4a.props" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,24 +13,26 @@
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <OutputPath Condition="'$(BaseOutputPath)' != ''">$(BaseOutputPath)$(AssemblyName)\</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <OutputPath Condition="'$(OutputPath)' == ''">bin\Debug\</OutputPath>	
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <OutputPath Condition="'$(OutputPath)' == ''">bin\Release\</OutputPath>	
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

src/csharp/Microsoft.AzureKinect/ImageFormat.cs

@@ -15,6 +15,4 @@ namespace Microsoft.AzureKinect
         IR16,
         Custom
     }
-
-
 }

src/csharp/Microsoft.AzureKinect/Microsoft.AzureKinect.csproj

@@ -3,7 +3,9 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-	  <LangVersion>latest</LangVersion>
+    <LangVersion>latest</LangVersion>
+
+    <OutputPath Condition="'$(BaseOutputPath)' != ''">$(BaseOutputPath)$(AssemblyName)\</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup>

src/csharp/k4a.props

@@ -6,7 +6,7 @@
   </Target>
 
   <PropertyGroup Condition="'$(Platform)' != 'AnyCPU'">
-    <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">$(K4aBinaryDirectory)\bin\$(Configuration)\$(Platform)\</BaseOutputPath>
+    <BaseOutputPath Condition="'$(BaseOutputPath)' == ''">$(K4aBinaryDirectory)\$(Configuration)\$(Platform)\</BaseOutputPath>
     <!-- According to "EnableBaseIntermediateOutputPathMismatchWarning" there will be a warning if $(BaseIntermediateOutputPath) is not the same as $(MSBuildProjectExtensionsPath).
     Not changing the IntermediateOutputPath until we have a better understanding of where we want files.