From 8e4f8221ae2a9db22cd3aff9604e49d6de84559f Mon Sep 17 00:00:00 2001 From: Eric Mellino Date: Fri, 12 May 2017 12:33:09 -0700 Subject: [PATCH] Update to Buildtools 2.0, Remove remaining project.json's (dotnet/core-setup#2373) * Exclusively use the 2.0 CLI and 2.0 buildtools. * Fix Linux problems. * Don't run chmod on Windows. * Make sure DOTNET_SKIP_FIRST_TIME_EXPERIENCE is set in init-tools. * Clean up some MSBuild properties * Auto-update WCF dependencies * Delete root-level global.json * Change how dependency versions are specified. Use full versions rather than concatenated strings. * Use "azureedge" download URL in init-tools * Use TargetFramework=netstandard1.0 instead of dnxcore50 in deps.csproj * Link CoreFxVersion to Microsoft.Private.CoreFx.NETCoreApp * Use "DotnetRestoreCommand" instead of "DnuRestoreCommand" in properties. * Check RunningOnUnix in dir.props (recommended pattern) * Change an additional use of DnuSourceList to DotnetSourceList Commit migrated from https://github.com/dotnet/core-setup/commit/50d699be379ae5c85a55efe7b8c3a763f5822e26 --- src/installer/BuildToolsVersion.txt | 2 +- src/installer/DotnetCLISdkVersion.txt | 1 - src/installer/DotnetCLIVersion.txt | 2 +- src/installer/build.proj | 10 +- src/installer/dependencies.props | 28 ++++- src/installer/init-tools.cmd | 48 +------- src/installer/init-tools.msbuild | 11 ++ src/installer/init-tools.sh | 128 ++++----------------- src/installer/managed/dir.proj | 2 +- src/installer/pkg/deps/deps.csproj | 12 ++ src/installer/pkg/deps/project.json | 10 -- src/installer/pkg/dir.targets | 2 +- src/installer/pkg/packaging/deb/package.targets | 12 +- src/installer/pkg/packaging/dir.proj | 2 +- .../src/Microsoft.NETCore.App.depproj | 51 ++++---- .../src/project.json.template | 15 --- ...rosoft.NETCore.UniversalWindowsPlatform.depproj | 57 ++++++--- .../src/packagereferences.msbuild | 9 ++ .../src/project.json.template | 20 ---- src/installer/pkg/projects/dir.props | 4 - src/installer/pkg/projects/dir.targets | 19 --- src/installer/publish/publish.proj | 4 +- src/installer/run.sh | 2 - src/installer/sharedFramework/sharedFramework.proj | 8 +- src/installer/test/dir.proj | 14 +-- src/installer/test/dir.props | 6 +- src/installer/tools-override/Roslyn.Common.props | 25 ---- src/installer/tools-override/crossgen.sh | 90 --------------- .../Microsoft.DotNet.Build.Tasks.Local.builds | 4 +- .../Microsoft.DotNet.Build.Tasks.Local.csproj | 53 ++++++++- .../project.json | 32 ------ tools-local/tasks/core-setup.tasks.builds | 4 +- tools-local/tasks/core-setup.tasks.csproj | 55 +++++++-- tools-local/tasks/project.json | 33 ------ 34 files changed, 281 insertions(+), 494 deletions(-) delete mode 100644 src/installer/DotnetCLISdkVersion.txt create mode 100644 src/installer/init-tools.msbuild create mode 100644 src/installer/pkg/deps/deps.csproj delete mode 100644 src/installer/pkg/deps/project.json delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.App/src/project.json.template create mode 100644 src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/packagereferences.msbuild delete mode 100644 src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/project.json.template delete mode 100644 src/installer/tools-override/Roslyn.Common.props delete mode 100755 src/installer/tools-override/crossgen.sh delete mode 100644 tools-local/Microsoft.DotNet.Build.Tasks.Local/project.json delete mode 100644 tools-local/tasks/project.json diff --git a/src/installer/BuildToolsVersion.txt b/src/installer/BuildToolsVersion.txt index 7f6d39c..d58933b 100644 --- a/src/installer/BuildToolsVersion.txt +++ b/src/installer/BuildToolsVersion.txt @@ -1 +1 @@ -1.0.27-prerelease-01430-03 +2.0.0-prerelease-01611-07 diff --git a/src/installer/DotnetCLISdkVersion.txt b/src/installer/DotnetCLISdkVersion.txt deleted file mode 100644 index ddee305..0000000 --- a/src/installer/DotnetCLISdkVersion.txt +++ /dev/null @@ -1 +0,0 @@ -2.0.0-preview1-005899 \ No newline at end of file diff --git a/src/installer/DotnetCLIVersion.txt b/src/installer/DotnetCLIVersion.txt index e42fc5f..b8320e3 100644 --- a/src/installer/DotnetCLIVersion.txt +++ b/src/installer/DotnetCLIVersion.txt @@ -1 +1 @@ -1.0.0-preview2-1-003182 \ No newline at end of file +2.0.0-preview1-005899 diff --git a/src/installer/build.proj b/src/installer/build.proj index edc82c7..c08c027 100644 --- a/src/installer/build.proj +++ b/src/installer/build.proj @@ -47,7 +47,7 @@ - + - - - - - + @@ -90,4 +86,4 @@ - \ No newline at end of file + diff --git a/src/installer/dependencies.props b/src/installer/dependencies.props index b6966c7..76f7c67 100644 --- a/src/installer/dependencies.props +++ b/src/installer/dependencies.props @@ -12,12 +12,17 @@ f37bb2d81830cefb80a785a2b2ce1bd664ab8a68 a44d1158c8f2cf53d54cf35567f2ec59057b3093 1117fab956560c88ebb3fbaa339b6fa04c29a364 + 284ab8a84d40ad2d42e6f3680ce159aaea82d77d + 4.4.0-preview2-25311-04 2.0.0-preview2-25311-04 2.0.0-preview2-25309-01 $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) + 2.0.0-preview2-25311-01 + 1.4.1 + 4.4.0-preview2-25311-02 @@ -40,6 +45,10 @@ $(BaseDotNetBuildInfo)standard/$(DependencyBranch) $(StandardCurrentRef) + + $(BaseDotNetBuildInfo)wcf/$(DependencyBranch) + $(WCFCurrentRef) + https://raw.githubusercontent.com/dotnet/versions @@ -47,6 +56,11 @@ $(MSBuildThisFileFullPath) + CoreFxVersion + Microsoft.Private.CoreFx.NETCoreApp + + + $(MSBuildThisFileFullPath) PlatformPackageVersion Microsoft.NETCore.Platforms @@ -55,9 +69,15 @@ MicrosoftNETCoreRuntimeCoreCLRPackageVersion Microsoft.NETCore.Runtime.CoreCLR - - - - + + $(MSBuildThisFileFullPath) + NETStandardVersion + NETStandard.Library + + + $(MSBuildThisFileFullPath) + WcfVersion + System.ServiceModel.Duplex + diff --git a/src/installer/init-tools.cmd b/src/installer/init-tools.cmd index 1a63028..40fca03 100644 --- a/src/installer/init-tools.cmd +++ b/src/installer/init-tools.cmd @@ -6,16 +6,11 @@ if [%PACKAGES_DIR%]==[] set PACKAGES_DIR=%~dp0packages\ if [%TOOLRUNTIME_DIR%]==[] set TOOLRUNTIME_DIR=%~dp0Tools set DOTNET_PATH=%TOOLRUNTIME_DIR%\dotnetcli\ if [%DOTNET_CMD%]==[] set DOTNET_CMD=%DOTNET_PATH%dotnet.exe -set DOTNET_SDK_PATH=%TOOLRUNTIME_DIR%\dotnetclisdk\ -if [%DOTNET_SDK_CMD%]==[] set DOTNET_SDK_CMD=%DOTNET_SDK_PATH%dotnet.exe if [%BUILDTOOLS_SOURCE%]==[] set BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json set /P BUILDTOOLS_VERSION=< "%~dp0BuildToolsVersion.txt" set BUILD_TOOLS_PATH=%PACKAGES_DIR%Microsoft.DotNet.BuildTools\%BUILDTOOLS_VERSION%\lib\ -set PROJECT_JSON_PATH=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION% -set PROJECT_JSON_FILE=%PROJECT_JSON_PATH%\project.json -set PROJECT_JSON_CONTENTS={ "dependencies": { "Microsoft.DotNet.BuildTools": "%BUILDTOOLS_VERSION%" }, "frameworks": { "netcoreapp1.0": { } } } -set BUILD_TOOLS_SEMAPHORE=%PROJECT_JSON_PATH%\init-tools.completed -set DUMMY_GLOBAL_JSON_PATH=%PACKAGES_DIR%global.json +set INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild +set BUILD_TOOLS_SEMAPHORE=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION%\init-tools.completed :: We do not want to run the first-time experience. set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 @@ -34,21 +29,15 @@ if exist "%BUILD_TOOLS_SEMAPHORE%" ( if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" -if NOT exist "%PROJECT_JSON_PATH%" mkdir "%PROJECT_JSON_PATH%" -echo %PROJECT_JSON_CONTENTS% > "%PROJECT_JSON_FILE%" echo Running %0 > "%INIT_TOOLS_LOG%" set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" if exist "%DOTNET_CMD%" goto :afterdotnetinstall -:: core-setup repo has a global.json which causes a conflict with the init-tools publish step -if NOT exist "%PACKAGES_DIR%" mkdir %PACKAGES_DIR% > nul 2>&1 -echo { "projects": [] } > %DUMMY_GLOBAL_JSON_PATH% - echo Installing dotnet cli... if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_VERSION%.zip -set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/preview/Binaries/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% +set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_VERSION%/%DOTNET_ZIP_NAME% set DOTNET_LOCAL_PATH=%DOTNET_PATH%%DOTNET_ZIP_NAME% echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" @@ -59,27 +48,10 @@ if NOT exist "%DOTNET_LOCAL_PATH%" ( :afterdotnetinstall -if exist "%DOTNET_SDK_CMD%" goto :afterdotnetsdkinstall - -echo Installing dotnet sdk... -set /p DOTNET_SDK_VERSION=< "%~dp0DotnetCLISdkVersion.txt" -if NOT exist "%DOTNET_SDK_PATH%" mkdir "%DOTNET_SDK_PATH%" -set DOTNET_ZIP_NAME=dotnet-dev-win-x64.%DOTNET_SDK_VERSION%.zip -set DOTNET_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Sdk/%DOTNET_SDK_VERSION%/%DOTNET_ZIP_NAME% -set DOTNET_LOCAL_PATH=%DOTNET_SDK_PATH%%DOTNET_ZIP_NAME% -echo Installing '%DOTNET_REMOTE_PATH%' to '%DOTNET_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" -powershell -NoProfile -ExecutionPolicy unrestricted -Command "$retryCount = 0; $success = $false; do { try { (New-Object Net.WebClient).DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $retryCount++; Start-Sleep -Seconds (5 * $retryCount); } } } while ($success -eq $false); Add-Type -Assembly 'System.IO.Compression.FileSystem' -ErrorVariable AddTypeErrors; if ($AddTypeErrors.Count -eq 0) { [System.IO.Compression.ZipFile]::ExtractToDirectory('%DOTNET_LOCAL_PATH%', '%DOTNET_SDK_PATH%') } else { (New-Object -com shell.application).namespace('%DOTNET_SDK_PATH%').CopyHere((new-object -com shell.application).namespace('%DOTNET_LOCAL_PATH%').Items(),16) }" >> "%INIT_TOOLS_LOG%" -if NOT exist "%DOTNET_LOCAL_PATH%" ( - echo ERROR: Could not install dotnet cli correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 - exit /b 1 -) - -:afterdotnetsdkinstall - if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore echo Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo Running: "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" -call "%DOTNET_CMD%" restore "%PROJECT_JSON_FILE%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" >> "%INIT_TOOLS_LOG%" +echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" +call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages %PACKAGES_DIR% --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% >> "%INIT_TOOLS_LOG%" if NOT exist "%BUILD_TOOLS_PATH%init-tools.cmd" ( echo ERROR: Could not restore build tools correctly. See '%INIT_TOOLS_LOG%' for more details. 1>&2 exit /b 1 @@ -96,16 +68,6 @@ if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( exit /b %INIT_TOOLS_ERRORLEVEL% ) -echo Updating CLI NuGet Frameworks map... -robocopy "%TOOLRUNTIME_DIR%" "%TOOLRUNTIME_DIR%\dotnetcli\sdk\%DOTNET_VERSION%" NuGet.Frameworks.dll /XO >> "%INIT_TOOLS_LOG%" -set UPDATE_CLI_ERRORLEVEL=%ERRORLEVEL% -if %UPDATE_CLI_ERRORLEVEL% GTR 1 ( - echo ERROR: Failed to update Nuget for CLI {Error level %UPDATE_CLI_ERRORLEVEL%}. Please check '%INIT_TOOLS_LOG%' for more details. 1>&2 - exit /b %UPDATE_CLI_ERRORLEVEL% -) - -if exist %~dp0tools-override xcopy /Y/e/s %~dp0tools-override\* %TOOLRUNTIME_DIR% - :: Create sempahore file echo Done initializing tools. echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" diff --git a/src/installer/init-tools.msbuild b/src/installer/init-tools.msbuild new file mode 100644 index 0000000..1ec33f6 --- /dev/null +++ b/src/installer/init-tools.msbuild @@ -0,0 +1,11 @@ + + + netcoreapp1.0 + false + true + $(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion) + + + + + \ No newline at end of file diff --git a/src/installer/init-tools.sh b/src/installer/init-tools.sh index f26035e..ddb8b75 100755 --- a/src/installer/init-tools.sh +++ b/src/installer/init-tools.sh @@ -6,74 +6,18 @@ __PACKAGES_DIR=$__scriptpath/packages __TOOLRUNTIME_DIR=$__scriptpath/Tools __DOTNET_PATH=$__TOOLRUNTIME_DIR/dotnetcli __DOTNET_CMD=$__DOTNET_PATH/dotnet -__DOTNET_SDK_PATH=$__TOOLRUNTIME_DIR/dotnetclisdk -__DOTNET_SDK_CMD=$__DOTNET_SDK_PATH/dotnet if [ -z "$__BUILDTOOLS_SOURCE" ]; then __BUILDTOOLS_SOURCE=https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json; fi +export __BUILDTOOLS_USE_CSPROJ=true __BUILD_TOOLS_PACKAGE_VERSION=$(cat $__scriptpath/BuildToolsVersion.txt) __DOTNET_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLIVersion.txt) -__DOTNET_SDK_TOOLS_VERSION=$(cat $__scriptpath/DotnetCLISdkVersion.txt) -__BUILD_TOOLS_PATH=$__PACKAGES_DIR/Microsoft.DotNet.BuildTools/$__BUILD_TOOLS_PACKAGE_VERSION/lib -__PROJECT_JSON_PATH=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION -__PROJECT_JSON_FILE=$__PROJECT_JSON_PATH/project.json -__PROJECT_JSON_CONTENTS="{ \"dependencies\": { \"Microsoft.DotNet.BuildTools\": \"$__BUILD_TOOLS_PACKAGE_VERSION\" }, \"frameworks\": { \"netcoreapp1.0\": { } } }" -__INIT_TOOLS_DONE_MARKER=$__PROJECT_JSON_PATH/done -__DUMMY_GLOBAL_JSON_PATH=$__PACKAGES_DIR/global.json +__BUILD_TOOLS_PATH=$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib +__INIT_TOOLS_RESTORE_PROJECT=$__scriptpath/init-tools.msbuild +__INIT_TOOLS_DONE_MARKER_DIR=$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION +__INIT_TOOLS_DONE_MARKER=$__INIT_TOOLS_DONE_MARKER_DIR/done # We do not want to run the first-time experience. export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 -# Extended version of platform detection logic from dotnet/cli/scripts/obtain/dotnet-install.sh 16692fc -get_current_linux_name() { - # Detect Distro - if [ "$(cat /etc/*-release | grep -cim1 ubuntu)" -eq 1 ]; then - if [ "$(cat /etc/*-release | grep -cim1 16.04)" -eq 1 ]; then - echo "ubuntu.16.04" - return 0 - fi - if [ "$(cat /etc/*-release | grep -cim1 16.10)" -eq 1 ]; then - echo "ubuntu.16.10" - return 0 - fi - - echo "ubuntu" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then - echo "centos" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 rhel)" -eq 1 ]; then - echo "rhel" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 debian)" -eq 1 ]; then - echo "debian" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 alpine)" -eq 1 ]; then - echo "alpine" - return 0 - elif [ "$(cat /etc/*-release | grep -cim1 fedora)" -eq 1 ]; then - if [ "$(cat /etc/*-release | grep -cim1 23)" -eq 1 ]; then - echo "fedora.23" - return 0 - fi - if [ "$(cat /etc/*-release | grep -cim1 24)" -eq 1 ]; then - echo "fedora.24" - return 0 - fi - elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then - if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then - echo "opensuse.13.2" - return 0 - fi - if [ "$(cat /etc/*-release | grep -cim1 42.1)" -eq 1 ]; then - echo "opensuse.42.1" - return 0 - fi - fi - - # Cannot determine Linux distribution, assuming Ubuntu 14.04. - echo "ubuntu" - return 0 -} - if [ -z "$__DOTNET_PKG" ]; then if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then echo "Warning: build not supported on 32 bit Unix" @@ -87,14 +31,14 @@ OSName=$(uname -s) ;; Linux) - __DOTNET_PKG="dotnet-dev-$(get_current_linux_name)-x64" + __DOTNET_PKG=dotnet-dev-linux-x64 OS=Linux ;; *) - echo "Unsupported OS '$OSName' detected. Downloading ubuntu-x64 tools." + echo "Unsupported OS '$OSName' detected. Downloading linux-x64 tools." OS=Linux - __DOTNET_PKG=dotnet-dev-ubuntu-x64 + __DOTNET_PKG=dotnet-dev-linux-x64 ;; esac fi @@ -105,12 +49,6 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then if [ -e $__TOOLRUNTIME_DIR ]; then rm -rf -- $__TOOLRUNTIME_DIR; fi echo "Running: $__scriptpath/init-tools.sh" > $__init_tools_log - # core-setup repo has a global.json which causes a conflict with the init-tools publish step - if [ ! -e $__PACKAGES_DIR ]; then - mkdir -p $__PACKAGES_DIR - fi - echo '{ "projects": [] }' > $__DUMMY_GLOBAL_JSON_PATH - if [ ! -e $__DOTNET_PATH ]; then mkdir -p "$__DOTNET_PATH" @@ -123,7 +61,7 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then cp -r $DOTNET_TOOL_DIR/* $__DOTNET_PATH else echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/preview/Binaries/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" + __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_TOOLS_VERSION}.tar.gz" # curl has HTTPS CA trust-issues less often than wget, so lets try that first. echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" >> $__init_tools_log which curl > /dev/null 2> /dev/null @@ -141,25 +79,6 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi fi - if [ ! -e $__DOTNET_SDK_PATH ]; then - - mkdir -p "$__DOTNET_SDK_PATH" - - echo "Installing dotnet cli..." - __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_SDK_TOOLS_VERSION}/${__DOTNET_PKG}.${__DOTNET_SDK_TOOLS_VERSION}.tar.gz" - # curl has HTTPS CA trust-issues less often than wget, so lets try that first. - echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_SDK_PATH/dotnet.tar'" >> $__init_tools_log - which curl > /dev/null 2> /dev/null - if [ $? -ne 0 ]; then - wget -q -O $__DOTNET_SDK_PATH/dotnet.tar ${__DOTNET_LOCATION} - else - curl --retry 10 -sSL --create-dirs -o $__DOTNET_SDK_PATH/dotnet.tar ${__DOTNET_LOCATION} - fi - cd $__DOTNET_SDK_PATH - tar -xf $__DOTNET_SDK_PATH/dotnet.tar - - cd $__scriptpath - fi if [ -n "$BUILD_TOOLS_TOOLSET_DIR" ] && [ -d "$BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION" ]; then echo "Copying $BUILD_TOOLS_TOOLSET_DIR/$__BUILD_TOOLS_PACKAGE_VERSION to $__TOOLRUNTIME_DIR" >> $__init_tools_log @@ -168,18 +87,18 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then echo "Copying $BUILD_TOOLS_TOOL_DIR to $__TOOLRUNTIME_DIR" >> $__init_tools_log cp -r $BUILD_TOOLS_TOOL_DIR/* $__TOOLRUNTIME_DIR else - if [ ! -d "$__PROJECT_JSON_PATH" ]; then mkdir "$__PROJECT_JSON_PATH"; fi - echo $__PROJECT_JSON_CONTENTS > "$__PROJECT_JSON_FILE" - if [ ! -e $__BUILD_TOOLS_PATH ]; then echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__PROJECT_JSON_FILE\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE" >> $__init_tools_log - $__DOTNET_CMD restore "$__PROJECT_JSON_FILE" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE >> $__init_tools_log + echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION" >> $__init_tools_log + $__DOTNET_CMD restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION >> $__init_tools_log if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then echo "ERROR: Could not restore build tools correctly. See '$__init_tools_log' for more details."1>&2; fi fi echo "Initializing BuildTools..." echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR" >> $__init_tools_log + + # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + chmod +x $__BUILD_TOOLS_PATH/init-tools.sh $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR >> $__init_tools_log if [ "$?" != "0" ]; then echo "ERROR: An error occured when trying to initialize the tools. Please check '$__init_tools_log' for more details."1>&2 @@ -187,21 +106,14 @@ if [ ! -e $__INIT_TOOLS_DONE_MARKER ]; then fi fi - if [ $__PATCH_CLI_NUGET_FRAMEWORKS -eq 1 ]; then - echo "Updating CLI NuGet Frameworks map..." - cp $__TOOLRUNTIME_DIR/NuGet.Frameworks.dll $__TOOLRUNTIME_DIR/dotnetcli/sdk/$__DOTNET_TOOLS_VERSION >> $__init_tools_log - if [ "$?" != "0" ]; then - echo "ERROR: An error occured when updating Nuget for CLI . Please check '$__init_tools_log' for more details."1>&2 - exit 1 - fi - fi - - if [ -e $__scriptpath/tools-override/crossgen.sh ]; then - $__scriptpath/tools-override/crossgen.sh $__scriptpath/Tools - fi + echo "Making all .sh files executable under Tools." + # Executables restored with .NET Core 2.0 do not have executable permission flags. https://github.com/NuGet/Home/issues/4424 + ls $__scriptpath/Tools/*.sh | xargs chmod +x + ls $__scriptpath/Tools/scripts/docker/*.sh | xargs chmod +x - cp -fR $__scriptpath/tools-override/* $__TOOLRUNTIME_DIR + Tools/crossgen.sh $__scriptpath/Tools + mkdir -p $__INIT_TOOLS_DONE_MARKER_DIR touch $__INIT_TOOLS_DONE_MARKER echo "Done initializing tools." diff --git a/src/installer/managed/dir.proj b/src/installer/managed/dir.proj index 519e825..ced354b 100644 --- a/src/installer/managed/dir.proj +++ b/src/installer/managed/dir.proj @@ -15,7 +15,7 @@ - diff --git a/src/installer/pkg/deps/deps.csproj b/src/installer/pkg/deps/deps.csproj new file mode 100644 index 0000000..a901013 --- /dev/null +++ b/src/installer/pkg/deps/deps.csproj @@ -0,0 +1,12 @@ + + + + + netstandard1.0 + + + + + + + diff --git a/src/installer/pkg/deps/project.json b/src/installer/pkg/deps/project.json deleted file mode 100644 index 1a3c19d..0000000 --- a/src/installer/pkg/deps/project.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25311-04" - }, - "frameworks": { - "dnxcore50": { - "imports": "portable-net45+win8" - } - } -} diff --git a/src/installer/pkg/dir.targets b/src/installer/pkg/dir.targets index 03b490b..b785ba5 100644 --- a/src/installer/pkg/dir.targets +++ b/src/installer/pkg/dir.targets @@ -2,6 +2,6 @@ - $(ProjectDir)packages\$(PlatformPackageId)\$(PlatformPackageVersion)\runtime.json + $(ProjectDir)packages\$(PlatformPackageId.ToLowerInvariant())\$(PlatformPackageVersion)\runtime.json diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets index 5aa7899..20626a5 100644 --- a/src/installer/pkg/packaging/deb/package.targets +++ b/src/installer/pkg/packaging/deb/package.targets @@ -12,8 +12,8 @@ - - + + - @@ -99,7 +99,7 @@ DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)" ReplacementItems="@(SharedHostTokenValue)" /> - @@ -175,7 +175,7 @@ DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)" ReplacementItems="@(HostFxrTokenValue)" /> - @@ -254,7 +254,7 @@ DestinationFile="$(debLayoutDirectory)$(DebianConfigJsonName)" ReplacementItems="@(SharedFrameworkTokenValue)" /> - diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj index b4a5046..1e5c30c 100644 --- a/src/installer/pkg/packaging/dir.proj +++ b/src/installer/pkg/packaging/dir.proj @@ -170,7 +170,7 @@ --version-suffix $(VersionSuffix) - diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj index 240b86c..96fcb03 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj @@ -8,13 +8,36 @@ null-refs when this isn't set and an analyzer is in the packages --> unused .NETCoreApp,Version=v2.0 + netcoreapp2.0 netcoreapp2.0 Microsoft.Private.CoreFx.NETCoreApp $(CrossGenRootPath)/$(MSBuildProjectName)/$(NuGetRuntimeIdentifier) + true + true + true + $(IntermediateOutputPath)$(NuGetRuntimeIdentifier) + $(IntermediateOutputPath) + /p:HasRuntimePackages=false /p:IntermediateOutputPath=$(IntermediateOutputPath) + - + + $(CoreFxVersion) + + + $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) + + + $(DiaSymReaderNativeVersion) + + + $(PlatformPackageVersion) + + + $(NETStandardVersion) + + @@ -43,7 +66,7 @@ <_runtimePackageId>%(_runtimeCLR.NuGetPackageId) <_runtimePackageVersion>%(_runtimeCLR.NuGetPackageVersion) - <_runtimePackagePath>$(PackagesDir)/$(_runtimePackageId)/$(_runtimePackageVersion) + <_runtimePackagePath>$(PackagesDir)/$(_runtimePackageId.ToLowerInvariant())/$(_runtimePackageVersion) <_crossGenPath>$(_runtimePackagePath)/tools$(_crossDir)/crossgen$(ApplicationFileExtension) <_runtimeDirectory>%(_runtimeCLR.RootDir)%(_runtimeCLR.Directory) @@ -56,7 +79,7 @@ <_jitPackageId>%(_runtimeJIT.NuGetPackageId) <_jitPackageVersion>%(_runtimeJIT.NuGetPackageVersion) - <_jitPackagePath>$(PackagesDir)/$(_jitPackageId)/$(_jitPackageVersion) + <_jitPackagePath>$(PackagesDir)/$(_jitPackageId.ToLowerInvariant())/$(_jitPackageVersion) <_jitPath>%(_runtimeJIT.FullPath) <_jitPath Condition="'$(_crossDir)' != ''">$(_jitPackagePath)/runtimes$(_crossDir)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension) @@ -78,7 +101,7 @@ - $(PackagesDir)%(Reference.NuGetPackageId)/%(Reference.NuGetPackageVersion)/version.txt + $(PackagesDir)$([System.String]::new('%(Reference.NuGetPackageId)').ToLowerInvariant())/%(Reference.NuGetPackageVersion)/version.txt $(_runtimePackagePath)/version.txt @@ -178,6 +201,9 @@ <_crossGenIntermediatePath>$(IntermediateOutputPath)/crossgen + + <_filesToCrossGen Include="@(FilesToPackage)" Condition="'%(FilesToPackage.IsNative)' != 'true' AND '%(FileName)' != 'System.Private.CoreLib' AND '%(FileName)' != 'mscorlib' AND '%(Extension)' == '.dll'"> @@ -232,24 +258,9 @@ - - - - - - - $([System.Text.RegularExpressions.Regex]::Match('%(Identity)', '(\w[^:"]*)')) - $([System.Text.RegularExpressions.Regex]::Match('%(Identity)', '(\d+\.\d+.\d+[^"]*)')) - - - - %(PackageMatch.PackageVersion) - - - <_DependenciesToPackageWithVersion Include="@(ReferencedPackage)" Condition="'@(ReferencedPackage)' == '@(DependenciesToPackage)' AND '%(Identity)' != ''"> + <_DependenciesToPackageWithVersion Include="@(PackageReference)" Condition="'@(PackageReference)' == '@(DependenciesToPackage)' AND '%(Identity)' != ''"> $(PackageTargetFramework) diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/src/project.json.template b/src/installer/pkg/projects/Microsoft.NETCore.App/src/project.json.template deleted file mode 100644 index 35080bb..0000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.App/src/project.json.template +++ /dev/null @@ -1,15 +0,0 @@ -{ - "dependencies": { - "Microsoft.Private.CoreFx.NETCoreApp": "4.4.0-preview2-25311-04", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25309-01", - "Microsoft.DiaSymReader.Native": "1.4.1", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25311-04", - "NETStandard.Library": "2.0.0-preview2-25311-01" - }, - "frameworks": { - "netcoreapp2.0": {} - }, - "runtimes": { - "{RID}": {} - } -} diff --git a/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj b/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj index 4a6de09..aff8aa3 100644 --- a/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj +++ b/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/Microsoft.NETCore.UniversalWindowsPlatform.depproj @@ -8,12 +8,50 @@ null-refs when this isn't set and an analyzer is in the packages --> unused UAP,Version=v10.1 + uap10.1 uap10.1 Microsoft.Private.CoreFx.UAP + true + true + true + $(IntermediateOutputPath)$(NuGetRuntimeIdentifier) + $(IntermediateOutputPath) + /p:HasRuntimePackages=false /p:IntermediateOutputPath=$(IntermediateOutputPath) + - + + 1.6.1 + + + $(CoreFxVersion) + + + $(MicrosoftNETCoreRuntimeCoreCLRPackageVersion) + + + $(PlatformPackageVersion) + + + $(NETStandardVersion) + + + $(WcfVersion) + + + $(WcfVersion) + + + $(WcfVersion) + + + $(WcfVersion) + + + $(WcfVersion) + + - - - - - - $([System.Text.RegularExpressions.Regex]::Match('%(Identity)', '(\w[^:"]*)')) - $([System.Text.RegularExpressions.Regex]::Match('%(Identity)', '(\d+\.\d+.\d+[^"]*)')) - - - - %(PackageMatch.PackageVersion) - - - <_DependenciesToPackageWithVersion Include="@(ReferencedPackage)" Condition="'@(ReferencedPackage)' == '@(DependenciesToPackage)' AND '%(Identity)' != ''"> + <_DependenciesToPackageWithVersion Include="@(PackageReference)" Condition="'@(PackageReference)' == '@(DependenciesToPackage)' AND '%(Identity)' != ''"> $(PackageTargetFramework) diff --git a/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/packagereferences.msbuild b/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/packagereferences.msbuild new file mode 100644 index 0000000..2dac326 --- /dev/null +++ b/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/packagereferences.msbuild @@ -0,0 +1,9 @@ + + + + + true + uap10.1 + $(RestoreOutputPath) + + diff --git a/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/project.json.template b/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/project.json.template deleted file mode 100644 index 74c06af..0000000 --- a/src/installer/pkg/projects/Microsoft.NETCore.UniversalWindowsPlatform/src/project.json.template +++ /dev/null @@ -1,20 +0,0 @@ -{ - "dependencies": { - "Microsoft.Net.Native.Compiler": "1.6.1", - "Microsoft.Private.CoreFx.UAP": "4.4.0-preview2-25311-04", - "transport.Microsoft.NETCore.Runtime.CoreCLR": "2.0.0-preview2-25309-01", - "Microsoft.NETCore.Platforms": "2.0.0-preview2-25311-04", - "NETStandard.Library": "2.0.0-preview2-25311-01", - "System.ServiceModel.Duplex": "4.4.0-beta-25205-01", - "System.ServiceModel.Http": "4.4.0-beta-25205-01", - "System.ServiceModel.NetTcp": "4.4.0-beta-25205-01", - "System.ServiceModel.Primitives": "4.4.0-beta-25205-01", - "System.ServiceModel.Security": "4.4.0-beta-25205-01" - }, - "frameworks": { - "uap10.1": {} - }, - "runtimes": { - "{RID}": {} - } -} diff --git a/src/installer/pkg/projects/dir.props b/src/installer/pkg/projects/dir.props index 1877174..139a6cb 100644 --- a/src/installer/pkg/projects/dir.props +++ b/src/installer/pkg/projects/dir.props @@ -6,10 +6,6 @@ obj/$(Configuration)/ $(IntermediateOutputPath)$(NuGetRuntimeIdentifier)/ - $(MSBuildThisProjectDirectory)project.json.template - $(IntermediateOutputPath)project.json - $(IntermediateOutputPath)project.lock.json - true $(PackageOutputPath) diff --git a/src/installer/pkg/projects/dir.targets b/src/installer/pkg/projects/dir.targets index f2ae3cd..768d9b2 100644 --- a/src/installer/pkg/projects/dir.targets +++ b/src/installer/pkg/projects/dir.targets @@ -6,25 +6,6 @@ true - - - - - - - - - diff --git a/src/installer/publish/publish.proj b/src/installer/publish/publish.proj index d5d586f..a1fa021 100644 --- a/src/installer/publish/publish.proj +++ b/src/installer/publish/publish.proj @@ -121,8 +121,8 @@ - $(DnuRestorePrefix)$(DotnetSdkToolCommand) nuget push --source $(NuGetFeedUrl) --api-key $(NuGetApiKey) --timeout $(NuGetPushTimeoutSeconds) - $(DnuRestorePrefix)$(DotnetSdkToolCommand) nuget push --source $(NuGetSymbolsFeedUrl) --api-key $(NuGetApiKey) --timeout $(NuGetPushTimeoutSeconds) + $(DnuRestorePrefix)$(DotnetToolCommand) nuget push --source $(NuGetFeedUrl) --api-key $(NuGetApiKey) --timeout $(NuGetPushTimeoutSeconds) + $(DnuRestorePrefix)$(DotnetToolCommand) nuget push --source $(NuGetSymbolsFeedUrl) --api-key $(NuGetApiKey) --timeout $(NuGetPushTimeoutSeconds) diff --git a/src/installer/run.sh b/src/installer/run.sh index f01c284..9b68d2d 100755 --- a/src/installer/run.sh +++ b/src/installer/run.sh @@ -15,8 +15,6 @@ $__scriptpath/init-tools.sh __dotnet=$__toolsLocalPath/dotnetcli/dotnet -cp -fR $__scriptpath/tools-override/* $__toolsLocalPath - # We do not want to run the first-time experience. export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 $__dotnet $__toolsLocalPath/run.exe $* diff --git a/src/installer/sharedFramework/sharedFramework.proj b/src/installer/sharedFramework/sharedFramework.proj index f1c70e9..6ceba20 100644 --- a/src/installer/sharedFramework/sharedFramework.proj +++ b/src/installer/sharedFramework/sharedFramework.proj @@ -28,11 +28,11 @@ - - @@ -136,11 +136,11 @@ - - diff --git a/src/installer/test/dir.proj b/src/installer/test/dir.proj index 98b8dbc..c8f6c35 100644 --- a/src/installer/test/dir.proj +++ b/src/installer/test/dir.proj @@ -46,13 +46,13 @@ @(RestoreTestSource->'--source %(Identity)', ' ') $(RestoreSourceArg) @(RestoreTestFallbackSource->'--source %(Identity)', ' ') - --disable-parallel --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(RestoreSourceArg) + --disable-parallel --packages "$(PackagesDir.TrimEnd('/').TrimEnd('\'))" $(RestoreSourceArg) $(RestoreArgs) /p:MNAVersion=$(ProductVersion) /p:TestTargetRid=$(TestTargetRid) DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - + - + EnvironmentVariables="NUGET_PACKAGES=$(PackagesDir.TrimEnd('/').TrimEnd('\'))" /> true $(TestsOutputDir)$(TestProjectFilename)-testResults.trx - - + - + - \ No newline at end of file + diff --git a/src/installer/tools-override/Roslyn.Common.props b/src/installer/tools-override/Roslyn.Common.props deleted file mode 100644 index 392ff34..0000000 --- a/src/installer/tools-override/Roslyn.Common.props +++ /dev/null @@ -1,25 +0,0 @@ - - - - 2.0.0-rc - Microsoft.Net.Compilers - $(ToolRuntimePath) - - - - $(BuildToolsTaskDir)/roslyn/build/Microsoft.Net.Compilers.props - - - - - $(PackagesDir)/$(RoslynPackageName).$(RoslynVersion)/ - $(RoslynPackageDir)build/$(RoslynPackageName).props - - - Portable - - \ No newline at end of file diff --git a/src/installer/tools-override/crossgen.sh b/src/installer/tools-override/crossgen.sh deleted file mode 100755 index 880c43a..0000000 --- a/src/installer/tools-override/crossgen.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/usr/bin/env bash - -# Restores crossgen and runs it on all tools components. - -__CoreClrVersion=1.1.0 - -usage() -{ - echo "crossgen.sh " - echo " Restores crossgen and runs it on all assemblies in ." - exit 0 -} - -restore_crossgen() -{ - __crossgen=$__sharedFxDir/crossgen - if [ -e $__crossgen ]; then - return - fi - - __pjDir=$__toolsDir/crossgen - mkdir -p $__pjDir - echo "{\"frameworks\":{\"netcoreapp1.1\":{\"dependencies\":{\"Microsoft.NETCore.Runtime.CoreCLR\":\"$__CoreClrVersion\", \"Microsoft.NETCore.Platforms\": \"$__CoreClrVersion\"}}},\"runtimes\":{\"$__rid\":{}}}" > "$__pjDir/project.json" - $__dotnet restore $__pjDir/project.json --packages $__packagesDir - __crossgenInPackage=$__packagesDir/runtime.$__packageRid.Microsoft.NETCore.Runtime.CoreCLR/$__CoreClrVersion/tools/crossgen - if [ ! -e $__crossgenInPackage ]; then - echo "The crossgen executable could not be found at "$__crossgenInPackage". Aborting crossgen.sh." - exit 1 - fi - cp $__crossgenInPackage $__sharedFxDir - __crossgen=$__sharedFxDir/crossgen -} - -crossgen_everything() -{ - echo "Running crossgen on all assemblies in $__targetDir." - for file in $__targetDir/*.{dll,exe} - do - if [ $(basename $file) != "Microsoft.Build.Framework.dll" ]; then - crossgen_single $file & pid=$! - __pids+=" $pid" - fi - done - - trap "kill $__pids 2&> /dev/null" SIGINT - wait $__pids - echo "Crossgen finished." -} - -crossgen_single() -{ - __file=$1 - $__crossgen /Platform_Assemblies_Paths $__toolsDir:$__sharedFxDir /nologo /MissingDependenciesOK $__file > /dev/null - if [ $? -eq 0 ]; then - __outname="${__file/.dll/.ni.dll}" - __outname="${__outname/.exe/.ni.exe}" - echo "$__file -> $__outname" - else - echo "Unable to successfully compile $__file" - fi -} - -if [ ! -z $BUILDTOOLS_SKIP_CROSSGEN ]; then - echo "BUILDTOOLS_SKIP_CROSSGEN is set. Skipping crossgen step." - exit 0 -fi - -if [[ -z "$1" || "$1" == "-?" || "$1" == "--help" || "$1" == "-h" ]]; then - usage -fi - -__targetDir=$1 -__scriptpath=$(cd "$(dirname "$0")"; pwd -P) -__toolsDir=$__scriptpath/../Tools -__dotnet=$__toolsDir/dotnetcli/dotnet -__packagesDir=$__scriptpath/../packages -__sharedFxDir=$__toolsDir/dotnetcli/shared/Microsoft.NETCore.App/$__CoreClrVersion/ -__rid=$($__dotnet --info | sed -n -e 's/^.*RID:[[:space:]]*//p') - -if [[ $__rid == *"osx"* ]]; then - __packageRid="osx.10.10-x64" -elif [[ $__rid == *"rhel.7"* || $__rid == *"centos.7"* ]]; then - __packageRid="rhel.7-x64" -else - __packageRid=$__rid -fi - -restore_crossgen -crossgen_everything -exit 0 diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds index 91d4a13..d09375c 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds @@ -2,7 +2,9 @@ - + + TargetGroup=netstandard1.5 + TargetGroup=net45 diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj index ccc8fba..7981e64 100644 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj +++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.csproj @@ -4,19 +4,41 @@ Library .NETStandard,Version=v1.5 - .NETFramework,Version=v4.5 + netstandard1.5 + .NETFramework,Version=v4.5.1 + net451 false {B507BED2-0A28-456A-99C6-AD7AA148E35F} $(LocalToolRuntimePath) - $(IntermediateOutputPath)\net45 $(LocalToolRuntimePath)\net46 + $(BaseIntermediateOutputPath)tools-local/$(MSBuildProjectName)/$(TargetGroup) + dnxcore50;portable-net45+win8+wpa81 + true + .NETStandard + $(IntermediateOutputPath) + true + true + + + 1.2.0-beta-001090 + + + 1.3.0 + + + 9.0.1 + + + + 1.0.1 + @@ -27,8 +49,29 @@ - - + + + 0.1.0-preview-00022 + + + 0.1.0-preview-00022 + + + 0.1.0-preview-00022 + + + 0.1.0-preview-00022 + + + 4.5.24 + None + + + 1.6.0 + + + 4.0.0 + - \ No newline at end of file + diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/project.json b/tools-local/Microsoft.DotNet.Build.Tasks.Local/project.json deleted file mode 100644 index 67fd805..0000000 --- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "dependencies": { - "Microsoft.DotNet.PlatformAbstractions": "1.2.0-beta-001090", - "System.Reflection.Metadata": "1.3.0", - "Newtonsoft.Json": "9.0.1" - }, - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.Build": "0.1.0-preview-00022", - "Microsoft.Build.Framework": "0.1.0-preview-00022", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", - "Microsoft.Tpl.Dataflow": { - "version": "4.5.24", - "exclude": "all" - }, - "NETStandard.Library": "1.6.0", - "System.Diagnostics.FileVersionInfo": "4.0.0" - }, - "imports": [ - "dnxcore50", - "portable-net45+win8+wpa81" - ] - }, - "net451": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.5.1": "1.0.1" - } - } - } -} diff --git a/tools-local/tasks/core-setup.tasks.builds b/tools-local/tasks/core-setup.tasks.builds index 91d4a13..d09375c 100644 --- a/tools-local/tasks/core-setup.tasks.builds +++ b/tools-local/tasks/core-setup.tasks.builds @@ -2,7 +2,9 @@ - + + TargetGroup=netstandard1.5 + TargetGroup=net45 diff --git a/tools-local/tasks/core-setup.tasks.csproj b/tools-local/tasks/core-setup.tasks.csproj index c9b8d37..b296cb4 100644 --- a/tools-local/tasks/core-setup.tasks.csproj +++ b/tools-local/tasks/core-setup.tasks.csproj @@ -4,30 +4,68 @@ Library .NETStandard,Version=v1.5 - .NETFramework,Version=v4.5 + netstandard1.5 + .NETFramework,Version=v4.5.1 + net451 false {360F25FA-3CD9-4338-B961-A4F3122B88B2} $(LocalToolRuntimePath) - $(IntermediateOutputPath)\net45 $(LocalToolRuntimePath)\net46 - - <_TargetFrameworkDirectories>$(MSBuildThisFileDirectory)/Documentation - <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation + $(BaseIntermediateOutputPath)tools-local/$(MSBuildProjectName)/$(TargetGroup) + dnxcore50;portable-net45+win8+wpa81 + true + .NETStandard + $(IntermediateOutputPath) + true + true + + + 3.5.0 + + + 1.1.1 + + + + 0.1.0-preview-00022 + + + 0.1.0-preview-00022 + + + 0.1.0-preview-00022 + + + 0.1.0-preview-00022 + + + 4.5.24 + None + + + 1.6.0 + + + 4.0.0 + + + 1.0.1 + + @@ -36,13 +74,10 @@ - - - {b507bed2-0a28-456a-99c6-ad7aa148e35f} Microsoft.DotNet.Build.Tasks.Local - \ No newline at end of file + diff --git a/tools-local/tasks/project.json b/tools-local/tasks/project.json deleted file mode 100644 index 6404cb8..0000000 --- a/tools-local/tasks/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "dependencies": { - "System.Reflection.Metadata": "1.3.0", - "Newtonsoft.Json": "9.0.1", - "NuGet.ProjectModel": "3.5.0", - "Microsoft.Extensions.DependencyModel": "1.1.1" - }, - "frameworks": { - "netstandard1.5": { - "dependencies": { - "Microsoft.Build": "0.1.0-preview-00022", - "Microsoft.Build.Framework": "0.1.0-preview-00022", - "Microsoft.Build.Tasks.Core": "0.1.0-preview-00022", - "Microsoft.Build.Utilities.Core": "0.1.0-preview-00022", - "Microsoft.Tpl.Dataflow": { - "version": "4.5.24", - "exclude": "all" - }, - "NETStandard.Library": "1.6.0", - "System.Diagnostics.FileVersionInfo": "4.0.0" - }, - "imports": [ - "dnxcore50", - "portable-net45+win8+wpa81" - ] - }, - "net451": { - "dependencies": { - "Microsoft.TargetingPack.NETFramework.v4.5.1": "1.0.1" - } - } - } -} -- 2.7.4