diff --git a/.gitignore b/.gitignore index cb62c74d37..654e29215f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # Tool Runtime Dir -/[Tt]ools/ /.dotnet/ /.packages/ @@ -228,7 +227,7 @@ ClientBin/ *.publishsettings orleans.codegen.cs -# Including strong name files can present a security risk +# Including strong name files can present a security risk # (https://github.com/github/gitignore/pull/2483#issue-259490424) #*.snk @@ -325,7 +324,7 @@ __pycache__/ # OpenCover UI analysis results OpenCover/ -# Azure Stream Analytics local run output +# Azure Stream Analytics local run output ASALocalRun/ # MSBuild Binary and Structured Log diff --git a/BuildToolsVersion.txt b/BuildToolsVersion.txt deleted file mode 100644 index 61c8d2d4e3..0000000000 --- a/BuildToolsVersion.txt +++ /dev/null @@ -1 +0,0 @@ -3.0.0-preview4-04926-01 diff --git a/DotnetCLIVersion.txt b/DotnetCLIVersion.txt deleted file mode 100644 index 6b0555c8c7..0000000000 --- a/DotnetCLIVersion.txt +++ /dev/null @@ -1 +0,0 @@ -3.1.102 diff --git a/DotnetExtraRuntimeVersion.txt b/DotnetExtraRuntimeVersion.txt deleted file mode 100644 index 30b1cc8834..0000000000 --- a/DotnetExtraRuntimeVersion.txt +++ /dev/null @@ -1 +0,0 @@ -2.1.12 \ No newline at end of file diff --git a/Microsoft.ML.sln b/Microsoft.ML.sln index 8f9ab2dada..4117b5c811 100644 --- a/Microsoft.ML.sln +++ b/Microsoft.ML.sln @@ -43,11 +43,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Parquet", "src EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Sweeper", "src\Microsoft.ML.Sweeper\Microsoft.ML.Sweeper.csproj", "{55C8122D-79EA-48AB-85D0-EB551FC1C427}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{D3D38B03-B557-484D-8348-8BADEE4DF592}" - ProjectSection(SolutionItems) = preProject - pkg\Directory.Build.props = pkg\Directory.Build.props - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.PerformanceTests", "test\Microsoft.ML.PerformanceTests\Microsoft.ML.PerformanceTests.csproj", "{7A9DB75F-2CA5-4184-9EF5-1F17EB39483F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.ML.Maml", "src\Microsoft.ML.Maml\Microsoft.ML.Maml.csproj", "{64F40A0D-D4C2-4AA7-8470-E9CC437827E4}" @@ -1865,7 +1860,6 @@ Global {3DEB504D-7A07-48CE-91A2-8047461CB3D4} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {001F3B4E-FBE4-4001-AFD2-A6A989CD1C25} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {DCF46B79-1FDB-4DBA-A263-D3D64E3AAA27} = {09EADF06-BE25-4228-AB53-95AE3E15B530} - {BF66A305-DF10-47E4-8D81-42049B149D2B} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {B4E55B2D-2A92-46E7-B72F-E76D6FD83440} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E} {3E4ABF07-7970-4BE6-B45B-A13D3C397545} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {7333EDEF-4144-405C-A5EC-6F42201857D8} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} @@ -1888,41 +1882,19 @@ Global {4805129D-78C8-46D4-9519-0AD9B0574D6D} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {DB7CEB5E-8BE6-48A7-87BE-B91D9AE96F71} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {7504D46F-E4B3-43CB-9B1C-82F3131F1C99} = {09EADF06-BE25-4228-AB53-95AE3E15B530} - {63006A14-B924-48C5-83C9-CFE9DA22B01F} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {1229F799-37F0-4282-B9F0-74BFA97CC362} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {DE95FE65-9FF7-4233-93DF-7A8F2805624A} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {4CF8095E-B4A3-4326-A550-43098E447288} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {19AC192B-75FE-45D5-B219-898E401D5904} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {93FF16AA-635E-421D-96C1-008818C143A2} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {320AF46A-4809-486E-8F9E-A00C8AE47751} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {11894B4A-78B4-4523-A6DD-4495722E244F} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {B836F712-7FB6-4B75-A3EB-FB05F8E0D15E} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {B00098E4-771E-41DF-A3AA-A606AAB334B7} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {BD93C0F3-3CED-4BE8-9389-4234250FBFB1} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {8EDFB7E5-7E7E-411D-99C5-7A4895D0F9CB} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {9E689AD4-F908-493C-B882-B1B33E8F7696} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {8D8CC016-0020-40EC-BD8E-73F1CE0F9662} = {D3D38B03-B557-484D-8348-8BADEE4DF592} - {A84717CB-F11A-41C5-A74D-C0F1D47B7431} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {85D0CAFD-2FE8-496A-88C7-585D35B94243} = {09EADF06-BE25-4228-AB53-95AE3E15B530} - {31D38B21-102B-41C0-9E0A-2FE0BF68D123} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {5E920CAC-5A28-42FB-936E-49C472130953} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} - {AD7058C9-5608-49A8-BE23-58C33A74EE91} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {E02DA82D-3FEE-4C60-BD80-9EC3C3448DFC} = {09EADF06-BE25-4228-AB53-95AE3E15B530} - {B1B3F284-FA3D-4D76-A712-FF04495D244B} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {D6741C37-B5E6-4050-BCBA-9715809EA15B} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {21CAD3A1-5E1F-42C1-BB73-46B6E67F4206} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} - {AE4F7569-26F3-4160-8A8B-7A57D0DA3350} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {F308DC6B-7E59-40D7-A581-834E8CD99CFE} = {7F13E156-3EBA-4021-84A5-CD56BA72F99E} {C2652287-CD6D-40FB-B042-95FB56D09DB8} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {E48285BF-F49A-4EA3-AED0-1BDDBF77EB80} = {09EADF06-BE25-4228-AB53-95AE3E15B530} - {F5D11F71-2D61-4AE9-99D7-0F0B54649B15} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {A6924919-9E37-4023-8B7F-E85C8E3CC9B3} = {DA452A53-2E94-4433-B08C-041EDEC729E6} {3C8F910B-7F23-4D25-B521-6D5AC9570ADD} = {DA452A53-2E94-4433-B08C-041EDEC729E6} {E2DD0721-5B0F-4606-8182-4C7EFB834518} = {09EADF06-BE25-4228-AB53-95AE3E15B530} - {1BA5C784-52E8-4A87-8525-26B2452F2882} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {56CB0850-7341-4D71-9AE4-9EFC472D93DD} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {46CC5637-3DDF-4100-93FC-44BB87B2DB81} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} - {3817A875-278C-4140-BF66-3C4A8CA55F0D} = {D3D38B03-B557-484D-8348-8BADEE4DF592} {419F93D5-4135-4DA0-A76E-EFC23E04093D} = {09EADF06-BE25-4228-AB53-95AE3E15B530} {A22FAD27-77E8-4460-8B92-EC7090B7173A} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} {A1CAC86F-F4BB-4B6D-9D18-E9AE15B3C66E} = {AED9C836-31E3-4F3F-8ABC-929555D3F3C4} diff --git a/build.proj b/build.proj deleted file mode 100644 index 1d95743b60..0000000000 --- a/build.proj +++ /dev/null @@ -1,159 +0,0 @@ - - - - - true - - - - - - - - - - - true - - - - - $(RepoRoot) - - - - - - - - - - - - - CreateOrUpdateCurrentVersionFile; - RestoreProjects; - BuildRedist; - BuildNative; - $(TraversalBuildDependsOn); - DownloadExternalTestFiles; - DownloadTensorflowMetaFiles; - DeleteTestHost; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https://aka.ms/mlnet-resources/benchmarks/%(Identity) - $(MSBuildThisFileDirectory)/test/data/external/%(Identity) - - - - - - - - - - - - - - https://aka.ms/mlnet-resources/meta/%(Identity) - $([System.IO.Path]::GetTempPath())/MLNET/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/Dependencies.props b/build/Dependencies.props deleted file mode 100644 index e08c0f6f29..0000000000 --- a/build/Dependencies.props +++ /dev/null @@ -1,65 +0,0 @@ - - - - - 10.0.3 - 4.4.0 - 4.4.0 - 1.5.0 - 4.5.1 - 4.3.0 - 4.7.1 - - - - - 3.10.1 - 2.2.3 - 2.1.0 - 1.5.2 - 0.0.0.9 - 2.1.3 - 4.5.0 - 4.5.0 - 4.5.0 - 2.3.1 - 2 - 0.20.1 - - - - - 2.9.0 - - - - - 3.3.1 - 4.5.0 - 1.2.0 - - - - - 1.0.0-beta-62824-02 - 1.9.0 - 1.2.1 - 4.3.6 - 1.0.0-beta.19225.5 - - - - - 0.12.0 - 1.0.1-beta1.20080.1 - 3.0.1 - 0.0.6-test - 0.0.6-test - 0.0.13-test - 0.0.6-test - 4.6.1 - 1.2.7 - 1.0.112.2 - - - diff --git a/config.json b/config.json deleted file mode 100644 index f484ae92c6..0000000000 --- a/config.json +++ /dev/null @@ -1,250 +0,0 @@ -{ - "settings": { - "Configuration": { - "description": "Sets the optimization level for the Build Configuration you want to build.", - "valueType": "property", - "values": [ "Debug", "Release", "Debug-netcoreapp3_1", "Release-netcoreapp3_1", "Debug-netfx", "Release-netfx" ], - "defaultValue": "Debug" - }, - "TargetArchitecture": { - "description": "Sets the architecture for the native assets you want to build.", - "valueType": "property", - "values": [ "x64", "x86" ], - "defaultValue": "x64" - }, - "OfficialBuildId": { - "description": "Specifies the SeedDate and the revision of the build to generate the version of the libraries.", - "valueType": "property", - "values": [], - "defaultValue": "" - }, - "BuildNumberMajor": { - "description": "Product build major number.", - "valueType": "property", - "values": [], - "defaultValue": "" - }, - "BuildNumberMinor": { - "description": "Product build minor number.", - "valueType": "property", - "values": [], - "defaultValue": "" - }, - "SkipRIDAgnosticAssets": { - "description": "Prevents RID agnostic assets in redist from being built.", - "valueType": "property", - "values": [], - "defaultValue": "" - }, - "MsBuildLogging": { - "description": "MsBuild logging options.", - "valueType": "passThrough", - "values": [], - "defaultValue": "/flp:v=normal" - }, - "MsBuildWarning": { - "description": "MsBuild warning logging.", - "valueType": "passThrough", - "values": [], - "defaultValue": "/flp2:warningsonly;logfile=msbuild.wrn" - }, - "MsBuildError": { - "description": "MsBuild error logging.", - "valueType": "passThrough", - "values": [], - "defaultValue": "/flp3:errorsonly;logfile=msbuild.err" - }, - "Project": { - "description": "Project where the commands are going to be applied.", - "valueType": "passThrough", - "values": [], - "defaultValue": "" - }, - "BuildNative": { - "description": "MsBuild target that builds the native assets.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, - "BuildPackages": { - "description": "MsBuild target that builds packages.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, - "RunTests": { - "description": "MsBuild target that run the tests. Call this after building.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, - "RunCITests": { - "description": "MsBuild target that run CI tests. Call this after building.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, - "RunSpecificTests": { - "description": "MsBuild target that run specific tests only. Call this after building.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, - "RunNightlyBuildTests": { - "description": "MsBuild target that run the nightly build tests. Call this after building.", - "valueType": "target", - "values": [], - "defaultValue": "" - }, - "Coverage": { - "description": "Turn on code coverge.", - "valueType": "property", - "values": ["false", "true"], - "defaultValue": "false" - }, - "CleanAllProjects": { - "description": "MsBuild target that deletes the binary output directory.", - "valueType": "target", - "values": [], - "defaultValue": "" - } - }, - "commands": { - "build": { - "alias": { - "debug": { - "description": "Sets optimization level to debug for managed build configuration. (/p:Configuration=Debug)", - "settings": { - "Configuration": "Debug" - } - }, - "release": { - "description": "Sets optimization level to release for managed build configuration. (/p:Configuration=Release)", - "settings": { - "Configuration": "Release" - } - }, - "debug-netcoreapp3_1": { - "description": "Sets optimization level to debug for managed build configuration and builds against netcoreapp3.1. (/p:Configuration=Debug-netcoreapp3_1)", - "settings": { - "Configuration": "Debug-netcoreapp3_1" - } - }, - "release-netcoreapp3_1": { - "description": "Sets optimization level to release for managed build configuration and builds against netcoreapp3.1. (/p:Configuration=Release-netcoreapp3_1)", - "settings": { - "Configuration": "Release-netcoreapp3_1" - } - }, - "debug-netfx": { - "description": "Sets optimization level to debug for managed build configuration and builds against fullframework. (/p:Configuration=Debug-netfx)", - "settings": { - "Configuration": "Debug-netfx" - } - }, - "release-netfx": { - "description": "Sets optimization level to release for managed build configuration and builds against fullframework. (/p:Configuration=Release-netfx)", - "settings": { - "Configuration": "Release-netfx" - } - }, - "buildArch": { - "description": "Sets the architecture for the native build. (/p:TargetArchitecture=[value])", - "settings": { - "TargetArchitecture": "default" - } - }, - "buildNative": { - "description": "Builds the native assets.", - "settings": { - "BuildNative": "default" - } - }, - "skipRIDAgnosticAssets": { - "description": "Avoid building RID agnostic assets in redist.", - "settings": { - "SkipRIDAgnosticAssets": "default" - } - }, - "buildPackages": { - "description": "Builds the NuGet packages.", - "settings": { - "BuildPackages": "default" - } - }, - "runtests": { - "description": "Runs the tests. Call this after building.", - "settings": { - "RunTests": "default" - } - }, - "runCITests": { - "description": "Runs CI tests. Call this after building.", - "settings": { - "RunCITests": "default" - } - }, - "runSpecificTests": { - "description": "Runs Specific tests. Call this after building.", - "settings": { - "RunSpecificTests": "default" - } - }, - "runnightlybuildtests": { - "description": "Runs the nightly build tests. Call this after building.", - "settings": { - "RunNightlyBuildTests": "default" - } - }, - "verbose": { - "description": "Passes /flp:v=diag to the msbuild command or the value passed by the user.", - "settings": { - "MsBuildLogging": "/flp:v=diag;LogFile=build-managed.log" - } - } - }, - "defaultValues": { - "toolName": "msbuild", - "settings": { - "Project": "build.proj", - "Configuration": "default", - "MsBuildLogging": "default", - "MsBuildWarning": "default", - "MsBuildError": "default" - } - } - } - }, - "tools": { - "msbuild": { - "osSpecific": { - "windows": { - "defaultParameters": "msbuild /nologo /verbosity:minimal /clp:Summary /maxcpucount /l:BinClashLogger,Tools\\Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log", - "path": "Tools/dotnetcli/dotnet" - }, - "unix": { - "defaultParameters": "msbuild /nologo /verbosity:minimal /clp:Summary /maxcpucount /l:BinClashLogger,Tools/Microsoft.DotNet.Build.Tasks.dll;LogFile=binclash.log", - "path": "Tools/dotnetcli/dotnet" - } - }, - "valueTypes": { - "property": "/p:{name}={value}", - "target": "/t:{name}", - "internal": "/{name}" - } - }, - "terminal": { - "osSpecific": { - "windows": { - "filesExtension": "cmd" - }, - "unix": { - "filesExtension": "sh" - } - }, - "valueTypes": { - "property": "--{name}={value}" - } - } - } -} diff --git a/init-tools.cmd b/init-tools.cmd deleted file mode 100644 index 4c7893ec49..0000000000 --- a/init-tools.cmd +++ /dev/null @@ -1,128 +0,0 @@ -@if not defined _echo @echo off -setlocal - -set INIT_TOOLS_LOG=%~dp0init-tools.log -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 -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 INIT_TOOLS_RESTORE_PROJECT=%~dp0init-tools.msbuild -set BUILD_TOOLS_SEMAPHORE_DIR=%TOOLRUNTIME_DIR%\%BUILDTOOLS_VERSION% -set BUILD_TOOLS_SEMAPHORE=%BUILD_TOOLS_SEMAPHORE_DIR%\init-tools.completed -set ARCH=x64 - -:: if force option is specified then clean the tool runtime and build tools package directory to force it to get recreated -if [%1]==[force] ( - if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" - if exist "%PACKAGES_DIR%\Microsoft.DotNet.BuildTools" rmdir /S /Q "%PACKAGES_DIR%\Microsoft.DotNet.BuildTools" -) - -:: If semaphore exists do nothing -if exist "%BUILD_TOOLS_SEMAPHORE%" ( - echo Tools are already initialized. - goto :EOF -) - -if exist "%TOOLRUNTIME_DIR%" rmdir /S /Q "%TOOLRUNTIME_DIR%" - -if exist "%DotNetBuildToolsDir%" ( - echo Using tools from '%DotNetBuildToolsDir%'. - mklink /j "%TOOLRUNTIME_DIR%" "%DotNetBuildToolsDir%" - - if not exist "%DOTNET_CMD%" ( - echo ERROR: Ensure that '%DotNetBuildToolsDir%' contains the .NET Core SDK at '%DOTNET_PATH%' - exit /b 1 - ) - - echo Done initializing tools. - if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" - echo Using tools from '%DotNetBuildToolsDir%'. > "%BUILD_TOOLS_SEMAPHORE%" - exit /b 0 -) - -echo Running %0 > "%INIT_TOOLS_LOG%" - -set /p DOTNET_VERSION=< "%~dp0DotnetCLIVersion.txt" -set /p DOTNET_EXTRA_RUNTIME_VERSION=< "%~dp0DotnetExtraRuntimeVersion.txt" - -:Arg_Loop -if [%1] == [] goto :ArchSet -if /i [%1] == [x86] ( set ARCH=x86) -shift -goto :Arg_Loop - -:ArchSet -if exist "%DOTNET_CMD%" goto :afterdotnetrestore - -if NOT exist "%DOTNET_PATH%" mkdir "%DOTNET_PATH%" - -:: set registry to take dump automatically when test process crashes -if NOT [%AGENT_ID%] == [] ( - reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /f - reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /f /v DumpType /t REG_DWORD /d 2 - reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /f /v DumpCount /t REG_DWORD /d 2 - reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\Windows Error Reporting\LocalDumps" /f /v DumpFolder /t REG_SZ /d "%~dp0CrashDumps" -) - -:: install procdump.exe to take process dump when test crashes, hangs or fails -echo Installing procdump.exe -powershell -Command "Invoke-WebRequest https://download.sysinternals.com/files/Procdump.zip -UseBasicParsing -outfile procdump.zip | Out-Null" -powershell -Command "Expand-Archive -Force procdump.zip Tools\ProcDump" -del /f procdump.zip -echo Finish install procdump.exe - -:: install the extra runtime first, so the SDK install will overwrite the root dotnet executable -echo Installing dotnet runtime %DOTNET_EXTRA_RUNTIME_VERSION%... -set DOTNET_EXTRA_RUNTIME_ZIP_NAME=dotnet-runtime-%DOTNET_EXTRA_RUNTIME_VERSION%-win-%ARCH%.zip -set DOTNET_EXTRA_RUNTIME_REMOTE_PATH=https://dotnetcli.azureedge.net/dotnet/Runtime/%DOTNET_EXTRA_RUNTIME_VERSION%/%DOTNET_EXTRA_RUNTIME_ZIP_NAME% -set DOTNET_EXTRA_RUNTIME_LOCAL_PATH=%DOTNET_PATH%%DOTNET_EXTRA_RUNTIME_ZIP_NAME% -echo Installing '%DOTNET_EXTRA_RUNTIME_REMOTE_PATH%' to '%DOTNET_EXTRA_RUNTIME_LOCAL_PATH%' >> "%INIT_TOOLS_LOG%" -powershell -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;$retryCount = 0; $success = $false; $proxyCredentialsRequired = $false; do { try { $wc = New-Object Net.WebClient; if ($proxyCredentialsRequired) { [Net.WebRequest]::DefaultWebProxy.Credentials = [Net.CredentialCache]::DefaultNetworkCredentials; } $wc.DownloadFile('%DOTNET_EXTRA_RUNTIME_REMOTE_PATH%', '%DOTNET_EXTRA_RUNTIME_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $we = $_.Exception.InnerException -as [Net.WebException]; $proxyCredentialsRequired = ($we -ne $null -and ([Net.HttpWebResponse]$we.Response).StatusCode -eq [Net.HttpStatusCode]::ProxyAuthenticationRequired); Start-Sleep -Seconds (5 * $retryCount); $retryCount++; } } } while ($success -eq $false); Expand-Archive '%DOTNET_EXTRA_RUNTIME_LOCAL_PATH%' '%DOTNET_PATH%';" >> "%INIT_TOOLS_LOG%" - -echo Installing dotnet cli %DOTNET_VERSION%... -set DOTNET_ZIP_NAME=dotnet-sdk-%DOTNET_VERSION%-win-%ARCH%.zip -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 "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12;$retryCount = 0; $success = $false; $proxyCredentialsRequired = $false; do { try { $wc = New-Object Net.WebClient; if ($proxyCredentialsRequired) { [Net.WebRequest]::DefaultWebProxy.Credentials = [Net.CredentialCache]::DefaultNetworkCredentials; } $wc.DownloadFile('%DOTNET_REMOTE_PATH%', '%DOTNET_LOCAL_PATH%'); $success = $true; } catch { if ($retryCount -ge 6) { throw; } else { $we = $_.Exception.InnerException -as [Net.WebException]; $proxyCredentialsRequired = ($we -ne $null -and ([Net.HttpWebResponse]$we.Response).StatusCode -eq [Net.HttpStatusCode]::ProxyAuthenticationRequired); Start-Sleep -Seconds (5 * $retryCount); $retryCount++; } } } while ($success -eq $false); Expand-Archive '%DOTNET_LOCAL_PATH%' '%DOTNET_PATH%' -Force; " >> "%INIT_TOOLS_LOG%" - -if NOT exist "%DOTNET_LOCAL_PATH%" ( - echo ERROR: Could not install dotnet cli correctly. 1>&2 - goto :error -) - -:afterdotnetrestore - -if exist "%BUILD_TOOLS_PATH%" goto :afterbuildtoolsrestore -echo Restoring BuildTools version %BUILDTOOLS_VERSION%... -echo Running: "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir=%TOOLRUNTIME_DIR% >> "%INIT_TOOLS_LOG%" -call "%DOTNET_CMD%" restore "%INIT_TOOLS_RESTORE_PROJECT%" --no-cache --packages "%PACKAGES_DIR%" --source "%BUILDTOOLS_SOURCE%" /p:BuildToolsPackageVersion=%BUILDTOOLS_VERSION% /p:ToolsDir="%TOOLRUNTIME_DIR%" >> "%INIT_TOOLS_LOG%" -if NOT exist "%BUILD_TOOLS_PATH%\init-tools.cmd" ( - echo ERROR: Could not restore build tools correctly. 1>&2 - goto :error -) - -:afterbuildtoolsrestore - -echo Initializing BuildTools... -echo Running: "%BUILD_TOOLS_PATH%\init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" "%PACKAGES_DIR%" >> "%INIT_TOOLS_LOG%" -call "%BUILD_TOOLS_PATH%\init-tools.cmd" "%~dp0" "%DOTNET_CMD%" "%TOOLRUNTIME_DIR%" "%PACKAGES_DIR%" >> "%INIT_TOOLS_LOG%" -set INIT_TOOLS_ERRORLEVEL=%ERRORLEVEL% -if not [%INIT_TOOLS_ERRORLEVEL%]==[0] ( - echo ERROR: An error occured when trying to initialize the tools. 1>&2 - goto :error -) - -:: Create semaphore file -echo Done initializing tools. -if NOT exist "%BUILD_TOOLS_SEMAPHORE_DIR%" mkdir "%BUILD_TOOLS_SEMAPHORE_DIR%" -echo Init-Tools.cmd completed for BuildTools Version: %BUILDTOOLS_VERSION% > "%BUILD_TOOLS_SEMAPHORE%" -exit /b 0 - -:error -echo Please check the detailed log that follows. 1>&2 -type "%INIT_TOOLS_LOG%" 1>&2 -exit /b 1 diff --git a/init-tools.msbuild b/init-tools.msbuild deleted file mode 100644 index 7bb7fa0043..0000000000 --- a/init-tools.msbuild +++ /dev/null @@ -1,13 +0,0 @@ - - - netcoreapp1.0 - false - true - $(MSBuildThisFileDirectory)Tools/$(BuildToolsPackageVersion) - Microsoft.SymbolUploader.Build.Task - - - - - - \ No newline at end of file diff --git a/init-tools.sh b/init-tools.sh deleted file mode 100755 index 492df5711f..0000000000 --- a/init-tools.sh +++ /dev/null @@ -1,207 +0,0 @@ -#!/usr/bin/env bash - -__scriptpath=$(cd "$(dirname "$0")"; pwd -P) -__init_tools_log="$__scriptpath/init-tools.log" -__PACKAGES_DIR="$__scriptpath/packages" -__TOOLRUNTIME_DIR="$__scriptpath/Tools" -__DOTNET_PATH="$__TOOLRUNTIME_DIR/dotnetcli" -__DOTNET_CMD="$__DOTNET_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" | sed 's/\r$//') # remove CR if mounted repo on Windows drive - -DotNetCliFileName="DotnetCLIVersion.txt" -DotNetExtraRuntimeFileName="DotnetExtraRuntimeVersion.txt" - -__DOTNET_TOOLS_VERSION=$(cat "$__scriptpath/$DotNetCliFileName" | sed 's/\r$//') # remove CR if mounted repo on Windows drive -__DOTNET_EXTRA_RUNTIME_VERSION=$(cat "$__scriptpath/$DotNetExtraRuntimeFileName" | sed 's/\r$//') # remove CR if mounted repo on Windows drive -__BUILD_TOOLS_PATH="$__PACKAGES_DIR/microsoft.dotnet.buildtools/$__BUILD_TOOLS_PACKAGE_VERSION/lib" -__INIT_TOOLS_RESTORE_PROJECT="$__scriptpath/init-tools.msbuild" -__BUILD_TOOLS_SEMAPHORE="$__TOOLRUNTIME_DIR/$__BUILD_TOOLS_PACKAGE_VERSION/init-tools.complete" - -if [ -e "$__BUILD_TOOLS_SEMAPHORE" ]; then - echo "Tools are already initialized" - return #return instead of exit because this script is inlined in other scripts which we don't want to exit -fi - -if [ -e "$__TOOLRUNTIME_DIR" ]; then rm -rf -- "$__TOOLRUNTIME_DIR"; fi - -if [ -d "${DotNetBuildToolsDir:-}" ]; then - echo "Using tools from '$DotNetBuildToolsDir'." - ln -s "$DotNetBuildToolsDir" "$__TOOLRUNTIME_DIR" - - if [ ! -e "$__DOTNET_CMD" ]; then - echo "ERROR: Ensure that $DotNetBuildToolsDir contains the .NET Core SDK at $__DOTNET_PATH" - exit 1 - fi - - echo "Done initializing tools." - mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE" - return #return instead of exit because this script is inlined in other scripts which we don't want to exit -fi - -echo "Running: $__scriptpath/init-tools.sh" > "$__init_tools_log" - -display_error_message() -{ - echo "Please check the detailed log that follows." 1>&2 - cat "$__init_tools_log" 1>&2 -} - -# Executes a command and retries if it fails. -execute_with_retry() { - local count=0 - local retries=${retries:-5} - local waitFactor=${waitFactor:-6} - until "$@"; do - local exit=$? - count=$(( $count + 1 )) - if [ $count -lt $retries ]; then - local wait=$(( waitFactor ** (( count - 1 )) )) - echo "Retry $count/$retries exited $exit, retrying in $wait seconds..." - sleep $wait - else - say_err "Retry $count/$retries exited $exit, no more retries left." - return $exit - fi - done - - return 0 -} - -if [ ! -e "$__DOTNET_PATH" ]; then - if [ -z "${__DOTNET_PKG:-}" ]; then - if [ "$(uname -m | grep "i[3456]86")" = "i686" ]; then - echo "Warning: build not supported on 32 bit Unix" - fi - - __PKG_ARCH=x64 - - OSName=$(uname -s) - case $OSName in - Darwin) - OS=OSX - __PKG_RID=osx - ulimit -n 2048 - # Format x.y.z as single integer with three digits for each part - VERSION=`sw_vers -productVersion| sed -e 's/\./ /g' | xargs printf "%03d%03d%03d"` - if [ "$VERSION" -lt 010012000 ]; then - echo error: macOS version `sw_vers -productVersion` is too old. 10.12 is needed as minimum. - exit 1 - fi - ;; - - Linux) - __PKG_RID=linux - OS=Linux - - if [ -e /etc/os-release ]; then - source /etc/os-release - if [[ $ID == "alpine" ]]; then - __PKG_RID=linux-musl - fi - elif [ -e /etc/redhat-release ]; then - redhatRelease=$( /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.extra.runtime.tar ${__DOTNET_EXTRA_RUNTIME_LOCATION} - else - wget -q -O $__DOTNET_PATH/dotnet.extra.runtime.tar ${__DOTNET_EXTRA_RUNTIME_LOCATION} - fi - else - echo "Copying '$DotNetExtraRuntimeTarPath' to '$__DOTNET_PATH/dotnet.extra.runtime.tar'" - cp $DotNetExtraRuntimeTarPath $__DOTNET_PATH/dotnet.extra.runtime.tar - fi - cd "$__DOTNET_PATH" - tar -xf "$__DOTNET_PATH/dotnet.extra.runtime.tar" - } - execute_with_retry install_dotnet_extra_runtime >> "$__init_tools_log" 2>&1 - - echo "Installing dotnet cli ${__DOTNET_TOOLS_VERSION}..." - __DOTNET_LOCATION="https://dotnetcli.azureedge.net/dotnet/Sdk/${__DOTNET_TOOLS_VERSION}/${__DOTNET_PKG}.tar.gz" - - install_dotnet_cli() { - if [[ -z "${DotNetBootstrapCliTarPath-}" ]]; then - echo "Installing '${__DOTNET_LOCATION}' to '$__DOTNET_PATH/dotnet.tar'" - rm -rf -- "$__DOTNET_PATH/*" - # curl has HTTPS CA trust-issues less often than wget, so lets try that first. - if command -v curl > /dev/null; then - curl --retry 10 -sSL --create-dirs -o $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} - else - wget -q -O $__DOTNET_PATH/dotnet.tar ${__DOTNET_LOCATION} - fi - else - echo "Copying '$DotNetBootstrapCliTarPath' to '$__DOTNET_PATH/dotnet.tar'" - cp $DotNetBootstrapCliTarPath $__DOTNET_PATH/dotnet.tar - fi - cd "$__DOTNET_PATH" - tar -xf "$__DOTNET_PATH/dotnet.tar" - } - execute_with_retry install_dotnet_cli >> "$__init_tools_log" 2>&1 - - cd "$__scriptpath" -fi - -if [ ! -e "$__BUILD_TOOLS_PATH" ]; then - echo "Restoring BuildTools version $__BUILD_TOOLS_PACKAGE_VERSION..." - echo "Running: $__DOTNET_CMD restore \"$__INIT_TOOLS_RESTORE_PROJECT\" --no-cache --packages $__PACKAGES_DIR --source $__BUILDTOOLS_SOURCE /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir=$__TOOLRUNTIME_DIR" >> "$__init_tools_log" - "$__DOTNET_CMD" restore "$__INIT_TOOLS_RESTORE_PROJECT" --no-cache --packages "$__PACKAGES_DIR" --source "$__BUILDTOOLS_SOURCE" /p:BuildToolsPackageVersion=$__BUILD_TOOLS_PACKAGE_VERSION /p:ToolsDir="$__TOOLRUNTIME_DIR" >> "$__init_tools_log" - if [ ! -e "$__BUILD_TOOLS_PATH/init-tools.sh" ]; then - echo "ERROR: Could not restore build tools correctly." 1>&2 - display_error_message - fi -fi - -echo "Initializing BuildTools..." -echo "Running: $__BUILD_TOOLS_PATH/init-tools.sh $__scriptpath $__DOTNET_CMD $__TOOLRUNTIME_DIR $__PACKAGES_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" "$__PACKAGES_DIR" >> "$__init_tools_log" -if [ "$?" != "0" ]; then - echo "ERROR: An error occurred when trying to initialize the tools." 1>&2 - display_error_message - exit 1 -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 - -mkdir -p "$(dirname "$__BUILD_TOOLS_SEMAPHORE")" && touch "$__BUILD_TOOLS_SEMAPHORE" - -echo "Done initializing tools." diff --git a/run.cmd b/run.cmd deleted file mode 100644 index ccbe714db8..0000000000 --- a/run.cmd +++ /dev/null @@ -1,28 +0,0 @@ -@if not defined _echo @echo off -setlocal - -:: Clear the 'Platform' env variable for this session, as it's a per-project setting within the build, and -:: misleading value (such as 'MCD' in HP PCs) may lead to build breakage (corefx issue: #69). -set Platform= - -:: Disable telemetry, first time experience, and global sdk look for the CLI -set DOTNET_CLI_TELEMETRY_OPTOUT=1 -set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 -set DOTNET_MULTILEVEL_LOOKUP=0 - -:: Restore the Tools directory -call "%~dp0init-tools.cmd" %* -if NOT [%ERRORLEVEL%]==[0] exit /b 1 - -set _toolRuntime=%~dp0Tools -set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe -set _json=%~dp0config.json - -:: run.exe depends on running in the root directory, notably because the config.json specifies -:: a relative path to the binclash logger - -pushd "%~dp0" -call "%_dotnet%" "%_toolRuntime%\run.exe" "%_json%" %* -popd - -exit /b %ERRORLEVEL% \ No newline at end of file diff --git a/run.sh b/run.sh deleted file mode 100755 index fe936e3ecc..0000000000 --- a/run.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -__scriptpath=$(cd "$(dirname "$0")"; pwd -P) - -# Disable telemetry, first time experience, and global sdk look for the CLI -export DOTNET_CLI_TELEMETRY_OPTOUT=1 -export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 -export DOTNET_MULTILEVEL_LOOKUP=0 - -# Set the terminal language to en-US in order to avoid problems with MSBuild compareversion command -export LANG=en_US.UTF-8 - -# Source the init-tools.sh script rather than execute in order to preserve ulimit values in child-processes. https://github.com/dotnet/corefx/issues/19152 -. "$__scriptpath/init-tools.sh" - -__toolRuntime=$__scriptpath/Tools -__dotnet=$__toolRuntime/dotnetcli/dotnet - -cd "$__scriptpath" -"$__dotnet" "$__toolRuntime/run.exe" "$__scriptpath/config.json" "$@" -exit $?