PR comments

Author: Sheil Kumar

Samples/WinMLSamplesGallery/WinMLSamplesGallery/SampleMetadata/SampleMetadata.json

@@ -37,8 +37,8 @@
     },
     {
       "Title": "OpenCV Interop",
-      "DescriptionShort": "The sample will use Windows ML to classify images that have been denoised using OpenCV.",
-      "Description": "This sample demonstrates interop between Windows ML and OpenCV. The sample will classify images that have been denoised using OpenCV's medianBlur using the SqueezeNet model on Windows ML. Choose an image to get started.",
+      "DescriptionShort": "The sample uses Windows ML to classify images that have been denoised using OpenCV.",
+      "Description": "This sample demonstrates interop between Windows ML and OpenCV. The sample classifes images that have been denoised using OpenCV's medianBlur using the SqueezeNet model on Windows ML. Choose an image to get started.",
       "Icon": "\uE155",
       "Tag": "OpenCVInterop",
       "XAMLGithubLink": "https://github.com/microsoft/Windows-Machine-Learning/blob/master/Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/OpenCVInterop.xaml",

Samples/WinMLSamplesGallery/WinMLSamplesGallery/Samples/OpenCVInterop/README.md

@@ -23,12 +23,12 @@ See [ThirdPartyNotices.txt](../../../../../ThirdPartyNotices.txt) for relevant l
 ## Getting Started
 In order to build this sample, OpenCV will need to be built and linked into the WinML Samples Gallery. The OpenCV project is included as a submodule, and will need to be synced and built for your Platform Architecture and Configuration before it will appear in the Windows ML Samples Gallery. To do so follow these instructions:
 - Launch a Visual Studio Developer Command Prompt.
-- Navigate to root.
+- Navigate to the `repository root` directory.
 - Sync submodules with `git submodule update --init --recursive`
 - Launch Powershell with `powershell`
 - Build the OpenCV project with
 
-  `.\external\tools\BuildOpenCV.ps1 -Architecture <ARCH> -Configuration <CONFIGURATION>`
+  `.\external\tools\BuildOpenCV.ps1 -Architecture <ARCH> -Configuration <CONFIGURATION> -SetupDevEnv`
 
   For example:
 

external/tools/BuildOpenCV.ps1

@@ -14,7 +14,9 @@ Param
     [string]$CMakeBuildDirectory = "$PSScriptRoot\..\..\build\external\opencv\cmake_config\$Architecture\",
 
     # Cleans build files before proceeding.
-    [switch]$Clean
+    [switch]$Clean,
+
+    [switch]$SetupDevEnv = $False
 )
 
 if ($Clean) {
@@ -23,10 +25,23 @@ if ($Clean) {
 
 & $PSScriptRoot\CMakeConfigureOpenCV.ps1 -Architecture $Architecture
 
+$msbuild = "msbuild"
+
+if ($SetupDevEnv)
+{
+  Install-Module VSSetup -Scope CurrentUser -Force
+  $latestVS = Get-VSSetupInstance -All -Prerelease | Sort-Object -Property InstallationVersion -Descending | Select-Object -First 1
+  if ($latestVS.InstallationVersion -like "15.*") {
+    $msbuild = "$($latestVS.InstallationPath)\MSBuild\15.0\Bin\msbuild.exe"
+  } else {
+    $msbuild = "$($latestVS.InstallationPath)\MSBuild\Current\Bin\msbuild.exe"
+  }
+}
+
 # Build OpenCV
 $solution = $CMakeBuildDirectory + "OpenCV.sln"
-msbuild /p:Configuration=$Configuration /t:Build /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None $solution
+& $msbuild /p:Configuration=$Configuration /t:Build /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None $solution
 
 # Install
 $installProject = $CMakeBuildDirectory + "INSTALL.vcxproj"
-msbuild /p:Configuration=$Configuration /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None $installProject
+& $msbuild /p:Configuration=$Configuration /p:LinkIncremental=false /p:DebugSymbols=false /p:DebugType=None $installProject