diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05f0abbfd3d84..63ddd2df883cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,61 +6,61 @@ - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a - + https://github.com/dotnet/arcade - 03bd0e0cefb81d33d08c4853fa5d6a8057c34d94 + 8ccad075bbb0db445e03eed0a6073d27bdd4f31a https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -82,41 +82,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization d0bb63d2ec7060714e63ee4082fac48f2e57f3e2 - + https://github.com/microsoft/vstest - 5cd81e44cd7ac84124cab30dbc9b136b4a3312f6 + 57527561e6342aaaaca4012dc14d25ad08c0a326 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 - + https://github.com/dotnet/runtime-assets - d08f5c335e32348b986440b61c75bce196b96da8 + d23c3e1f4dcc30fcf16b9e53c90b7eaab6f08311 https://github.com/dotnet/llvm-project @@ -166,9 +166,9 @@ https://github.com/dotnet/runtime e793fcc19797f407a1b7e98d5f81b04e25a551c3 - + https://github.com/mono/linker - e06788800df2d0431c0821e1116406ff3a67226a + cd01694ab1406159dd8e3f0ab81624f5feec2414 diff --git a/eng/Versions.props b/eng/Versions.props index d4c26a5cbe63c..065037a65a724 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,16 +57,16 @@ - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 - 2.5.1-beta.20124.3 - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 - 5.0.0-beta.20124.3 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 + 2.5.1-beta.20151.1 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 + 5.0.0-beta.20151.1 5.0.0-alpha.1.20080.9 5.0.0-alpha.1.20080.9 @@ -79,14 +79,14 @@ 5.0.0-alpha.1.19563.3 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 - 5.0.0-beta.20118.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 + 5.0.0-beta.20125.1 2.2.0-prerelease.19564.1 @@ -111,7 +111,7 @@ 4.8.0 - 16.6.0-preview-20200225-01 + 16.6.0-preview-20200226-03 2.4.1 2.0.5 12.0.3 @@ -120,7 +120,7 @@ 3.1.0-preview-20200129.1 - 0.1.6-prerelease.20122.1 + 0.1.6-prerelease.20127.1 6.0.1-alpha.1.20124.1 6.0.1-alpha.1.20124.1 diff --git a/eng/common/dotnet-install.sh b/eng/common/dotnet-install.sh index 50bc5e475c78f..ead6a1d9a24be 100755 --- a/eng/common/dotnet-install.sh +++ b/eng/common/dotnet-install.sh @@ -63,7 +63,7 @@ case $cpuname in amd64|x86_64) buildarch=x64 ;; - armv7l) + armv*l) buildarch=arm ;; i686) diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index dbd7cbfdf678f..29fc5db8ae07b 100755 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -34,6 +34,14 @@ while (($# > 0)); do force=true shift 1 ;; + --donotabortonfailure) + donotabortonfailure=true + shift 1 + ;; + --donotdisplaywarnings) + donotdisplaywarnings=true + shift 1 + ;; --downloadretries) download_retries=$2 shift 2 @@ -52,6 +60,8 @@ while (($# > 0)); do echo " - (default) %USERPROFILE%/.netcoreeng/native" echo "" echo " --clean Switch specifying not to install anything, but cleanup native asset folders" + echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" + echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" echo " --force Clean and then install tools" echo " --help Print help and exit" echo "" @@ -92,6 +102,7 @@ if [[ -z $install_directory ]]; then fi install_bin="${native_base_dir}/bin" +installed_any=false ReadGlobalJsonNativeTools @@ -103,8 +114,8 @@ else for tool in "${!native_assets[@]}" do tool_version=${native_assets[$tool]} - installer_name="install-$tool.sh" - installer_command="$native_installer_dir/$installer_name" + installer_path="$native_installer_dir/install-$tool.sh" + installer_command="$installer_path" installer_command+=" --baseuri $base_uri" installer_command+=" --installpath $install_bin" installer_command+=" --version $tool_version" @@ -118,11 +129,29 @@ else installer_command+=" --clean" fi - $installer_command - - if [[ $? != 0 ]]; then - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" - exit 1 + if [[ -a $installer_path ]]; then + $installer_command + if [[ $? != 0 ]]; then + if [[ $donotabortonfailure = true ]]; then + if [[ $donotdisplaywarnings != true ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" + fi + else + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed" + exit 1 + fi + else + $installed_any = true + fi + else + if [[ $donotabortonfailure == true ]]; then + if [[ $donotdisplaywarnings != true ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" + fi + else + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Execution Failed: no install script" + exit 1 + fi fi done fi @@ -135,8 +164,10 @@ if [[ -d $install_bin ]]; then echo "Native tools are available from $install_bin" echo "##vso[task.prependpath]$install_bin" else - Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed" - exit 1 + if [[ $installed_any = true ]]; then + Write-PipelineTelemetryError -category 'NativeToolsBootstrap' "Native tools install directory does not exist, installation failed" + exit 1 + fi fi exit 0 diff --git a/eng/common/performance/perfhelixpublish.proj b/eng/common/performance/perfhelixpublish.proj index e5826b532370b..cf5941e1b6455 100644 --- a/eng/common/performance/perfhelixpublish.proj +++ b/eng/common/performance/perfhelixpublish.proj @@ -6,7 +6,7 @@ py -3 %HELIX_CORRELATION_PAYLOAD%\Core_Root\CoreRun.exe %HELIX_CORRELATION_PAYLOAD%\Baseline_Core_Root\CoreRun.exe - $(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd + $(HelixPreCommands);call %HELIX_CORRELATION_PAYLOAD%\performance\tools\machine-setup.cmd;set PYTHONPATH=%HELIX_WORKITEM_PAYLOAD%\scripts%3B%HELIX_WORKITEM_PAYLOAD% %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts %HELIX_CORRELATION_PAYLOAD%\artifacts\BenchmarkDotNet.Artifacts_Baseline %HELIX_CORRELATION_PAYLOAD%\performance\src\tools\ResultsComparer\ResultsComparer.csproj @@ -99,4 +99,23 @@ 4:00 + + + + $(WorkItemDirectory)\ScenarioCorrelation + $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Private.Xml.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + + $(WorkItemDirectory)\ScenarioCorrelation + $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name System.Linq.Expressions.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + + $(WorkItemDirectory)\ScenarioCorrelation + $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.VisualBasic.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + + $(WorkItemDirectory)\ScenarioCorrelation + $(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen\test.py crossgen --test-name Microsoft.CodeAnalysis.CSharp.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root + + \ No newline at end of file diff --git a/eng/common/templates/post-build/channels/generic-internal-channel.yml b/eng/common/templates/post-build/channels/generic-internal-channel.yml index 380122901d0da..dde27800c3f26 100644 --- a/eng/common/templates/post-build/channels/generic-internal-channel.yml +++ b/eng/common/templates/post-build/channels/generic-internal-channel.yml @@ -84,6 +84,7 @@ stages: - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars + timeoutInMinutes: 120 variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/eng/common/templates/post-build/channels/generic-public-channel.yml b/eng/common/templates/post-build/channels/generic-public-channel.yml index 00ef36fefe551..29bc1a941ad44 100644 --- a/eng/common/templates/post-build/channels/generic-public-channel.yml +++ b/eng/common/templates/post-build/channels/generic-public-channel.yml @@ -83,6 +83,7 @@ stages: - job: publish_assets displayName: Publish Assets dependsOn: setupMaestroVars + timeoutInMinutes: 120 variables: - name: BARBuildId value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ] diff --git a/global.json b/global.json index 64b1bde3c0e93..ee2c14b898326 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20124.3", - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20124.3", - "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20124.3", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20124.3", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20151.1", + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1", + "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20151.1", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "5.0.0-alpha.1.20076.2", "Microsoft.Build.NoTargets": "1.0.53", diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props index 80c88beb4f6a2..74ba15f88e9fa 100644 --- a/src/libraries/Directory.Build.props +++ b/src/libraries/Directory.Build.props @@ -34,6 +34,7 @@ $(DefaultOSGroup) + $(OSGroup)