Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.
/ corefx Public archive

Commit

Permalink
Manual darc update from build '20190501.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ViktorHofer
ViktorHofer committed May 2, 2019
1 parent aeb2ec8 commit 68e86bc
Show file tree
Hide file tree
Showing 9 changed files with 81 additions and 51 deletions.
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,65 +34,65 @@
<Uri>https://github.com/dotnet/corefx</Uri>
<Sha>830bf7fc0346d9453d85ad4ec726c92ac3e72998</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="NETStandard.Library" Version="2.1.0-prerelease.19230.1">
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>e94d4263f03ced7269275c10a59d1dddb0c76b7c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="2.4.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19229.8">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.CoreFxTesting" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Configuration" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19229.8">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="1.0.0-beta.19251.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a7a250e9c13147134543c35fef2fb81f19592edf</Sha>
<Sha>ea9b2530a1559dd6426730aba52fca1924db2b65</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20190501.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
24 changes: 12 additions & 12 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
</PropertyGroup>
<PropertyGroup>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19229.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19229.8</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetCoreFxTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19229.8</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19229.8</MicrosoftDotNetVersionToolsTasksPackageVersion>
<MicrosoftDotNetApiCompatPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetApiCompatPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenFacadesPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetGenFacadesPackageVersion>
<MicrosoftDotNetXUnitExtensionsPackageVersion>2.4.0-beta.19251.6</MicrosoftDotNetXUnitExtensionsPackageVersion>
<MicrosoftDotNetXUnitConsoleRunnerPackageVersion>2.5.1-beta.19251.6</MicrosoftDotNetXUnitConsoleRunnerPackageVersion>
<MicrosoftDotNetBuildTasksPackagingPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetBuildTasksPackagingPackageVersion>
<MicrosoftDotNetCoreFxTestingPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetCoreFxTestingPackageVersion>
<MicrosoftDotNetRemoteExecutorPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetRemoteExecutorPackageVersion>
<MicrosoftDotNetBuildTasksConfigurationPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetBuildTasksConfigurationPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>2.2.0-beta.19251.6</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetVersionToolsTasksPackageVersion>1.0.0-beta.19251.6</MicrosoftDotNetVersionToolsTasksPackageVersion>
<!-- Core-setup dependencies -->
<MicrosoftNETCoreAppPackageVersion>3.0.0-preview6-27629-07</MicrosoftNETCoreAppPackageVersion>
<MicrosoftNETCoreDotNetHostPackageVersion>3.0.0-preview6-27629-07</MicrosoftNETCoreDotNetHostPackageVersion>
Expand Down
4 changes: 4 additions & 0 deletions eng/common/build.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,10 @@ try {
. $configureToolsetScript
}

if ($restore) {
InitializeNativeTools
}

Build
}
catch {
Expand Down
4 changes: 4 additions & 0 deletions eng/common/build.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,4 +218,8 @@ if [[ -n "${useInstalledDotNetCli:-}" ]]; then
use_installed_dotnet_cli="$useInstalledDotNetCli"
fi

if [[ "$restore" == true ]]; then
InitializeNativeTools
fi

Build
6 changes: 5 additions & 1 deletion eng/common/init-tools-native.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@ Param (
[switch] $Force = $False,
[int] $DownloadRetries = 5,
[int] $RetryWaitTimeInSeconds = 30,
[string] $GlobalJsonFile = "$PSScriptRoot\..\..\global.json"
[string] $GlobalJsonFile
)

if (!$GlobalJsonFile) {
$GlobalJsonFile = Join-Path (Get-Item $PSScriptRoot).Parent.Parent.FullName "global.json"
}

Set-StrictMode -version 2.0
$ErrorActionPreference="Stop"

Expand Down
12 changes: 4 additions & 8 deletions eng/common/init-tools-native.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ clean=false
force=false
download_retries=5
retry_wait_time_seconds=30
global_json_file="${scriptroot}/../../global.json"
global_json_file="$(dirname "$(dirname "${scriptroot}")")/global.json"
declare -A native_assets

. $scriptroot/native/common-library.sh
Expand Down Expand Up @@ -71,6 +71,7 @@ function ReadGlobalJsonNativeTools {
local native_tools_list=$(echo $native_tools_section | awk -F"[{}]" '{print $2}')
native_tools_list=${native_tools_list//[\" ]/}
native_tools_list=${native_tools_list//,/$'\n'}
native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[:space:]')"

local old_IFS=$IFS
while read -r line; do
Expand Down Expand Up @@ -116,8 +117,6 @@ else
installer_command+=" --clean"
fi

echo "Installing $tool version $tool_version"
echo "Executing '$installer_command'"
$installer_command

if [[ $? != 0 ]]; then
Expand All @@ -127,19 +126,16 @@ else
done
fi

if [[ ! -z $clean ]]; then
if [[ $clean = true ]]; then
exit 0
fi

if [[ -d $install_bin ]]; then
echo "Native tools are available from $install_bin"
if [[ !-z BUILD_BUILDNUMBER ]]; then
echo "##vso[task.prependpath]$install_bin"
fi
echo "##vso[task.prependpath]$install_bin"
else
echo "Native tools install directory does not exist, installation failed" >&2
exit 1
fi

exit 0

10 changes: 10 additions & 0 deletions eng/common/tools.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,6 +391,16 @@ function GetSdkTaskProject([string]$taskName) {
return Join-Path (Split-Path (InitializeToolset) -Parent) "SdkTasks\$taskName.proj"
}

function InitializeNativeTools() {
if (Get-Member -InputObject $GlobalJson -Name "native-tools") {
$nativeArgs=""
if ($ci) {
$nativeArgs = "-InstallDirectory $ToolsDir"
}
Invoke-Expression "& `"$PSScriptRoot/init-tools-native.ps1`" $nativeArgs"
}
}

function InitializeToolset() {
if (Test-Path variable:global:_ToolsetBuildProj) {
return $global:_ToolsetBuildProj
Expand Down
12 changes: 12 additions & 0 deletions eng/common/tools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,17 @@ function GetNuGetPackageCachePath {
_GetNuGetPackageCachePath=$NUGET_PACKAGES
}

function InitializeNativeTools() {
if grep -Fq "native-tools" $global_json_file
then
local nativeArgs=""
if [[ "$ci" == true ]]; then
nativeArgs="-InstallDirectory $tools_dir"
fi
"$_script_dir/init-tools-native.sh" $nativeArgs
fi
}

function InitializeToolset {
if [[ -n "${_InitializeToolset:-}" ]]; then
return
Expand Down Expand Up @@ -307,6 +318,7 @@ eng_root=`cd -P "$_script_dir/.." && pwd`
repo_root=`cd -P "$_script_dir/../.." && pwd`
artifacts_dir="$repo_root/artifacts"
toolset_dir="$artifacts_dir/toolset"
tools_dir="$repo_root/.tools"
log_dir="$artifacts_dir/log/$configuration"
temp_dir="$artifacts_dir/tmp/$configuration"

Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"dotnet": "3.0.100-preview6-011681"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19229.8",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19229.8",
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19251.6",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19251.6",
"Microsoft.NET.Sdk.IL": "3.0.0-preview6-27630-79"
}
}

0 comments on commit 68e86bc

Please sign in to comment.