Update dependencies from https://github.com/dotnet/arcade build 20190110.8
This change updates the following dependencies - Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19060.8
This commit is contained in:
parent
937ee8d6d6
commit
26ed48ce5e
8 changed files with 24 additions and 4 deletions
|
@ -24,9 +24,9 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19058.5">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19060.8">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>3220be53ac764d9ee160b0bc64baa492af219aa7</Sha>
|
<Sha>67384d20d310611afc1c2b4dd3b953fda182def4</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -137,6 +137,9 @@ while [[ $# > 0 ]]; do
|
||||||
/m:*)
|
/m:*)
|
||||||
properties="$properties $1"
|
properties="$properties $1"
|
||||||
;;
|
;;
|
||||||
|
/bl:*)
|
||||||
|
properties="$properties $1"
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "Invalid argument: $1"
|
echo "Invalid argument: $1"
|
||||||
usage
|
usage
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
<HelixWorkItem Include="WorkItem" Condition="'$(WorkItemDirectory)' != ''">
|
<HelixWorkItem Include="WorkItem" Condition="'$(WorkItemDirectory)' != ''">
|
||||||
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
|
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
|
||||||
<Command>$(WorkItemCommand)</Command>
|
<Command>$(WorkItemCommand)</Command>
|
||||||
|
<Timeout Condition="'$(WorkItemTimeout)' != ''">$(WorkItemTimeout)</Timeout>
|
||||||
</HelixWorkItem>
|
</HelixWorkItem>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
@ -85,7 +85,6 @@ phases:
|
||||||
- task: MicroBuildSigningPlugin@2
|
- task: MicroBuildSigningPlugin@2
|
||||||
displayName: Install MicroBuild plugin
|
displayName: Install MicroBuild plugin
|
||||||
inputs:
|
inputs:
|
||||||
version: 1.1.35
|
|
||||||
signType: $(_SignType)
|
signType: $(_SignType)
|
||||||
zipSources: false
|
zipSources: false
|
||||||
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
|
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
|
||||||
|
|
|
@ -8,6 +8,7 @@ parameters:
|
||||||
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
|
HelixPostCommands: '' # optional -- commands to run after Helix work item execution
|
||||||
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
|
WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects
|
||||||
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
|
WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects
|
||||||
|
WorkItemTimeout: '' # optional -- a timeout in seconds for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects
|
||||||
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
|
CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload
|
||||||
XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
|
XUnitProjects: '' # optional -- semicolon delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true
|
||||||
XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects
|
XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects
|
||||||
|
@ -37,6 +38,7 @@ steps:
|
||||||
HelixPostCommands: ${{ parameters.HelixPostCommands }}
|
HelixPostCommands: ${{ parameters.HelixPostCommands }}
|
||||||
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
|
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
|
||||||
WorkItemCommand: ${{ parameters.WorkItemCommand }}
|
WorkItemCommand: ${{ parameters.WorkItemCommand }}
|
||||||
|
WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
|
||||||
CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
|
CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
|
||||||
XUnitProjects: ${{ parameters.XUnitProjects }}
|
XUnitProjects: ${{ parameters.XUnitProjects }}
|
||||||
XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
|
XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
|
||||||
|
@ -64,6 +66,7 @@ steps:
|
||||||
HelixPostCommands: ${{ parameters.HelixPostCommands }}
|
HelixPostCommands: ${{ parameters.HelixPostCommands }}
|
||||||
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
|
WorkItemDirectory: ${{ parameters.WorkItemDirectory }}
|
||||||
WorkItemCommand: ${{ parameters.WorkItemCommand }}
|
WorkItemCommand: ${{ parameters.WorkItemCommand }}
|
||||||
|
WorkItemTimeout: ${{ parameters.WorkItemTimeout }}
|
||||||
CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
|
CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }}
|
||||||
XUnitProjects: ${{ parameters.XUnitProjects }}
|
XUnitProjects: ${{ parameters.XUnitProjects }}
|
||||||
XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
|
XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }}
|
||||||
|
|
|
@ -141,6 +141,13 @@ function InitializeDotNetCli([bool]$install) {
|
||||||
# It also ensures that VS msbuild will use the downloaded sdk targets.
|
# It also ensures that VS msbuild will use the downloaded sdk targets.
|
||||||
$env:PATH = "$dotnetRoot;$env:PATH"
|
$env:PATH = "$dotnetRoot;$env:PATH"
|
||||||
|
|
||||||
|
if ($ci) {
|
||||||
|
# Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build
|
||||||
|
Write-Host "##vso[task.prependpath]$dotnetRoot"
|
||||||
|
Write-Host "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
|
||||||
|
Write-Host "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
|
||||||
|
}
|
||||||
|
|
||||||
return $global:_DotNetInstallDir = $dotnetRoot
|
return $global:_DotNetInstallDir = $dotnetRoot
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -135,6 +135,13 @@ function InitializeDotNetCli {
|
||||||
# build steps from using anything other than what we've downloaded.
|
# build steps from using anything other than what we've downloaded.
|
||||||
export PATH="$dotnet_root:$PATH"
|
export PATH="$dotnet_root:$PATH"
|
||||||
|
|
||||||
|
if [[ $ci == true ]]; then
|
||||||
|
# Make Sure that our bootstrapped dotnet cli is avaliable in future steps of the Azure Pipelines build
|
||||||
|
echo "##vso[task.prependpath]$dotnet_root"
|
||||||
|
echo "##vso[task.setvariable variable=DOTNET_MULTILEVEL_LOOKUP]0"
|
||||||
|
echo "##vso[task.setvariable variable=DOTNET_SKIP_FIRST_TIME_EXPERIENCE]1"
|
||||||
|
fi
|
||||||
|
|
||||||
# return value
|
# return value
|
||||||
_InitializeDotNetCli="$dotnet_root"
|
_InitializeDotNetCli="$dotnet_root"
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
"dotnet": "3.0.100-preview-009812"
|
"dotnet": "3.0.100-preview-009812"
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19058.5"
|
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19060.8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue