diff options
| -rw-r--r-- | eng/Version.Details.xml | 16 | ||||
| -rw-r--r-- | eng/Versions.props | 4 | ||||
| -rwxr-xr-x | eng/common/cross/build-rootfs.sh | 2 | ||||
| -rw-r--r-- | eng/common/tools.ps1 | 4 | ||||
| -rw-r--r-- | global.json | 4 |
5 files changed, 15 insertions, 15 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c8999d9ad..9ae1edb714 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19304.1"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19305.13"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d2599acd9703ef747dfb4329ec3e3beff182e755</Sha> + <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19304.1"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19305.13"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d2599acd9703ef747dfb4329ec3e3beff182e755</Sha> + <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19304.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="2.2.0-beta.19305.13"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d2599acd9703ef747dfb4329ec3e3beff182e755</Sha> + <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19304.1"> + <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="1.0.0-beta.19305.13"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>d2599acd9703ef747dfb4329ec3e3beff182e755</Sha> + <Sha>d05c046913964e880be08b804e7249f297617c2f</Sha> </Dependency> <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview7.19306.1"> <Uri>https://github.com/dotnet/corefx</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index d54cc53830..2c71b589d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -14,8 +14,8 @@ <UsingToolXliff>false</UsingToolXliff> <!-- Package versions --> <!-- arcade --> - <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19304.1</MicrosoftDotNetBuildTasksFeedVersion> - <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19304.1</MicrosoftDotNetBuildTasksPackagingVersion> + <MicrosoftDotNetBuildTasksFeedVersion>2.2.0-beta.19305.13</MicrosoftDotNetBuildTasksFeedVersion> + <MicrosoftDotNetBuildTasksPackagingVersion>1.0.0-beta.19305.13</MicrosoftDotNetBuildTasksPackagingVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.19278.1</MicrosoftDotNetXUnitConsoleRunnerVersion> <!-- corefx --> <MicrosoftPrivateCoreFxNETCoreAppVersion>4.6.0-preview7.19306.1</MicrosoftPrivateCoreFxNETCoreAppVersion> diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 34d3d2ba1f..7c4e122651 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -181,7 +181,7 @@ if [ -z "$__RootfsDir" ] && [ ! -z "$ROOTFS_DIR" ]; then fi if [ -z "$__RootfsDir" ]; then - __RootfsDir="$__CrossDir/rootfs/$__BuildArch" + __RootfsDir="$__CrossDir/../../../.tools/rootfs/$__BuildArch" fi if [ -d "$__RootfsDir" ]; then diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 3983d719be..538a0262b5 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -107,11 +107,11 @@ function Write-PipelineTaskError { if(!$ci) { if($Type -eq 'error') { - Write-Error $Message + Write-Host $Message -ForegroundColor Red return } elseif ($Type -eq 'warning') { - Write-Warning $Message + Write-Host $Message -ForegroundColor Yellow return } } diff --git a/global.json b/global.json index d13ab7ff35..dba1040aae 100644 --- a/global.json +++ b/global.json @@ -7,8 +7,8 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19304.1", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19304.1", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19305.13", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19305.13", "Microsoft.Build.NoTargets": "1.0.53", "Microsoft.Build.Traversal": "2.0.2" } |