Skip to content

Commit d0b1236

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[master] Update dependencies from dotnet/arcade (#4146)
* Update dependencies from https://github.com/dotnet/arcade build 20200130.4 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20080.4 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20080.4 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20080.4 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20080.4 - Microsoft.DotNet.SignTool - 5.0.0-beta.20080.4 * Update dependencies from https://github.com/dotnet/arcade build 20200131.7 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20081.7 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20081.7 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20081.7 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20081.7 - Microsoft.DotNet.SignTool - 5.0.0-beta.20081.7 * Update dependencies from https://github.com/dotnet/arcade build 20200201.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20101.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20101.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20101.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20101.2 - Microsoft.DotNet.SignTool - 5.0.0-beta.20101.2 * Update dependencies from https://github.com/dotnet/arcade build 20200203.5 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20103.5 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20103.5 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20103.5 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20103.5 - Microsoft.DotNet.SignTool - 5.0.0-beta.20103.5 * Update dependencies from https://github.com/dotnet/arcade build 20200204.2 - Microsoft.DotNet.XUnitExtensions - 5.0.0-beta.20104.2 - Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20104.2 - Microsoft.DotNet.GenFacades - 5.0.0-beta.20104.2 - Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20104.2 - Microsoft.DotNet.SignTool - 5.0.0-beta.20104.2
1 parent ba439fc commit d0b1236

File tree

6 files changed

+21
-24
lines changed

6 files changed

+21
-24
lines changed

‎eng/Version.Details.xml

+10-10
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@
44
<ProductDependencies>
55
</ProductDependencies>
66
<ToolsetDependencies>
7-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20079.8">
7+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20104.2">
88
<Uri>https://github.com/dotnet/arcade</Uri>
9-
<Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
9+
<Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20079.8">
11+
<Dependency Name="Microsoft.DotNet.SignTool" Version="5.0.0-beta.20104.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
13+
<Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20079.8">
15+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20104.2">
1616
<Uri>https://github.com/dotnet/arcade</Uri>
17-
<Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
17+
<Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20079.8">
19+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="5.0.0-beta.20104.2">
2020
<Uri>https://github.com/dotnet/arcade</Uri>
21-
<Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
21+
<Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
2222
</Dependency>
23-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20079.8">
23+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="5.0.0-beta.20104.2">
2424
<Uri>https://github.com/dotnet/arcade</Uri>
25-
<Sha>8466781af43871ee0d4a1655acc008a305a62c0e</Sha>
25+
<Sha>0b404cb7575c8addc5e10f3fac57e79c596db28e</Sha>
2626
</Dependency>
2727
</ToolsetDependencies>
2828
</Dependencies>

‎eng/Versions.props

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
</PropertyGroup>
2525
<!-- Arcade dependencies -->
2626
<PropertyGroup>
27-
<MicrosoftDotNetArcadeSdkPackageVersion>5.0.0-beta.20079.8</MicrosoftDotNetArcadeSdkPackageVersion>
28-
<MicrosoftDotNetHelixSdkPackageVersion>5.0.0-beta.20079.8</MicrosoftDotNetHelixSdkPackageVersion>
29-
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20079.8</MicrosoftDotNetGenFacadesPackageVersion>
30-
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20079.8</MicrosoftDotNetXUnitExtensionsPackageVersion>
31-
<MicrosoftDotNetSignToolVersion>5.0.0-beta.20079.8</MicrosoftDotNetSignToolVersion>
27+
<MicrosoftDotNetArcadeSdkPackageVersion>5.0.0-beta.20104.2</MicrosoftDotNetArcadeSdkPackageVersion>
28+
<MicrosoftDotNetHelixSdkPackageVersion>5.0.0-beta.20104.2</MicrosoftDotNetHelixSdkPackageVersion>
29+
<MicrosoftDotNetGenFacadesPackageVersion>5.0.0-beta.20104.2</MicrosoftDotNetGenFacadesPackageVersion>
30+
<MicrosoftDotNetXUnitExtensionsPackageVersion>5.0.0-beta.20104.2</MicrosoftDotNetXUnitExtensionsPackageVersion>
31+
<MicrosoftDotNetSignToolVersion>5.0.0-beta.20104.2</MicrosoftDotNetSignToolVersion>
3232
</PropertyGroup>
3333
<!-- CoreFx dependencies -->
3434
<PropertyGroup>

‎eng/common/performance/performance-setup.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Param(
22
[string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY,
33
[string] $CoreRootDirectory,
44
[string] $BaselineCoreRootDirectory,
5-
[string] $Architecture="x64",
5+
[string] $Architecture=$env:archType,
66
[string] $Framework="netcoreapp5.0",
77
[string] $CompilationMode="Tiered",
88
[string] $Repository=$env:BUILD_REPOSITORY_NAME,
@@ -14,7 +14,7 @@ Param(
1414
[string] $Kind="micro",
1515
[switch] $Internal,
1616
[switch] $Compare,
17-
[string] $Configurations="CompilationMode=$CompilationMode"
17+
[string] $Configurations="CompilationMode=$CompilationMode RunKind=$Kind"
1818
)
1919

2020
$RunFromPerformanceRepo = ($Repository -eq "dotnet/performance") -or ($Repository -eq "dotnet-performance")

‎eng/common/performance/performance-setup.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source_directory=$BUILD_SOURCESDIRECTORY
44
core_root_directory=
55
baseline_core_root_directory=
6-
architecture=x64
6+
architecture=$archType
77
framework=netcoreapp5.0
88
compilation_mode=tiered
99
repository=$BUILD_REPOSITORY_NAME
@@ -15,7 +15,7 @@ compare=false
1515
kind="micro"
1616
run_categories="Libraries Runtime"
1717
csproj="src\benchmarks\micro\MicroBenchmarks.csproj"
18-
configurations=
18+
configurations="CompliationMode=$compilation_mode RunKind=$kind"
1919
run_from_perf_repo=false
2020
use_core_run=true
2121
use_baseline_core_run=true

‎eng/common/tools.ps1

-3
Original file line numberDiff line numberDiff line change
@@ -655,9 +655,6 @@ Write-PipelineSetVariable -Name 'Artifacts.Log' -Value $LogDir
655655
Write-PipelineSetVariable -Name 'TEMP' -Value $TempDir
656656
Write-PipelineSetVariable -Name 'TMP' -Value $TempDir
657657

658-
$env:TEMP=$TempDir
659-
$env:TMP=$TempDir
660-
661658
# Import custom tools configuration, if present in the repo.
662659
# Note: Import in global scope so that the script set top-level variables without qualification.
663660
if (!$disableConfigureToolsetImport) {

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": "3.0.101"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20079.8",
15-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20079.8"
14+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20104.2",
15+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20104.2"
1616
}
1717
}

0 commit comments

Comments
 (0)