Update dependencies from https://github.com/dotnet/arcade build 20201123.2
Microsoft.DotNet.Arcade.Sdk From Version 1.0.0-beta.19372.10 -> To Version 6.0.0-beta.20573.2
This commit is contained in:
Родитель
bcd4bd5f39
Коммит
307fc854a4
|
@ -3,9 +3,9 @@
|
|||
<ProductDependencies>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20567.7">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20573.2">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
|
||||
<Sha>35bddd4fbfab8da3518fb920250d7c9e0c3138ff</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(AGENT_OS)' != 'Windows_NT'">
|
||||
<Python>python3</Python>
|
||||
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update</HelixPreCommands>
|
||||
<HelixPreCommands>$(HelixPreCommands);chmod +x $HELIX_WORKITEM_PAYLOAD/startup/Startup;chmod +x $HELIX_WORKITEM_PAYLOAD/startup/perfcollect;sudo apt update;chmod +x $HELIX_WORKITEM_PAYLOAD/SOD/SizeOnDisk</HelixPreCommands>
|
||||
<CoreRoot>$HELIX_CORRELATION_PAYLOAD/Core_Root</CoreRoot>
|
||||
<ScenarioDirectory>$HELIX_CORRELATION_PAYLOAD/performance/src/scenarios/</ScenarioDirectory>
|
||||
<CrossgenDirectory>$(ScenarioDirectory)crossgen/</CrossgenDirectory>
|
||||
|
@ -69,7 +69,7 @@
|
|||
<CrossgenSizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
|
||||
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
|
||||
<PreCommands>$(Python) $(CrossgenDirectory)pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
|
||||
<Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen/</Command>
|
||||
<Command>$(Python) $(CrossgenDirectory)test.py sod --scenario-name "Crossgen %(Identity) Size" --dirs ./crossgen.out/</Command>
|
||||
<PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
|
||||
</CrossgenSizeOnDiskWorkItem>
|
||||
</ItemGroup>
|
||||
|
@ -78,7 +78,7 @@
|
|||
<Crossgen2SizeOnDiskWorkItem Include="@(SingleAssembly)" Condition="'$(Architecture)' == 'x64'">
|
||||
<PayloadDirectory>$(WorkItemDirectory)</PayloadDirectory>
|
||||
<PreCommands>$(Python) $(Crossgen2Directory)pre.py crossgen2 --core-root $(CoreRoot) --single %(Identity) </PreCommands>
|
||||
<Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen/</Command>
|
||||
<Command>$(Python) $(Crossgen2Directory)test.py sod --scenario-name "Crossgen2 %(Identity) Size" --dirs ./crossgen.out/</Command>
|
||||
<PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
|
||||
</Crossgen2SizeOnDiskWorkItem>
|
||||
</ItemGroup>
|
||||
|
|
|
@ -198,6 +198,12 @@ if [[ "$internal" == true ]]; then
|
|||
else
|
||||
queue=Ubuntu.1804.Amd64.Tiger.Perf
|
||||
fi
|
||||
else
|
||||
if [[ "$architecture" = "arm64" ]]; then
|
||||
queue=ubuntu.1804.armarch.open
|
||||
else
|
||||
queue=Ubuntu.1804.Amd64.Open
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$mono_dotnet" != "" ]] && [[ "$monointerpreter" == "false" ]]; then
|
||||
|
|
|
@ -164,7 +164,7 @@ function CheckJobResult(
|
|||
[ref]$ValidationFailures,
|
||||
[switch]$logErrors) {
|
||||
if ($result -ne '0') {
|
||||
if ($logError) {
|
||||
if ($logErrors) {
|
||||
Write-PipelineTelemetryError -Category 'SourceLink' -Message "$packagePath has broken SourceLink links."
|
||||
}
|
||||
$ValidationFailures.Value++
|
||||
|
|
|
@ -5,6 +5,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20567.7"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20573.2"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче