Skip to content

Commit c808348

Browse files
[master] Update dependencies from dotnet/arcade (#995)
* Update dependencies from https://github.com/dotnet/arcade build 20200228.3 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20128.3 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20128.3 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20128.3 * Update dependencies from https://github.com/dotnet/arcade build 20200229.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20129.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20129.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20129.1 * Update dependencies from https://github.com/dotnet/arcade build 20200301.1 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20151.1 - Microsoft.DotNet.GenAPI - 5.0.0-beta.20151.1 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20151.1
1 parent 4f06e13 commit c808348

File tree

4 files changed

+29
-10
lines changed

4 files changed

+29
-10
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20127.9">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20151.1">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>9c66925c608f3c0ee3e1f66c05943865b64590e1</Sha>
6+
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20127.9">
8+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20151.1">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>9c66925c608f3c0ee3e1f66c05943865b64590e1</Sha>
10+
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20127.9">
12+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20151.1">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>9c66925c608f3c0ee3e1f66c05943865b64590e1</Sha>
14+
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
1515
</Dependency>
1616
</ToolsetDependencies>
1717
<!-- ProductDependencies -->

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
5-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20127.9</MicrosoftDotNetGenAPIPackageVersion>
5+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20151.1</MicrosoftDotNetGenAPIPackageVersion>
66
<!-- dotnet/corefx dependencies -->
77
<SystemDrawingCommonPackageVersion>4.6.0</SystemDrawingCommonPackageVersion>
88
<SystemIOPortsPackageVersion>4.6.0</SystemIOPortsPackageVersion>

eng/common/performance/perfhelixpublish.proj

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Python>py -3</Python>
77
<CoreRun>%HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe</CoreRun>
88
<BaselineCoreRun>%HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe</BaselineCoreRun>
9-
<HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd</HelixPreCommands>
9+
<HelixPreCommands>$(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD%</HelixPreCommands>
1010
<ArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts</ArtifactsDirectory>
1111
<BaselineArtifactsDirectory>%HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline</BaselineArtifactsDirectory>
1212
<ResultsComparer>%HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj</ResultsComparer>
@@ -99,4 +99,23 @@
9999
<Timeout>4:00</Timeout>
100100
</HelixWorkItem>
101101
</ItemGroup>
102+
103+
<ItemGroup Condition="'$(AGENT_OS)' == 'Windows_NT'">
104+
<HelixWorkItem Include="Crossgen System.Private.Xml.dll">
105+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
106+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
107+
</HelixWorkItem>
108+
<HelixWorkItem Include="Crossgen System.Linq.Expressions.dll">
109+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
110+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
111+
</HelixWorkItem>
112+
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.VisualBasic.dll">
113+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
114+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
115+
</HelixWorkItem>
116+
<HelixWorkItem Include="Crossgen Microsoft.CodeAnalysis.CSharp.dll">
117+
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
118+
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
119+
</HelixWorkItem>
120+
</ItemGroup>
102121
</Project>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": "3.1.101"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20127.9",
15-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20127.9"
14+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1",
15+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1"
1616
}
1717
}

0 commit comments

Comments
 (0)