Build w/ VS 2019 (#20104)v2.1.31

- should clean up `restore` of RepoTasks.csproj
- change `demands` for our Windows jobs
- widen `versionRange` and update `requiredWorkloads` in main and Windows Installers builds
- avoid F# projects for now
  - until VS 2019 build issues are resolved or we remove the project entirely
  - apparently, no tests reference the F# web site
- add `$(TargetFrameworkMoniker)` setting for *.wixproj projects
  - remove `$(TargetFramework)` property; `$(TargetFrameworkMoniker)` should be enough

6 files changed, 18 insertions, 11 deletions

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 0c403746bc..2fec4e6547 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -71,7 +71,7 @@ jobs:
       clean: all
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2017
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
@@ -356,7 +356,7 @@ jobs:
       clean: all
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2017
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
@@ -434,7 +434,7 @@ jobs:
       clean: all
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2017
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
@@ -586,7 +586,7 @@ jobs:
       clean: all
     pool:
       name: NetCore1ESPool-Svc-Internal
-      demands: ImageOverride -equals Build.Server.Amd64.VS2017
+      demands: ImageOverride -equals Build.Server.Amd64.VS2019
     variables:
       _SignType: real
       JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk
diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
index dedb4a5756..abfc90bccd 100644
--- a/.azure/pipelines/jobs/default-build.yml
+++ b/.azure/pipelines/jobs/default-build.yml
@@ -79,10 +79,10 @@ jobs:
     ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}:
       ${{ if eq(variables['System.TeamProject'], 'public') }}:
         name: NetCore1ESPool-Svc-Public
-        demands: ImageOverride -equals Build.Server.Amd64.VS2017.Open
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
       ${{ if ne(variables['System.TeamProject'], 'public') }}:
         name: NetCore1ESPool-Svc-Internal
-        demands: ImageOverride -equals Build.Server.Amd64.VS2017
+        demands: ImageOverride -equals Build.Server.Amd64.VS2019
   variables:
     AgentOsName: ${{ parameters.agentOs }}
     BuildScriptArgs: ${{ parameters.buildArgs }}
diff --git a/build/repo.props b/build/repo.props
index 19603bc733..aa278898c0 100644
--- a/build/repo.props
+++ b/build/repo.props
@@ -68,6 +68,9 @@
                       $(RepositoryRoot)src\SignalR\clients\cpp\**\*.*proj;
                       $(RepositoryRoot)src\SignalR\clients\ts\**\node_modules\**\*.*proj;
                       " />
+
+    <!-- Temporary: Avoid F# until VS 2019 build issues are resolved. -->
+    <ProjectToExclude Include="$(RepositoryRoot)src\Mvc\test\WebSites\FSharpWebSite\FSharpWebSite.fsproj" />
   </ItemGroup>
 
   <Choose>
diff --git a/eng/targets/Wix.Common.props b/eng/targets/Wix.Common.props
index a376c6d118..df97636e08 100644
--- a/eng/targets/Wix.Common.props
+++ b/eng/targets/Wix.Common.props
@@ -9,7 +9,8 @@
 
   <PropertyGroup>
     <!-- Required to make NuGet happy -->
-    <TargetFramework>net461</TargetFramework>
+    <TargetFrameworkMoniker>Native,Version=v0.0</TargetFrameworkMoniker>
+
     <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
     <MSBuildProjectExtensionsPath Condition="'$(MSBuildProjectExtensionsPath)' == ''">$(MSBuildProjectDir)\obj\</MSBuildProjectExtensionsPath>
     <NuGetRestoreTargets Condition="'$(NuGetRestoreTargets)'==''">$(MSBuildExtensionsPath)\..\Common7\IDE\CommonExtensions\Microsoft\NuGet\NuGet.targets</NuGetRestoreTargets>
diff --git a/korebuild.json b/korebuild.json
index 4d099f3da1..edec0774ea 100644
--- a/korebuild.json
+++ b/korebuild.json
@@ -12,9 +12,9 @@
         "Windows"
       ],
       "includePrerelease": true,
-      "versionRange": "[15.8, 16.0)",
+      "versionRange": "[15.8, 17.0)",
       "requiredWorkloads": [
-        "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Win81",
+        "Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
         "Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
         "Microsoft.VisualStudio.Component.VC.ATL",
         "Microsoft.VisualStudio.Component.Windows10SDK.17134"
diff --git a/scripts/common.psm1 b/scripts/common.psm1
index a8b20151c7..6e4b116321 100644
--- a/scripts/common.psm1
+++ b/scripts/common.psm1
@@ -276,7 +276,7 @@ function Get-MSBuildPath {
             }
         }
 
-        $installs = & $vswhere -format json -version '[15.0, 16.0)' -latest -products * @vswhereArgs | ConvertFrom-Json
+        $installs = & $vswhere -format json -version '[15.0, 17.0)' -latest -products * @vswhereArgs | ConvertFrom-Json
         if (!$installs) {
             Write-Error "Missing prerequisite: could not find any installations of Visual Studio"
         }
@@ -286,7 +286,10 @@ function Get-MSBuildPath {
         Write-Host "Using $($vs.displayName)"
     }
 
-    $msbuild = Join-Path  $vsInstallDir 'MSBuild/15.0/bin/msbuild.exe'
+    $msbuild = Join-Path $vsInstallDir 'MSBuild/15.0/bin/msbuild.exe'
+    if (!(Test-Path $msbuild)) {
+        $msbuild = Join-Path $vsInstallDir 'MSBuild/Current/bin/msbuild.exe'
+    }
     if (!(Test-Path $msbuild)) {
         Write-Error "Missing prerequisite: could not find msbuild.exe"
     }