diff --git a/CMakeLists.txt b/CMakeLists.txt index be246f53..e0ffb0de 100644 --- a/CMakeLists.txt +++ b/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) diff --git a/StubGenerator.xml.in b/StubGenerator.xml.in index a500aa28..00891140 100644 --- a/StubGenerator.xml.in +++ b/StubGenerator.xml.in @@ -1,6 +1,4 @@ - @PROJECT_BINARY_DIR@ - @PROJ_DIR@ @CMAKE_CXX_COMPILER@ @CMAKE_LINKER@ $ENV{INCLUDE} diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7b4fe4dd..40cbb69d 100644 --- a/azure-pipelines.yml +++ b/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 diff --git a/k4a.props.in b/k4a.props.in index e5cb06b5..64c3d002 100644 --- a/k4a.props.in +++ b/k4a.props.in @@ -1,5 +1,11 @@ - @PROJECT_BINARY_DIR@ - + @PROJECT_BINARY_DIR@/src + + + @K4A_BINARY_DIR_DEBUG@ + + + @K4A_BINARY_DIR_RELEASE@ + \ No newline at end of file diff --git a/src/csharp/K4a.sln b/src/csharp/K4a.sln index f58906fe..b7a9af24 100644 --- a/src/csharp/K4a.sln +++ b/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 diff --git a/src/csharp/Microsoft.AzureKinect.Examples.WPFViewer/Microsoft.AzureKinect.Examples.WPFViewer.csproj b/src/csharp/Microsoft.AzureKinect.Examples.WPFViewer/Microsoft.AzureKinect.Examples.WPFViewer.csproj index 602a327e..6f811391 100644 --- a/src/csharp/Microsoft.AzureKinect.Examples.WPFViewer/Microsoft.AzureKinect.Examples.WPFViewer.csproj +++ b/src/csharp/Microsoft.AzureKinect.Examples.WPFViewer/Microsoft.AzureKinect.Examples.WPFViewer.csproj @@ -7,8 +7,8 @@ x64 {CCD99E9D-1EE2-41F5-AD3F-4110A466A9A4} WinExe - K4aWpfTestApplication - K4aWpfTestApplication + Microsoft.AzureKinect.Examples.WPFViewer + Microsoft.AzureKinect.Examples.WPFViewer v4.6.1 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -122,15 +122,15 @@ - + k4a.dll PreserveNewest - - libusb-1.0.dll + + k4a.pdb PreserveNewest - + depthengine_1_0.dll PreserveNewest diff --git a/src/csharp/Microsoft.AzureKinect.Examples.WinForms/Microsoft.AzureKinect.Examples.WinForms.csproj b/src/csharp/Microsoft.AzureKinect.Examples.WinForms/Microsoft.AzureKinect.Examples.WinForms.csproj index e1dd32b0..52807c65 100644 --- a/src/csharp/Microsoft.AzureKinect.Examples.WinForms/Microsoft.AzureKinect.Examples.WinForms.csproj +++ b/src/csharp/Microsoft.AzureKinect.Examples.WinForms/Microsoft.AzureKinect.Examples.WinForms.csproj @@ -107,15 +107,15 @@ - + k4a.dll PreserveNewest - - libusb-1.0.dll + + k4a.pdb PreserveNewest - + depthengine_1_0.dll PreserveNewest diff --git a/src/csharp/WrapperTests/Calibration.cs b/src/csharp/Microsoft.AzureKinect.FunctionalTests/Calibration.cs similarity index 100% rename from src/csharp/WrapperTests/Calibration.cs rename to src/csharp/Microsoft.AzureKinect.FunctionalTests/Calibration.cs diff --git a/src/csharp/WrapperTests/Device.cs b/src/csharp/Microsoft.AzureKinect.FunctionalTests/Device.cs similarity index 100% rename from src/csharp/WrapperTests/Device.cs rename to src/csharp/Microsoft.AzureKinect.FunctionalTests/Device.cs diff --git a/src/csharp/WrapperTests/Microsoft.AzureKinect.FunctionalTests.csproj b/src/csharp/Microsoft.AzureKinect.FunctionalTests/Microsoft.AzureKinect.FunctionalTests.csproj similarity index 70% rename from src/csharp/WrapperTests/Microsoft.AzureKinect.FunctionalTests.csproj rename to src/csharp/Microsoft.AzureKinect.FunctionalTests/Microsoft.AzureKinect.FunctionalTests.csproj index d8a245c0..81fe1cfc 100644 --- a/src/csharp/WrapperTests/Microsoft.AzureKinect.FunctionalTests.csproj +++ b/src/csharp/Microsoft.AzureKinect.FunctionalTests/Microsoft.AzureKinect.FunctionalTests.csproj @@ -11,15 +11,12 @@ - + PreserveNewest - - + + PreserveNewest - - - PreserveNewest - + diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/Microsoft.AzureKinect.Test.StubGenerator.Test.csproj b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/Microsoft.AzureKinect.Test.StubGenerator.Test.csproj deleted file mode 100644 index e7de62e7..00000000 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/Microsoft.AzureKinect.Test.StubGenerator.Test.csproj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - netcoreapp2.1 - - false - - x64;x86 - $(BaseOutputPath)$(AssemblyName)\ - - - - - appsettings.xml - PreserveNewest - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/Microsoft.AzureKinect.Test.StubGenerator.UnitTests.csproj b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/Microsoft.AzureKinect.Test.StubGenerator.UnitTests.csproj new file mode 100644 index 00000000..d98b1a9d --- /dev/null +++ b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/Microsoft.AzureKinect.Test.StubGenerator.UnitTests.csproj @@ -0,0 +1,55 @@ + + + + + netcoreapp2.1 + + false + + x64;x86 + $(BaseOutputPath)$(AssemblyName)\ + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/StubTests.cs b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/StubTests.cs similarity index 95% rename from src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/StubTests.cs rename to src/csharp/Microsoft.AzureKinect.Test.StubGenerator.UnitTests/StubTests.cs index 76eee2c9..cb363f25 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator.Test/StubTests.cs +++ b/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); } diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Compiler.cs b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Compiler.cs index d76e18ed..3cd0dec1 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Compiler.cs +++ b/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}\""); diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/CompilerOptions.cs b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/CompilerOptions.cs index 7dde1aa2..ec069417 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/CompilerOptions.cs +++ b/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) diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/EnvironmentInfo.cs b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/EnvironmentInfo.cs index 6574ae06..9774727e 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/EnvironmentInfo.cs +++ b/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); diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Microsoft.AzureKinect.Test.StubGenerator.csproj b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Microsoft.AzureKinect.Test.StubGenerator.csproj index 8177218b..6c11c96b 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Microsoft.AzureKinect.Test.StubGenerator.csproj +++ b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Microsoft.AzureKinect.Test.StubGenerator.csproj @@ -3,6 +3,8 @@ netstandard2.0 + + $(BaseOutputPath)$(AssemblyName)\ diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Stub.h b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Stub.h index a6d7914b..b2979ab0 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/Stub.h +++ b/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); diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubImplementation.h b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubImplementation.h index 33a41d03..15233014 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubImplementation.h +++ b/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); } diff --git a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubbedModule.cs b/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubbedModule.cs index 7fc9ae70..c23f50e9 100644 --- a/src/csharp/Microsoft.AzureKinect.Test.StubGenerator/StubbedModule.cs +++ b/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); diff --git a/src/csharp/Microsoft.AzureKinect.UnitTests/CalibrationFunctionTests.cs b/src/csharp/Microsoft.AzureKinect.UnitTests/CalibrationFunctionTests.cs index 6423cf65..264d613a 100644 --- a/src/csharp/Microsoft.AzureKinect.UnitTests/CalibrationFunctionTests.cs +++ b/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); } diff --git a/src/csharp/Microsoft.AzureKinect.UnitTests/CaptureFunctionTests.cs b/src/csharp/Microsoft.AzureKinect.UnitTests/CaptureFunctionTests.cs index 91c9a45f..f03ab9bb 100644 --- a/src/csharp/Microsoft.AzureKinect.UnitTests/CaptureFunctionTests.cs +++ b/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); } diff --git a/src/csharp/Microsoft.AzureKinect.UnitTests/DeviceFunctionTests.cs b/src/csharp/Microsoft.AzureKinect.UnitTests/DeviceFunctionTests.cs index bfb8baa4..ee3c514f 100644 --- a/src/csharp/Microsoft.AzureKinect.UnitTests/DeviceFunctionTests.cs +++ b/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); } diff --git a/src/csharp/Microsoft.AzureKinect.UnitTests/ImageFunctionTests.cs b/src/csharp/Microsoft.AzureKinect.UnitTests/ImageFunctionTests.cs index 48c468a5..cbd57181 100644 --- a/src/csharp/Microsoft.AzureKinect.UnitTests/ImageFunctionTests.cs +++ b/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); } diff --git a/src/csharp/Microsoft.AzureKinect.UnitTests/Microsoft.AzureKinect.UnitTests.csproj b/src/csharp/Microsoft.AzureKinect.UnitTests/Microsoft.AzureKinect.UnitTests.csproj index 2bf1458a..fa8ce271 100644 --- a/src/csharp/Microsoft.AzureKinect.UnitTests/Microsoft.AzureKinect.UnitTests.csproj +++ b/src/csharp/Microsoft.AzureKinect.UnitTests/Microsoft.AzureKinect.UnitTests.csproj @@ -11,8 +11,34 @@ - - appsettings.xml + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest @@ -27,5 +53,4 @@ - \ No newline at end of file diff --git a/src/csharp/Microsoft.AzureKinect.WPF/Microsoft.AzureKinect.WPF.csproj b/src/csharp/Microsoft.AzureKinect.WPF/Microsoft.AzureKinect.WPF.csproj index eba295dc..49aca8a3 100644 --- a/src/csharp/Microsoft.AzureKinect.WPF/Microsoft.AzureKinect.WPF.csproj +++ b/src/csharp/Microsoft.AzureKinect.WPF/Microsoft.AzureKinect.WPF.csproj @@ -13,6 +13,7 @@ v4.6.1 512 true + $(BaseOutputPath)$(AssemblyName)\ true @@ -21,7 +22,7 @@ DEBUG;TRACE prompt 4 - bin\Debug\ + bin\Debug\ true @@ -30,7 +31,8 @@ TRACE prompt 4 - bin\Release\ + bin\Release\ + true diff --git a/src/csharp/Microsoft.AzureKinect.WinForms/Microsoft.AzureKinect.WinForms.csproj b/src/csharp/Microsoft.AzureKinect.WinForms/Microsoft.AzureKinect.WinForms.csproj index 7ee8ec88..6c306c30 100644 --- a/src/csharp/Microsoft.AzureKinect.WinForms/Microsoft.AzureKinect.WinForms.csproj +++ b/src/csharp/Microsoft.AzureKinect.WinForms/Microsoft.AzureKinect.WinForms.csproj @@ -1,5 +1,6 @@  + Debug @@ -12,24 +13,26 @@ v4.6.1 512 true + $(BaseOutputPath)$(AssemblyName)\ true full false - bin\Debug\ DEBUG;TRACE prompt 4 + bin\Debug\ true pdbonly true - bin\Release\ TRACE prompt 4 + bin\Release\ + true diff --git a/src/csharp/Microsoft.AzureKinect/ImageFormat.cs b/src/csharp/Microsoft.AzureKinect/ImageFormat.cs index 79e13e40..f5f90765 100644 --- a/src/csharp/Microsoft.AzureKinect/ImageFormat.cs +++ b/src/csharp/Microsoft.AzureKinect/ImageFormat.cs @@ -15,6 +15,4 @@ namespace Microsoft.AzureKinect IR16, Custom } - - } diff --git a/src/csharp/Microsoft.AzureKinect/Microsoft.AzureKinect.csproj b/src/csharp/Microsoft.AzureKinect/Microsoft.AzureKinect.csproj index 789f1408..01cfa216 100644 --- a/src/csharp/Microsoft.AzureKinect/Microsoft.AzureKinect.csproj +++ b/src/csharp/Microsoft.AzureKinect/Microsoft.AzureKinect.csproj @@ -3,7 +3,9 @@ netstandard2.0 - latest + latest + + $(BaseOutputPath)$(AssemblyName)\ diff --git a/src/csharp/k4a.props b/src/csharp/k4a.props index 6c4077ee..5d1c0281 100644 --- a/src/csharp/k4a.props +++ b/src/csharp/k4a.props @@ -6,7 +6,7 @@ - $(K4aBinaryDirectory)\bin\$(Configuration)\$(Platform)\ + $(K4aBinaryDirectory)\$(Configuration)\$(Platform)\