Add a flag to suppress downloading netfx as a tarball, add more retries around dotnet-install.sh, and increase the default timeout in PushNuGetPackages

Author: Nate McMaster

Directory.Build.props

@@ -26,4 +26,8 @@
     <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="$(MicrosoftNETFrameworkReferenceAssembliesPackageVersion)" PrivateAssets="All" />
+  </ItemGroup>
+
 </Project>

build.sh

@@ -59,6 +59,8 @@ while [[ $# -gt 0 ]]; do
     shift
 done
 
+KOREBUILD_SKIP_INSTALL_NETFX=1
+
 set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$DIR" "$config_file" "$ci"
 
 invoke_korebuild_command "default-build" "$@"

build/dependencies.props

@@ -5,6 +5,7 @@
     <MicrosoftDotNetPlatformAbstractionsVersion>2.0.0</MicrosoftDotNetPlatformAbstractionsVersion>
     <MicrosoftDotNetSignToolPackageVersion>1.0.0-beta.18603.2</MicrosoftDotNetSignToolPackageVersion>
     <MicrosoftDotNetSignCheckPackageVersion>1.0.0-beta.18603.2</MicrosoftDotNetSignCheckPackageVersion>
+    <MicrosoftNETFrameworkReferenceAssembliesPackageVersion>1.0.0-alpha-004</MicrosoftNETFrameworkReferenceAssembliesPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.9.0</MicrosoftNETTestSdkPackageVersion>
     <MonoCecilPackageVersion>0.10.0-beta6</MonoCecilPackageVersion>
     <MoqPackageVersion>4.7.99</MoqPackageVersion>

build/sources.props

@@ -5,6 +5,7 @@
     <RestoreSources>$(DotNetRestoreSources)</RestoreSources>
     <RestoreSources Condition="'$(DotNetBuildOffline)' != 'true'">
       $(RestoreSources);
+      https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
       https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
       https://api.nuget.org/v3/index.json;
     </RestoreSources>

files/KoreBuild/KoreBuild.sh

@@ -111,14 +111,16 @@ __install_tools() {
     verbose_flag=''
     [ "$verbose" = true ] && verbose_flag='--verbose'
 
-    # Instructs MSBuild where to find .NET Framework reference assemblies
-    export ReferenceAssemblyRoot="$tools_home/netfx/$netfx_version"
-
-    # Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
-    chmod +x "$__korebuild_dir/scripts/get-netfx.sh"; sync
-    # we don't include netfx in the BuildTools artifacts currently, it ends up on the blob store through other means, so we'll only look for it in the default_tools_source
-    "$__korebuild_dir/scripts/get-netfx.sh" $verbose_flag $netfx_version "$default_tools_source" "$ReferenceAssemblyRoot" \
-        || return 1
+    if [ "${KOREBUILD_SKIP_INSTALL_NETFX:-}" != "1" ]; then
+        # Instructs MSBuild where to find .NET Framework reference assemblies
+        export ReferenceAssemblyRoot="$tools_home/netfx/$netfx_version"
+
+        # Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
+        chmod +x "$__korebuild_dir/scripts/get-netfx.sh"; sync
+        # we don't include netfx in the BuildTools artifacts currently, it ends up on the blob store through other means, so we'll only look for it in the default_tools_source
+        "$__korebuild_dir/scripts/get-netfx.sh" $verbose_flag $netfx_version "$default_tools_source" "$ReferenceAssemblyRoot" \
+            || return 1
+    fi
 
     # Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
     chmod +x "$__korebuild_dir/scripts/get-dotnet.sh"; sync

files/KoreBuild/scripts/KoreBuild.psm1

@@ -440,6 +440,11 @@ function Invoke-MSBuild {
 }
 
 function Get-MSBuildPath() {
+    if ($env:VSINSTALLDIR) {
+        # If running from the VS Developer Command Prompt, use the MSBuild it contains.
+        return 'msbuild.exe'
+    }
+
     $vswherePath = "${env:ProgramFiles(x86)}/Microsoft Visual Studio/Installer/vswhere.exe"
 
     if (-not (Test-Path $vswherePath)) {
@@ -494,7 +499,14 @@ function Get-MSBuildPath() {
         }
     }
 
-    throw 'Could not find a version of MSBuild which satisfies the requirements specified in korebuild.json.'
+    $vsInstallScript = "$($global:KoreBuildSettings.RepoPath)\eng\scripts\InstallVisualStudio.ps1"
+    if (Test-Path $vsInstallScript) {
+        Write-Host ''
+        Write-Host -ForegroundColor Magenta "Run $vsInstallScript to install Visual Studio prerequisites."
+        Write-Host ''
+    }
+
+    throw 'Could not find an installation of MSBuild which satisfies the requirements specified in korebuild.json.'
 }
 
 function __has_member($obj, $name) {

files/KoreBuild/scripts/get-dotnet.sh

@@ -45,11 +45,22 @@ version=$(__get_dotnet_sdk_version)
 __verbose "Installing .NET Core SDK $version"
 
 if [ ! -f "$install_dir/sdk/$version/dotnet.dll" ]; then
-    "$__script_dir/dotnet-install.sh" \
-        --install-dir "$install_dir" \
-        --architecture x64 \
-        --version "$version" \
-        $verbose_flag
+    install_retries=3
+    while [ $install_retries -gt 0 ]; do
+        failed=false
+        "$__script_dir/dotnet-install.sh" \
+            --install-dir "$install_dir" \
+            --architecture x64 \
+            --version "$version" \
+            $verbose_flag \
+            || failed=true
+        if [ "$failed" = true ]; then
+            let install_retries=install_retries-1
+            echo -e "${YELLOW}Failed to install .NET Core $version. Retries left: $install_retries.${RESET}"
+        else
+            install_retries=0
+        fi
+    done
 else
     echo -e "${GRAY}.NET Core SDK $version is already installed. Skipping installation.${RESET}"
 fi

modules/KoreBuild.Tasks/InstallDotNet.cs

@@ -47,7 +47,7 @@ public class InstallDotNet : Microsoft.Build.Utilities.Task, ICancelableTask
         /// <summary>
         /// Timeout per install request.
         /// </summary>
-        public int TimeoutSeconds { get; set; } = 240;
+        public int TimeoutSeconds { get; set; } = 600;
 
         public void Cancel()
         {

modules/KoreBuild.Tasks/PushNuGetPackages.cs

@@ -33,7 +33,7 @@ public class PushNuGetPackages : Microsoft.Build.Utilities.Task, ICancelableTask
         // not be required if pushing to the filesystem
         public string ApiKey { get; set; }
 
-        public int TimeoutSeconds { get; set; } = 90;
+        public int TimeoutSeconds { get; set; } = 300;
 
         public void Cancel()
         {