Fixup error on SDK restore

Author: pranavkm

eng/Baseline.Designer.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-    <AspNetCoreBaselineVersion>3.1.1</AspNetCoreBaselineVersion>
+    <AspNetCoreBaselineVersion>3.1.2</AspNetCoreBaselineVersion>
   </PropertyGroup>
   <!-- Package: AspNetCoreRuntime.3.0.x64-->
   <PropertyGroup Condition=" '$(PackageId)' == 'AspNetCoreRuntime.3.0.x64' ">

eng/common/tools.ps1

@@ -139,7 +139,6 @@ function InitializeDotNetCli([bool]$install) {
         InstallDotNetSdk $dotnetRoot $dotnetSdkVersion
       } else {
         Write-PipelineTelemetryError -Category "InitializeToolset" -Message "Unable to find dotnet with SDK version '$dotnetSdkVersion'"
-        ExitWithExitCode 1
       }
     }
 
@@ -184,7 +183,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
   InstallDotNet $dotnetRoot $version $architecture
 }
 
-function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) {
+function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $true) {
   $installScript = GetDotNetInstallScript $dotnetRoot
   $installParameters = @{
     Version = $version

eng/common/tools.sh

@@ -41,7 +41,7 @@ fi
 # Configures warning treatment in msbuild.
 warn_as_error=${warn_as_error:-true}
 
-# True to attempt using .NET Core already that meets requirements specified in global.json 
+# True to attempt using .NET Core already that meets requirements specified in global.json
 # installed on the machine instead of downloading one.
 use_installed_dotnet_cli=${use_installed_dotnet_cli:-true}
 
@@ -143,7 +143,6 @@ function InitializeDotNetCli {
         InstallDotNetSdk "$dotnet_root" "$dotnet_sdk_version"
       else
         Write-PipelineTelemetryError -category 'InitializeToolset' "Unable to find dotnet with SDK version '$dotnet_sdk_version'"
-        ExitWithExitCode 1
       fi
     fi
   fi
@@ -181,7 +180,7 @@ function InstallDotNetSdk {
 function InstallDotNet {
   local root=$1
   local version=$2
- 
+
   GetDotNetInstallScript "$root"
   local install_script=$_GetDotNetInstallScript
 
@@ -222,7 +221,7 @@ function GetDotNetInstallScript {
         Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
         ExitWithExitCode $exit_code
       }
-    else 
+    else
       wget -q -O "$install_script" "$install_script_url" || {
         local exit_code=$?
         Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to acquire dotnet install script (exit code '$exit_code')."
@@ -238,11 +237,11 @@ function InitializeBuildTool {
   if [[ -n "${_InitializeBuildTool:-}" ]]; then
     return
   fi
-  
+
   InitializeDotNetCli $restore
 
   # return values
-  _InitializeBuildTool="$_InitializeDotNetCli/dotnet"  
+  _InitializeBuildTool="$_InitializeDotNetCli/dotnet"
   _InitializeBuildToolCommand="msbuild"
   _InitializeBuildToolFramework="netcoreapp2.1"
 }
@@ -303,7 +302,7 @@ function InitializeToolset {
   if [[ "$binary_log" == true ]]; then
     bl="/bl:$log_dir/ToolsetRestore.binlog"
   fi
-  
+
   echo '<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>' > "$proj"
   MSBuild-Core "$proj" $bl /t:__WriteToolsetLocation /clp:ErrorsOnly\;NoSummary /p:__ToolsetLocationOutputFile="$toolset_location_file"
 

src/ProjectTemplates/test/BaselineTest.cs

@@ -20,7 +20,7 @@ public ByteOrderMarkTest(ITestOutputHelper output)
         }
 
         [Theory]
-        [InlineData("Microsoft.AspNetCore.Blazor.Templates")]
+        [InlineData("BlazorWasm.ProjectTemplates")]
         public void JSAndJSONInAllTemplates_ShouldNotContainBOM(string projectName)
         {
             var currentDirectory = Directory.GetCurrentDirectory();

src/ProjectTemplates/test/ByteOrderMarkTest.cs

@@ -123,12 +123,7 @@ NUnit 3 Test Item (nunit-test) VB
                 }
             }
 
-            await VerifyCannotFindTemplateAsync(output, "web");
-            await VerifyCannotFindTemplateAsync(output, "webapp");
-            await VerifyCannotFindTemplateAsync(output, "mvc");
-            await VerifyCannotFindTemplateAsync(output, "react");
-            await VerifyCannotFindTemplateAsync(output, "reactredux");
-            await VerifyCannotFindTemplateAsync(output, "angular");
+            await VerifyCannotFindTemplateAsync(output, "blazorwasm");
 
             foreach (var packagePath in builtPackages)
             {
@@ -137,9 +132,7 @@ NUnit 3 Test Item (nunit-test) VB
                 Assert.True(result.ExitCode == 0, result.GetFormattedOutput());
             }
 
-            await VerifyCanFindTemplate(output, "webapp");
-            await VerifyCanFindTemplate(output, "web");
-            await VerifyCanFindTemplate(output, "react");
+            await VerifyCanFindTemplate(output, "blazorwasm");
         }
 
         private static async Task VerifyCanFindTemplate(ITestOutputHelper output, string templateName)

src/ProjectTemplates/test/Helpers/TemplatePackageInstaller.cs

@@ -30,7 +30,7 @@
 
     <PropertyGroup>
       <PropsProperties>
-        RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir);$(ArtifactsNonShippingPackagesDir)"));
+        RestoreAdditionalProjectSources=$([MSBuild]::Escape("$(RestoreAdditionalProjectSources);$(ArtifactsShippingPackagesDir)"));
         MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
         MicrosoftNETCoreAppRuntimeVersion=$(MicrosoftNETCoreAppRuntimeVersion);
         MicrosoftNETCoreAppRefPackageVersion=$(MicrosoftNETCoreAppRefPackageVersion);