Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[master] Update dependencies from dotnet/arcade dotnet/llvm-project dotnet/icu #44336

Merged
merged 5 commits into from
Nov 6, 2020
Merged

[master] Update dependencies from dotnet/arcade dotnet/llvm-project dotnet/icu #44336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
656b4e6
Update dependencies from https://github.com/dotnet/arcade build 20201…
dotnet-maestro[bot] Nov 5, 2020
e9bac6f
Update dependencies from https://github.com/dotnet/llvm-project build…
dotnet-maestro[bot] Nov 6, 2020
2dc3c31
Merge branch 'master' into darc-master-2211df94-2a02-4c3c-abe1-e3534e…
marek-safar Nov 6, 2020
9ef4d88
Update dependencies from https://github.com/dotnet/arcade build 20201…
dotnet-maestro[bot] Nov 6, 2020
706657e
Update dependencies from https://github.com/dotnet/icu build 20201102.1
dotnet-maestro[bot] Nov 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 46 additions & 46 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,67 @@
<Uri>https://github.com/dotnet/standard</Uri>
<Sha>cfe95a23647c7de1fe1a349343115bd7720d6949</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20526.1">
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-alpha.1.20552.1">
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>ba48e6f5e60aa200a567f9dadef1046f7bf374ec</Sha>
<Sha>a39deb47c8f20ed5adb57cddbc83ac587413c4e4</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20529.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20529.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk" Version="6.0.0-beta.20552.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>19e7e769f7ca2ece42221f7ff951e7ec705498ec</Sha>
<Sha>72b28b7e023d4c3fffa0a0b9748a7d4e8cc799be</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.IBC.CoreFx" Version="99.99.99-master-20200806.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -126,37 +126,37 @@
<Uri>https://github.com/dotnet/runtime-assets</Uri>
<Sha>edc9df4021be1dff54b8d8be88b4bee7626cb6a5</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20530.2">
<Dependency Name="runtime.osx.10.12-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools" Version="9.0.1-alpha.1.20552.1">
<Uri>https://github.com/dotnet/llvm-project</Uri>
<Sha>69cf173ab66c68e4282c1da56628b36d4ae2acc2</Sha>
<Sha>d6c16bf3ec8315049ad0412a7d41e8858b5d0d13</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App" Version="5.0.0-rc.1.20451.14">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.20513.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20529.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20529.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20529.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20529.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20529.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20529.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20529.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20529.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20529.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20529.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.20552.5</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.20552.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.20552.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.20552.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.20552.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.20552.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.20552.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.20552.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.20552.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.20552.5</MicrosoftDotNetVersionToolsTasksVersion>
<!-- Installer dependencies -->
<MicrosoftNETCoreAppVersion>5.0.0-rc.1.20451.14</MicrosoftNETCoreAppVersion>
<MicrosoftNETCoreDotNetHostVersion>6.0.0-alpha.1.20501.4</MicrosoftNETCoreDotNetHostVersion>
Expand Down Expand Up @@ -151,16 +151,16 @@
<!-- ILLink -->
<MicrosoftNETILLinkTasksVersion>6.0.0-alpha.1.20527.2</MicrosoftNETILLinkTasksVersion>
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-alpha.1.20526.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-alpha.1.20552.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20530.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20530.2</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20552.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20552.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20552.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20552.1</runtimelinuxx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20552.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20552.1</runtimewinx64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>9.0.1-alpha.1.20552.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>9.0.1-alpha.1.20552.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
</PropertyGroup>
<!-- Package names -->
<PropertyGroup>
Expand Down
10 changes: 5 additions & 5 deletions eng/common/performance/crossgen_perf.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,18 @@
<ItemGroup>
<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 &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
<PostCommands>$(Python) $(CrossgenDirectory)post.py</PostCommands>
<PreCommands>$(Python) pre.py crossgen --core-root $(CoreRoot) --single %(Identity) </PreCommands>
<Command>$(Python) test.py sod --scenario-name &quot;Crossgen %(Identity) Size&quot; --dirs ./crossgen/</Command>
<PostCommands>$(Python) post.py</PostCommands>
</CrossgenSizeOnDiskWorkItem>
</ItemGroup>

<ItemGroup>
<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 &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
<PostCommands>$(Python) $(Crossgen2Directory)post.py</PostCommands>
<Command>$(Python) test.py sod --scenario-name &quot;Crossgen2 %(Identity) Size&quot; --dirs ./crossgen/</Command>
<PostCommands>$(Python) post.py</PostCommands>
</Crossgen2SizeOnDiskWorkItem>
</ItemGroup>

Expand Down
4 changes: 1 addition & 3 deletions eng/common/performance/performance-setup.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,7 @@ $SetupArguments = "--repository https://github.com/$Repository --branch $Branch
#This grabs the LKG version number of dotnet and passes it to our scripts
$VersionJSON = Get-Content global.json | ConvertFrom-Json
$DotNetVersion = $VersionJSON.tools.dotnet
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
# $SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"
$SetupArguments = "--dotnet-versions 6.0.100-alpha.1.20553.6 $SetupArguments"
$SetupArguments = "--dotnet-versions $DotNetVersion $SetupArguments"


if ($RunFromPerformanceRepo) {
Expand Down
4 changes: 1 addition & 3 deletions eng/common/performance/performance-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,7 @@ if [[ "$use_latest_dotnet" = false ]]; then
# Get the tools section from the global.json.
# This grabs the LKG version number of dotnet and passes it to our scripts
dotnet_version=`cat global.json | python3 -c 'import json,sys;obj=json.load(sys.stdin);print(obj["tools"]["dotnet"])'`
# TODO: Change this back to parsing when we have a good story for dealing with TFM changes or when the LKG in runtime gets updated to include net6.0
# setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
setup_arguments="--dotnet-versions 6.0.100-alpha.1.20553.6 $setup_arguments"
setup_arguments="--dotnet-versions $dotnet_version $setup_arguments"
fi

if [[ "$run_from_perf_repo" = true ]]; then
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"python3": "3.7.1"
},
"msbuild-sdks": {
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20554.1",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20529.1",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20529.1",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20529.1",
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.20552.5",
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20552.5",
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "6.0.0-beta.20552.5",
"Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20552.5",
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "5.0.0-preview.8.20359.4",
"Microsoft.Build.NoTargets": "2.0.1",
Expand Down