提交 4b26a4c1 编写于 作者: D dotnet-maestro[bot] 提交者: Jose Perez Rodriguez

Update dependencies from https://github.com/dotnet/arcade build 20190717.8 (#604)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19367.8
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19367.8
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19367.8
上级 fdabbe9f
......@@ -11,17 +11,17 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19366.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19367.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0dd5e2025f0049c133a8706f40e4463b193e5d17</Sha>
<Sha>2359dc4184133defa27c8f3072622270b71b4ecf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19366.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19367.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0dd5e2025f0049c133a8706f40e4463b193e5d17</Sha>
<Sha>2359dc4184133defa27c8f3072622270b71b4ecf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19366.4">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19367.8">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>0dd5e2025f0049c133a8706f40e4463b193e5d17</Sha>
<Sha>2359dc4184133defa27c8f3072622270b71b4ecf</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
......@@ -6,7 +6,7 @@
<SystemDeviceGpioPackageVersion>0.1.0-prerelease.19366.1</SystemDeviceGpioPackageVersion>
<IotDeviceBindingsPackageVersion>0.1.0-prerelease.19366.1</IotDeviceBindingsPackageVersion>
<!-- dotnet/arcade dependencies -->
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19366.4</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19367.8</MicrosoftDotNetGenAPIPackageVersion>
</PropertyGroup>
<!-- Restore sources -->
<PropertyGroup>
......
......@@ -71,7 +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:]')"
native_tools_list="$(echo -e "${native_tools_list}" | tr -d '[[:space:]]')"
local old_IFS=$IFS
while read -r line; do
......
......@@ -84,6 +84,7 @@ stages:
/p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName)
/p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1)
/p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url)
/p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url)
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com'
......
......@@ -84,6 +84,7 @@ stages:
/p:AzureStorageAccountName=$(ProxyBackedFeedsAccountName)
/p:AzureStorageAccountKey=$(dotnetfeed-storage-access-key-1)
/p:AzureDevOpsFeedsBaseUrl=$(dotnetfeed-internal-private-feed-url)
/p:StaticInternalFeed=$(dotnetfeed-internal-nonstable-feed-url)
/p:NugetPath=$(Agent.BuildDirectory)\Nuget\NuGet.exe
/p:BARBuildId=$(BARBuildId)
/p:MaestroApiEndpoint='https://maestro-prod.westus2.cloudapp.azure.com'
......
......@@ -169,7 +169,7 @@ function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $arc
InstallDotNet $dotnetRoot $version $architecture
}
function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) { $installScript = GetDotNetInstallScript $dotnetRoot
function InstallDotNet([string] $dotnetRoot, [string] $version, [string] $architecture = "", [string] $runtime = "", [bool] $skipNonVersionedFiles = $false) {
$installScript = GetDotNetInstallScript $dotnetRoot
$installParameters = @{
Version = $version
......
......@@ -11,7 +11,7 @@
"version": "3.0.100-preview6-012264"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19366.4",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19366.4"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19367.8",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19367.8"
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册