Updating the CLI stage0 to 2.1.300 and fixing some build failures.
This commit is contained in:
parent
a8396b53e1
commit
15e6928b02
5 changed files with 6 additions and 9 deletions
|
@ -13,12 +13,11 @@
|
|||
Condition="!Exists('$(DotnetToolsNuPkgPath)/$(TemplateFillInPackageName.ToLower())')">
|
||||
|
||||
<PropertyGroup>
|
||||
<DotnetToolsRestoreAdditionalParameters>--runtime any</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>--runtime any /p:RestoreProjectStyle=DotnetToolReference</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:TargetFramework=$(CliTargetFramework)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageName=$(TemplateFillInPackageName)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:TemplateFillInPackageVersion=$(TemplateFillInPackageVersion)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters>$(DotnetToolsRestoreAdditionalParameters) /p:RestorePackagesPath=$(DotnetToolsLayoutDirectory)</DotnetToolsRestoreAdditionalParameters>
|
||||
<DotnetToolsRestoreAdditionalParameters Condition=" $(DotnetToolsRestoreProjectStyle) != '' " >$(DotnetToolsRestoreAdditionalParameters) /p:RestoreProjectStyle=$(DotnetToolsRestoreProjectStyle)</DotnetToolsRestoreAdditionalParameters>
|
||||
</PropertyGroup>
|
||||
|
||||
<DotNetRestore ToolPath="$(PreviousStageDirectory)"
|
||||
|
|
|
@ -89,8 +89,8 @@ if($Architecture.StartsWith("arm", [StringComparison]::OrdinalIgnoreCase))
|
|||
$InstallArchitecture = "x64"
|
||||
}
|
||||
|
||||
Write-Output "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
Invoke-Expression "$dotnetInstallPath -version ""2.2.0-preview1-007799"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
Write-Output "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
Invoke-Expression "$dotnetInstallPath -version ""2.1.300"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$InstallArchitecture"""
|
||||
|
||||
if ($LastExitCode -ne 0)
|
||||
{
|
||||
|
|
|
@ -162,7 +162,7 @@ if [[ $archlower == 'arm'* ]]; then
|
|||
fi
|
||||
|
||||
if [ "$STAGE0_SOURCE_DIR" == "" ]; then
|
||||
(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --version "2.2.0-preview1-007799" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
|
||||
(set -x ; "$REPOROOT/scripts/obtain/dotnet-install.sh" --version "2.1.300" --install-dir "$DOTNET_INSTALL_DIR" --architecture "$INSTALL_ARCHITECTURE" $LINUX_PORTABLE_INSTALL_ARGS)
|
||||
else
|
||||
echo "Copying bootstrap cli from $STAGE0_SOURCE_DIR"
|
||||
cp -r $STAGE0_SOURCE_DIR/* "$DOTNET_INSTALL_DIR"
|
||||
|
|
|
@ -30,8 +30,7 @@
|
|||
TemplateFillInPackageName=%(BundledDotnetTools.Identity);
|
||||
TemplateFillInPackageVersion=%(BundledDotnetTools.Version);
|
||||
PreviousStageDirectory=$(PreviousStageDirectory);
|
||||
DotnetToolsLayoutDirectory=$(testAssetSourceRoot);
|
||||
DotnetToolsRestoreProjectStyle=DotnetToolReference
|
||||
DotnetToolsLayoutDirectory=$(testAssetSourceRoot)
|
||||
</Properties>
|
||||
</TestDotnetTools>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -54,8 +54,7 @@
|
|||
TemplateFillInPackageName=dotnet-watch;
|
||||
TemplateFillInPackageVersion=$(DotnetWatchPackageVersion);
|
||||
PreviousStageDirectory=$(PreviousStageDirectory);
|
||||
DotnetToolsLayoutDirectory=$(testAssetSourceRoot);
|
||||
DotnetToolsRestoreProjectStyle=DotnetToolReference
|
||||
DotnetToolsLayoutDirectory=$(testAssetSourceRoot)
|
||||
</Properties>
|
||||
</TestDotnetTools>
|
||||
</ItemGroup>
|
||||
|
|
Loading…
Reference in a new issue