From 82e349d8c9b19a86156142d517f438cb6fa49bbd Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Fri, 1 Nov 2019 09:14:05 +0100 Subject: [PATCH] Update paths, fix toolset install, update versions --- eng/Subsets.props | 4 + eng/Version.Details.xml | 192 +++++++++--------- eng/Versions.props | 79 ++++--- eng/common/tools.ps1 | 5 +- eng/common/tools.sh | 6 +- global.json | 2 +- .../Native/Unix/gen-buildsys-clang.sh | 2 +- .../Windows/clrcompression/CMakeLists.txt | 2 +- src/libraries/Native/build-native.cmd | 2 +- src/libraries/Native/build-native.sh | 2 +- .../installer.tasks/installer.tasks.csproj | 2 +- 11 files changed, 149 insertions(+), 149 deletions(-) diff --git a/eng/Subsets.props b/eng/Subsets.props index fb4e0181f6a83..ce00016777ef9 100644 --- a/eng/Subsets.props +++ b/eng/Subsets.props @@ -47,6 +47,10 @@ artifacts to the test layout, then running the test subset. --> + + true + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 022d3c4df2c64..6850faebecef7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,132 +1,132 @@ - - https://github.com/dotnet/runtime - 4aea703673e942756c02b222e6b5babaf8612a25 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - 7e9a177824cbefaee8985a9b517ebb0ea2e17a81 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - 9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46 + + https://github.com/dotnet/core-setup + 12fcf91ea6493c2d970188ca6884b2bc6e804986 - - https://github.com/dotnet/runtime - 9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46 + + https://github.com/dotnet/core-setup + 12fcf91ea6493c2d970188ca6884b2bc6e804986 - - https://github.com/dotnet/runtime - 9042fe6c81aa3b47f58ccd94ff02e42f9f7a4e46 + + https://github.com/dotnet/core-setup + 12fcf91ea6493c2d970188ca6884b2bc6e804986 - - https://github.com/dotnet/runtime - 4aea703673e942756c02b222e6b5babaf8612a25 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - f5437ac095272f1ab5e8ca79960add974fa96f2d + + https://github.com/dotnet/coreclr + cea2bba3c295c5280d01900f7ae5492951ad8995 - - https://github.com/dotnet/runtime - f5437ac095272f1ab5e8ca79960add974fa96f2d + + https://github.com/dotnet/coreclr + cea2bba3c295c5280d01900f7ae5492951ad8995 - - https://github.com/dotnet/runtime - f5437ac095272f1ab5e8ca79960add974fa96f2d + + https://github.com/dotnet/coreclr + cea2bba3c295c5280d01900f7ae5492951ad8995 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 - - https://github.com/dotnet/runtime - dcc9f626eeb0751d4ba4499f623aac42d2e95c10 + + https://github.com/dotnet/corefx + 898d47b4df506e30e54605a3a5c9fdec44f74916 https://github.com/dotnet/standard diff --git a/eng/Versions.props b/eng/Versions.props index 4e871c503c27a..56e528056b5ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,59 +33,58 @@ 5.0.0-beta.19531.4 - 5.0.0-beta.19531.4 + $(MicrosoftDotNetApiCompatPackageVersion) 2.2.0-beta.19463.3 5.0.0-beta.19531.4 5.0.0-beta.19531.4 5.0.0-beta.19531.4 5.0.0-beta.19531.4 2.5.1-beta.19531.4 - 2.5.1-beta.19463.3 + $(MicrosoftDotNetXUnitConsoleRunnerPackageVersion) 5.0.0-beta.19531.4 - 1.0.0-beta.19463.3 + $(MicrosoftDotNetBuildTasksPackagingPackageVersion) 5.0.0-beta.19531.4 5.0.0-beta.19531.4 - 1.0.0-beta.19463.3 + $(MicrosoftDotNetVersionToolsTasksPackageVersion) - 5.0.0-alpha1.19466.2 - 5.0.0-alpha1.19466.2 - 5.0.0-alpha1.19466.2 - 5.0.0-alpha1.19466.2 + 5.0.0-alpha.1.19531.9 + $(MicrosoftNETCoreAppPackageVersion) + 5.0.0-alpha.1.19531.9 + 5.0.0-alpha.1.19531.9 2.1.0 3.0.0 - 5.0.0-alpha1.19466.3 - 5.0.0-alpha1.19466.3 - 5.0.0-alpha1.19472.2 + 5.0.0-alpha1.19525.1 + 5.0.0-alpha1.19525.1 + 5.0.0-alpha1.19525.1 - 5.0.0-alpha1.19466.8 - 5.0.0-alpha1.19466.8 - 5.0.0-alpha1.19466.8 - 5.0.0-alpha1.19477.7 - 1.0.0-preview7.19326.2 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 - 5.0.0-alpha1.19501.13 + 5.0.0-alpha.1.19531.5 + $(MicrosoftNETCorePlatformsPackageVersion) + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 + 5.0.0-alpha.1.19531.5 2.2.0-prerelease.19531.1 @@ -109,7 +108,7 @@ 4.4.0 4.4.0 - 16.4.0-preview-20191007-01 + 16.3.0 2.4.1 2.0.5 12.0.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index c4ca69dd47cd8..42ca33ac33dce 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -446,10 +446,7 @@ function GetSdkTaskProject([string]$taskName) { } function InitializeNativeTools() { - if ($env:DisableNativeToolsetInstalls) { - return - } - if (Get-Member -InputObject $GlobalJson -Name "native-tools") { + if (-Not (Test-Path variable:DisableNativeToolsetInstalls) -And (Get-Member -InputObject $GlobalJson -Name "native-tools")) { $nativeArgs= @{} if ($ci) { $nativeArgs = @{ diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 35a80c3f12337..6a23ac0a34527 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -4,7 +4,7 @@ # CI mode - set to true on CI server for PR validation build or official build. ci=${ci:-false} -disable_configure_toolset_import=${disable_configure_toolset_import:-null} +disable_configure_toolset_import=${disable_configure_toolset_import:-} # Set to true to use the pipelines logger which will enable Azure logging output. # https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md @@ -273,7 +273,7 @@ function GetNuGetPackageCachePath { } function InitializeNativeTools() { - if [[ -z "${DisableNativeToolsetInstalls:-}" ]]; then + if [[ -n "${DisableNativeToolsetInstalls:-}" ]]; then return fi if grep -Fq "native-tools" $global_json_file @@ -437,7 +437,7 @@ Write-PipelineSetVariable -name "Temp" -value "$temp_dir" Write-PipelineSetVariable -name "TMP" -value "$temp_dir" # Import custom tools configuration, if present in the repo. -if [[ "$disable_configure_toolset_import" != null ]]; then +if [[ -z "$disable_configure_toolset_import" ]]; then configure_toolset_script="$eng_root/configure-toolset.sh" if [[ -a "$configure_toolset_script" ]]; then . "$configure_toolset_script" diff --git a/global.json b/global.json index 1b3fb013fad9e..8fefe7ecb57f6 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ "Microsoft.DotNet.Build.Tasks.Configuration": "5.0.0-beta.19531.4", "Microsoft.DotNet.CoreFxTesting": "5.0.0-beta.19531.4", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19472.2", + "Microsoft.NET.Sdk.IL": "5.0.0-alpha1.19525.1", "Microsoft.Build.NoTargets": "1.0.53", "Microsoft.Build.Traversal": "2.0.2" } diff --git a/src/libraries/Native/Unix/gen-buildsys-clang.sh b/src/libraries/Native/Unix/gen-buildsys-clang.sh index 94690b60fe993..d857122579a5a 100755 --- a/src/libraries/Native/Unix/gen-buildsys-clang.sh +++ b/src/libraries/Native/Unix/gen-buildsys-clang.sh @@ -16,7 +16,7 @@ then fi #Set the root directory of the project -project_root="$1"/../../.. +project_root="$1"/../../../.. # Set up the environment to be used for building with clang. if which "clang-$2.$3" > /dev/null 2>&1 diff --git a/src/libraries/Native/Windows/clrcompression/CMakeLists.txt b/src/libraries/Native/Windows/clrcompression/CMakeLists.txt index a3079aa3c71f4..a0356879a6e93 100644 --- a/src/libraries/Native/Windows/clrcompression/CMakeLists.txt +++ b/src/libraries/Native/Windows/clrcompression/CMakeLists.txt @@ -84,7 +84,7 @@ add_library(clrcompression SHARED ${NATIVECOMPRESSION_SOURCES} # This will add versioning to the library - ${CMAKE_SOURCE_DIR}/../../../artifacts/obj/NativeVersion.rc + ${CMAKE_SOURCE_DIR}/../../../../artifacts/obj/NativeVersion.rc ) # Allow specification of arguments that should be passed to the linker diff --git a/src/libraries/Native/build-native.cmd b/src/libraries/Native/build-native.cmd index b90797f9f5279..4240235f3166a 100644 --- a/src/libraries/Native/build-native.cmd +++ b/src/libraries/Native/build-native.cmd @@ -4,7 +4,7 @@ setlocal :SetupArgs :: Initialize the args that will be passed to cmake set __nativeWindowsDir=%~dp0\Windows -set __artifactsDir=%~dp0..\..\artifacts +set __artifactsDir=%~dp0..\..\..\artifacts set __rootDir=%~dp0..\.. set __CMakeBinDir="" set __IntermediatesDir="" diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh index 18915724c5169..fdd6fa4d769be 100755 --- a/src/libraries/Native/build-native.sh +++ b/src/libraries/Native/build-native.sh @@ -174,7 +174,7 @@ build_native() __scriptpath=$(cd "$(dirname "$0")"; pwd -P) __nativeroot=$__scriptpath/Unix -__rootRepo="$__scriptpath/../.." +__rootRepo="$__scriptpath/../../.." __artifactsDir="$__rootRepo/artifacts" # Set the various build properties here so that CMake and MSBuild can pick them up diff --git a/tools-local/tasks/installer.tasks/installer.tasks.csproj b/tools-local/tasks/installer.tasks/installer.tasks.csproj index 4af7ac6733b07..02b543d7c14a7 100644 --- a/tools-local/tasks/installer.tasks/installer.tasks.csproj +++ b/tools-local/tasks/installer.tasks/installer.tasks.csproj @@ -2,7 +2,7 @@ netstandard2.0 - $(TargetFrameworks);net46 + $(TargetFrameworks);net46 false