Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/llvm-project.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>2022-10-10 20:44:28 +0300
committerGitHub <noreply@github.com>2022-10-10 20:44:28 +0300
commit53ee4feddda1b216e8695047e4fb1f56238291e2 (patch)
tree846be88cd56e354415c8f3600d79cf64cc5b305e
parent78c9eaec7cec210dfaee9a0443d5816b59683697 (diff)
[objwriter/release/7.0] Update dependencies from dotnet/arcade (#278)
* Update dependencies from https://github.com/dotnet/arcade build 20220908.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22457.4 -> To Version 7.0.0-beta.22458.5 * Update dependencies from https://github.com/dotnet/arcade build 20220914.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22457.4 -> To Version 7.0.0-beta.22464.4 * Update dependencies from https://github.com/dotnet/arcade build 20220921.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22457.4 -> To Version 7.0.0-beta.22471.1 * Update dependencies from https://github.com/dotnet/arcade build 20220923.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22457.4 -> To Version 7.0.0-beta.22473.4 * Update dependencies from https://github.com/dotnet/arcade build 20221007.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Helix.Sdk From Version 7.0.0-beta.22457.4 -> To Version 7.0.0-beta.22507.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
-rw-r--r--eng/Version.Details.xml12
-rw-r--r--eng/Versions.props2
-rw-r--r--eng/common/build.ps15
-rw-r--r--eng/common/init-tools-native.ps16
-rw-r--r--global.json6
5 files changed, 19 insertions, 12 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2d6f564cbd56..58ee616f02d8 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,17 +3,17 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
- <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22457.4">
+ <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.22507.2">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
+ <Sha>c4f77b4e80e942941e73d70cec045eddbfd7b4eb</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22457.4">
+ <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.22507.2">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
+ <Sha>c4f77b4e80e942941e73d70cec045eddbfd7b4eb</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22457.4">
+ <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="7.0.0-beta.22507.2">
<Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>e8ed48e43a06ad8faeb1e62b81fbfb53f4cbdc85</Sha>
+ <Sha>c4f77b4e80e942941e73d70cec045eddbfd7b4eb</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8910742d5840..be352ece2faa 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,6 +6,6 @@
<PreReleaseVersionIteration>1</PreReleaseVersionIteration>
</PropertyGroup>
<PropertyGroup>
- <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22457.4</MicrosoftDotNetBuildTasksPackagingVersion>
+ <MicrosoftDotNetBuildTasksPackagingVersion>7.0.0-beta.22507.2</MicrosoftDotNetBuildTasksPackagingVersion>
</PropertyGroup>
</Project>
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
index 8943da242f6e..e0420a642755 100644
--- a/eng/common/build.ps1
+++ b/eng/common/build.ps1
@@ -26,6 +26,7 @@ Param(
[string] $runtimeSourceFeed = '',
[string] $runtimeSourceFeedKey = '',
[switch] $excludePrereleaseVS,
+ [switch] $nativeToolsOnMachine,
[switch] $help,
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)
@@ -66,6 +67,7 @@ function Print-Usage() {
Write-Host " -prepareMachine Prepare machine for CI run, clean up processes after build"
Write-Host " -warnAsError <value> Sets warnaserror msbuild parameter ('true' or 'false')"
Write-Host " -msbuildEngine <value> Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
+ Write-Host " -nativeToolsOnMachine Sets the native tools on machine environment variable (indicating that the script should use native tools on machine)"
Write-Host " -excludePrereleaseVS Set to exclude build engines in prerelease versions of Visual Studio"
Write-Host ""
@@ -146,6 +148,9 @@ try {
$nodeReuse = $false
}
+ if ($nativeToolsOnMachine) {
+ $env:NativeToolsOnMachine = $true
+ }
if ($restore) {
InitializeNativeTools
}
diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1
index 8d48ec5680fc..fbc67effc363 100644
--- a/eng/common/init-tools-native.ps1
+++ b/eng/common/init-tools-native.ps1
@@ -98,11 +98,12 @@ try {
Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed."
exit 1
}
- $ToolDirectory = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)[0]
- if ([string]::IsNullOrWhiteSpace($ToolDirectory)) {
+ $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending)
+ if ($ToolDirectories -eq $null) {
Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image."
exit 1
}
+ $ToolDirectory = $ToolDirectories[0]
$BinPathFile = "$($ToolDirectory.FullName)\binpath.txt"
if (-not (Test-Path -Path "$BinPathFile")) {
Write-Error "Unable to find binpath.txt in '$($ToolDirectory.FullName)' ($ToolName $ToolVersion); artifact is either installed incorrectly or is not a bootstrappable tool."
@@ -112,6 +113,7 @@ try {
$ToolPath = Convert-Path -Path $BinPath
Write-Host "Adding $ToolName to the path ($ToolPath)..."
Write-Host "##vso[task.prependpath]$ToolPath"
+ $env:PATH = "$ToolPath;$env:PATH"
$InstalledTools += @{ $ToolName = $ToolDirectory.FullName }
}
}
diff --git a/global.json b/global.json
index 13e864ab570a..1ba1cd1ac7d4 100644
--- a/global.json
+++ b/global.json
@@ -1,10 +1,10 @@
{
"tools": {
- "dotnet": "7.0.100-rc.1.22431.11"
+ "dotnet": "7.0.100-rc.1.22431.12"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22457.4",
- "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22457.4",
+ "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22507.2",
+ "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22507.2",
"Microsoft.Build.Traversal": "2.0.34"
}
}