Updating stage0 to 3.0.100-preview-009812 again. This change was lost when we moved to arcade.
This commit is contained in:
parent
e938207d08
commit
5513d6d41d
4 changed files with 9 additions and 11 deletions
|
@ -243,6 +243,7 @@ jobs:
|
||||||
matrix:
|
matrix:
|
||||||
Build_Release:
|
Build_Release:
|
||||||
_BuildConfig: Release
|
_BuildConfig: Release
|
||||||
|
_AdditionalBuildParameters: '/p:DisableSourceLink=true'
|
||||||
|
|
||||||
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
|
||||||
- job: Copy_SDK_To_Latest
|
- job: Copy_SDK_To_Latest
|
||||||
|
|
|
@ -110,6 +110,7 @@ phases:
|
||||||
$(_PublishArgs)
|
$(_PublishArgs)
|
||||||
$(_SignArgs)
|
$(_SignArgs)
|
||||||
$(_OfficialBuildIdArgs)
|
$(_OfficialBuildIdArgs)
|
||||||
|
$(AdditionalBuildParameters)
|
||||||
displayName: Build
|
displayName: Build
|
||||||
|
|
||||||
- task: PublishTestResults@1
|
- task: PublishTestResults@1
|
||||||
|
|
|
@ -13,7 +13,9 @@ function InitializeCustomSDKToolset {
|
||||||
#InstallDotNetSharedFramework "1.1.2"
|
#InstallDotNetSharedFramework "1.1.2"
|
||||||
|
|
||||||
InitializeDotNetCli true
|
InitializeDotNetCli true
|
||||||
# Install 2.1 framework for dotnet-deb-tool
|
# Install 2.1 framework for dotnet-deb-tool.
|
||||||
|
# Failures on this call will be ignored, as this is expected to fail on some
|
||||||
|
# OSes.
|
||||||
InstallDotNetSharedFramework "2.1.0"
|
InstallDotNetSharedFramework "2.1.0"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,13 +29,7 @@ function InstallDotNetSharedFramework {
|
||||||
GetDotNetInstallScript "$dotnet_root"
|
GetDotNetInstallScript "$dotnet_root"
|
||||||
local install_script=$_GetDotNetInstallScript
|
local install_script=$_GetDotNetInstallScript
|
||||||
|
|
||||||
bash "$install_script" --version $version --install-dir "$dotnet_root" --runtime "dotnet"
|
bash "$install_script" --version $version --install-dir "$dotnet_root" --runtime "dotnet" || true
|
||||||
local lastexitcode=$?
|
|
||||||
|
|
||||||
if [[ $lastexitcode != 0 ]]; then
|
|
||||||
echo "Failed to install Shared Framework $version to '$dotnet_root' (exit code '$lastexitcode')."
|
|
||||||
ExitWithExitCode $lastexitcode
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"tools": {
|
"tools": {
|
||||||
"dotnet": "3.0.100-alpha1-009697"
|
"dotnet": "3.0.100-preview-009812"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18620.6"
|
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18620.6"
|
||||||
|
|
Loading…
Reference in a new issue