Skip to content

Commit dcefe89

Browse files
authored
Merge 3.0 into 3.1 (#1355)
* Update dependencies from https://github.com/dotnet/core-sdk build 20190926.9 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19476.9 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.100-rc2.19476.5 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.100-rc2.19476.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Re-destabilize for building 3.0.1 dev builds. * Update dependencies from https://github.com/dotnet/core-sdk build 20191001.12 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19501.12 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19501.8 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Update websdk patch * Update dependencies from https://github.com/dotnet/core-sdk build 20191001.15 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19501.15 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19501.8 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19501.1 (parent: Microsoft.Dotnet.Toolset.Internal) * Make sure we fail the build when build script fails * Upgrade SDK to 3.0.100 * Update patches * Fix patch again * Really fix the patch * Update dependencies from https://github.com/dotnet/core-sdk build 20191002.6 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19502.6 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19502.7 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.1-servicing.19475.2 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19501.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.1-servicing-19502-01 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19502.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19501.4 (parent: Microsoft.Dotnet.Toolset.Internal) * Turn warnings as errors off for arcade * Warnings as errors also off for templating * Fix patch again * Remove patch that's no longer needed. * We don't have the Windows package, so try faking it. * Try a different approach to the ASP.NET version. * Add logging back to source-build's build itself * Rework stable versions so repos can be stable independent of each other. * Fix function casing * Restore patch for now * Update online prebuilt baseline * Add patch for corefx not to call dotnet without a path * Fix CoreFX patch * Update dependencies from https://github.com/dotnet/core-sdk build 20191003.8 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19503.8 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.1-servicing.19475.2 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19501.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.1-servicing-19502-09 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19502.1 (parent: Microsoft.Dotnet.Toolset.Internal) * fix websdk patch * Same patch for core-setup * Update dependencies from https://github.com/dotnet/core-sdk build 20191003.17 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19503.17 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.10 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.1-servicing.19475.2 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19501.4 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.1-servicing-19502-09 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19503.2 (parent: Microsoft.Dotnet.Toolset.Internal) * fix websdk patch * Add another psuedo package for CLI * Another psuedo package for toolset * Update dependencies from https://github.com/dotnet/core-sdk build 20191004.9 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19504.9 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19503.12 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19501.4 (parent: Microsoft.NETCore.App) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19503.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Remove upstreamed patch * Update core-sdk ASP.NET version patch * Update dependencies from https://github.com/dotnet/core-sdk build 20191004.15 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19504.15 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19504.29 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-servicing.19501.4 (parent: Microsoft.NETCore.App) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19503.2 (parent: Microsoft.Dotnet.Toolset.Internal) * another psuedo package for core-sdk * Another psuedo package * another psuedo package * Update dependencies from https://github.com/dotnet/core-sdk build 20191007.1 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19507.1 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19504.29 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19503.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191007.5 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19507.5 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19506.18 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19503.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191007.7 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19507.7 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19507.20 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19503.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191008.2 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19508.2 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19508.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19507.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191010.5 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19510.5 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19508.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19507.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191010.6 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19510.6 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19508.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19477.3 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19507.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191010.9 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19510.9 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.6 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.1 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19507.2 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191011.5 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19511.5 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19510.10 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19510.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191011.7 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19511.7 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19511.3 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19510.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191012.1 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19512.1 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19511.3 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19510.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191012.2 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19512.2 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19512.2 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19510.3 (parent: Microsoft.Dotnet.Toolset.Internal) * directly call darc-init * add runtime to support darc, add tools-path, remove un-needed projects * Use the latest darc version * wip * remove darc and dependent stuff from tarball * test: experimental * test: experimental * remove extra stuff from tarball * wip * update to fedora30 * Update dependencies from https://github.com/dotnet/core-sdk build 20191016.6 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19516.6 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.8 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19510.3 (parent: Microsoft.Dotnet.Toolset.Internal) * wip * Update dependencies from https://github.com/dotnet/core-sdk build 20191016.11 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19516.11 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.8 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19503.4 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19510.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Update dependencies from https://github.com/dotnet/core-sdk build 20191017.5 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19517.5 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19516.20 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.DotNet.Common.ItemTemplates - 3.0.1-servicing.19476.1 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19516.6 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19516.3 (parent: Microsoft.Dotnet.Toolset.Internal) * wip * wip * wip * add environment ld_path to build tarball * code review resolve * code review resolve * code review resolve * Update dependencies from https://github.com/dotnet/core-sdk build 20191018.12 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19518.12 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19517.15 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) - NuGet.Build.Tasks - 5.3.1-rtm.6268 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19517.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19516.3 (parent: Microsoft.Dotnet.Toolset.Internal) * add darcVersion to tarball * [release/3.0] Update dependencies from dotnet/source-build-reference-packages (#1325) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191017.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19517.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Revert changes * Install darc rather than building it via arcade-services (#1315) * directly call darc-init * add runtime to support darc, add tools-path, remove un-needed projects * Use the latest darc version * remove darc and dependent stuff from tarball * remove extra stuff from tarball * add environment ld_path to build tarball * add darcVersion to tarball * Update dependencies from https://github.com/dotnet/core-sdk build 20191021.2 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19521.2 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19521.3 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.Build - 16.3.2 (parent: Microsoft.Dotnet.Toolset.Internal) - NuGet.Build.Tasks - 5.3.1-rtm.6268 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19517.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19516.3 (parent: Microsoft.Dotnet.Toolset.Internal) * Patch update 2019-10-23. * Update dependencies from https://github.com/dotnet/core-sdk build 20191023.3 - Microsoft.Dotnet.Sdk.Internal - 1.0.0-preview.19523.3 Dependency coherency updates - Microsoft.Dotnet.Toolset.Internal - 3.0.101-servicing.19521.3 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) - Microsoft.Build - 16.3.2 (parent: Microsoft.Dotnet.Toolset.Internal) - NuGet.Build.Tasks - 5.3.1-rtm.6268 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk - 3.0.101-servicing.19510.7 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.DotNet.Cli.Runtime - 3.0.101-servicing.19517.5 (parent: Microsoft.Dotnet.Toolset.Internal) - Microsoft.NET.Sdk.Web - 3.0.100-rc2.19516.3 (parent: Microsoft.Dotnet.Toolset.Internal) * [release/3.0] Update dependencies from dotnet/source-build-reference-packages (#1327) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191023.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19523.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191023.2 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19523.2 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Undo changes in non ref-pack projects * Switch to PROD pool (#1257) * Switch to PROD pool * Update matrix.yml * Remove patches for fixed issue * Patch status update 2019-10-24. * Patch ASP.NET to use released crossgen version * Add patches to fix Arcade prebuilts (#1331) * Add patches to fix Arcade prebuilts * A couple more patch changes * Update online baseline * One more osx specific baseline update * [release/3.0] Update dependencies from dotnet/source-build-reference-packages (#1328) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191023.3 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19523.3 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191024.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19524.1 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191024.2 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19524.2 * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191024.3 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19524.3 * rollback to original versions for non sb-ref-pack projects * Match our core-setup package name with core-sdk's to hopefully fix coherency, and update versions. * Fixed version number so this patch isn't needed * Set BuildAllPackages in corefx (#1334) * Set BuildAllPackages in corefx Update corefx project to set property to build all packages. After the merge of #1237, corefx in source-build stopped building all packages. With the latest update to corefx brought in by #1237, building all packages is gated by the BuildAllPackages property here: https://github.com/dotnet/corefx/blob/c1778515a3bee34cc09c757b5563d0af0c8b1e99/src/packages.builds#L8-L12 * Fix BuildAllPackages...should be true * Add patch to use non-portable NETCoreAppRuntime for crossgen * Don't update RID when on OSX * Add patch to use non-portable NETCoreAppRuntime for crossgen (#1335) * Add patch to use non-portable NETCoreAppRuntime for crossgen * Don't update RID when on OSX * Update ASP.NET crossgen version - upcoming patch will obsolete this. * Add new ProdCon feeds to NuGet.config. * Core-setup is being built as stable for intermediate servicing builds. * Conditionally override PackageVersions in coreclr (#1336) * remove RuntimeToolsetVer from props experiment * Remove old ref-assembly src that is no longer used (#1341) * Remove app host prebuilt from aspnetcore (#1342) * Conditionally override PackageVersions in coreclr * Rename property to be specific to source-build * Conditionally set PackAsTool in aspnetcore * Fix PackAsTool patch * Explicitly remove samples and tests from aspnetcore build * Set UseAppHost=true for aspnetcore to prevent loading app host * Remove unneccessary patch * Update usage data to support empty usage file * Final prebuilt update * Revert * Make OSX package installs more failure-resistant. * [release/3.0] Update dependencies from dotnet/source-build-reference-packages (#1333) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191028.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19528.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191029.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19529.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20191104.1 - Private.SourceBuild.ReferencePackages - 1.0.0-beta.19554.1 Dependency coherency updates - Microsoft.NETCore.Runtime.CoreCLR - 3.0.0-rc2.19462.5 (parent: Microsoft.Private.CoreFx.NETCoreApp) - Microsoft.Private.CoreFx.NETCoreApp - 4.6.0-rc2.19462.14 (parent: Microsoft.NETCore.App) - Microsoft.NETCore.App - 3.0.0-rc2-19463-05 (parent: Microsoft.Dotnet.Sdk.Internal) * Revert non-referencePackages changes * One more reversion fix * Set property in Templating build to not use AppHost (#1346) * Set UseAppHost=false for templating to avoid loading Microsoft.NETCore.App.Host.linux-x64 * Update prebuilt baseline * change dir props to set runtime to stable 3.0.1 for core-sdk * Get latest aspnetcore patches from release/3.0 * wip * Baseline Changes * Patch corefx to not call dotnet without a path * coresetup patch for not calling dotnet without path * Remove ilasm/ildasm workaround (#1352) * Manually update to Tuesday's coherent build. - Fix some package names. - Turn stable versions on. - Update patches. - Disable servicing-packages-only build in ASP.NET Extensions. * Patch not needed after all * Patch ASP.NET target frameworks. * Patch netstandard2.1 into ASP.NET Extensions for AspNetCore. * more target framework * Update dependencies * more target framework * more target framework * more target framework * more target framework * more target framework * more target framework * more target framework * Patch ASP.NET Extensions to build MS.Internal.Extensions.Refs - used by AspNetCore. * Try to just build and not pack MS.Internal.Ext.Refs * Disable warnings as errors for ASP.NET Extensions * Using set -e instead of exit * change online baseline * Add version info to smoke-test * Patch ASP.NET extensions to make ref and implementation versions match * try skipping crossgen for ASP.NET * Patch core-sdk core-setup version * another dummy property for ASP.NET package version * Fix bad quoting * Patch AspNetCore to use our reference packages * Update online prebuilt baseline * Patch core-setup to not call dotnet without a path * Patch ASP.NET extensions to not call dotnet without a path * Patch ASP.NET Tooling to not call dotnet without a path * Remove old patches * Add core-sdk patch for core-setup version * add Core-setup patches * update aspnetcore-tooling patches * update aspnetcore-extension patches * turn off UseStableVersions * Re-arrange patches * Re-arrange patches * Re-arrange patches * aspnetcore: add patches from 3.0 * aspnetcore: add patches from 3.0 (yarn and version number) * aspnetcore: add patches from 3.0 (tfm and ref assem) * aspnetcore: change tfm 3.0 -> 3.1 * aspnetcore-tooling: change tfm 3.0 -> 3.1 * online: baseline changes * offline: baseline changes * core-setup: stablize package version * aspnetCore: remove fullfx patch
1 parent 797bee2 commit dcefe89

File tree

1,380 files changed

+1231
-143042
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,380 files changed

+1231
-143042
lines changed

DarcVersion.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1.1.0-beta.19515.3

Documentation/SourceBuildPrebuiltRepoStatus.md

Lines changed: 112 additions & 112 deletions
Large diffs are not rendered by default.

NuGet.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33
<packageSources>
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
6+
<add key="darc-pub-microsoft-msbuild-e481bbf" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-microsoft-msbuild-e481bbf8/nuget/v3/index.json" />
67
<add key="darc-pub-dotnet-standard-a5b5f2e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-standard-a5b5f2e1/nuget/v3/index.json" />
8+
<add key="darc-pub-aspnet-Extensions-7dbc3eb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-Extensions-7dbc3ebd/nuget/v3/index.json" />
9+
<add key="darc-pub-aspnet-AspNetCore-Tooling-7471a3d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-Tooling-7471a3da/nuget/v3/index.json" />
10+
<add key="darc-pub-aspnet-AspNetCore-22dedcb" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-aspnet-AspNetCore-22dedcb2/nuget/v3/index.json" />
711
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
812
<add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" />
913
<add key="nuget-build" value="https://dotnet.myget.org/F/nuget-build/api/v3/index.json" />

build-source-tarball.sh

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ if [[ $sdkLine =~ $sdkPattern ]]; then
7979
fi
8080
echo "Found bootstrap SDK $SDK_VERSION"
8181
CLI_PATH="$SCRIPT_ROOT/.dotnet"
82-
DARC_DLL="$SCRIPT_ROOT/tools-local/arcade-services/artifacts/bin/Microsoft.DotNet.Darc/Release/netcoreapp3.0/Microsoft.DotNet.Darc.dll"
82+
DarcVersion=$(cat $SCRIPT_ROOT/DarcVersion.txt)
83+
DARC_DLL="$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll"
8384

8485
if [ $SKIP_BUILD -ne 1 ]; then
8586

@@ -146,6 +147,10 @@ git submodule foreach --quiet --recursive '
146147

147148
# Now re-uberclone into the tarball src directory. Since we reuse the .gitdirs, this shouldn't hit the network at all.
148149
ignored_repos="https://dev.azure.com/dnceng/internal/_git/dotnet-optimization;https://dev.azure.com/devdiv/DevDiv/_git/DotNet-Trusted;https://devdiv.visualstudio.com/DevDiv/_git/DotNet-Trusted;https://[email protected]/dnceng/internal/_git/dotnet-optimization;https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup;https://github.com/dotnet/source-build-reference-packages"
150+
151+
#export the LC_LIB_PATH for libgit2 so file as fedora fails to find it in the repodir
152+
export LD_LIBRARY_PATH=$CLI_PATH/tools/.store/microsoft.dotnet.darc/$DarcVersion/microsoft.dotnet.darc/$DarcVersion/tools/netcoreapp2.1/any/runtimes/rhel-x64/native/
153+
149154
"$CLI_PATH/dotnet" "$DARC_DLL" clone --repos-folder=$TARBALL_ROOT/src/ --git-dir-folder $SCRIPT_ROOT/.git/modules/src/ --include-toolset --ignore-repos "$ignored_repos" --azdev-pat bogus --github-pat bogus --depth 0 --debug
150155

151156
# now we don't need .git/modules/src or Darc anymore
@@ -182,6 +187,7 @@ cp $SCRIPT_ROOT/*.proj $TARBALL_ROOT/
182187
cp $SCRIPT_ROOT/*.props $TARBALL_ROOT/
183188
cp $SCRIPT_ROOT/*.targets $TARBALL_ROOT/
184189
cp $SCRIPT_ROOT/global.json $TARBALL_ROOT/
190+
cp $SCRIPT_ROOT/DarcVersion.txt $TARBALL_ROOT/
185191
cp $SCRIPT_ROOT/ProdConFeed.txt $TARBALL_ROOT/
186192
cp $SCRIPT_ROOT/smoke-test* $TARBALL_ROOT/
187193
cp -r $CLI_PATH $TARBALL_ROOT/
@@ -192,6 +198,9 @@ cp -r $SCRIPT_ROOT/scripts $TARBALL_ROOT/
192198
cp -r $SCRIPT_ROOT/repos $TARBALL_ROOT/
193199
cp -r $SCRIPT_ROOT/tools-local $TARBALL_ROOT/
194200
rm -rf $TARBALL_ROOT/tools-local/arcade-services/
201+
rm -rf $TARBALL_ROOT/.dotnet/shared/2.1.0/
202+
rm -rf $TARBALL_ROOT/.dotnet/tools/
203+
rm -rf $TARBALL_ROOT/.dotnet/host/fxr/2.1.0/
195204
cp -r $SCRIPT_ROOT/bin/git-info $TARBALL_ROOT/
196205

197206
cp $SCRIPT_ROOT/support/tarball/build.sh $TARBALL_ROOT/build.sh
@@ -303,6 +312,7 @@ for path in ${ilSrcPaths[@]}; do
303312
fi
304313
if [[ "$remove" == "true" ]]; then
305314
rm -rf "$TARBALL_ROOT/packages/reference/staging/$path"
315+
rm -rf "$TARBALL_ROOT/packages/reference/source/$path"
306316
fi
307317
done
308318

build.proj

Lines changed: 0 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -89,77 +89,6 @@
8989
<ReferenceOnlyPackageDlls Include="$(ReferencePackagesSourceDir)**/*.dll" />
9090
</ItemGroup>
9191

92-
<!-- Temporary workaround to exclude dlls that can't be round-tripped. See: https://github.com/dotnet/coreclr/issues/20262
93-
They'll end up in the source directory as dlls for now
94-
-->
95-
<ItemGroup>
96-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Runtime.dll" />
97-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/netstandard.dll" />
98-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)netstandard.library/**/*.dll" />
99-
<!-- Microsoft.AspNet.App DLLs that include .resource files -->
100-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Antiforgery.dll" />
101-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authentication.OAuth.dll" />
102-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authentication.dll" />
103-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authorization.dll" />
104-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Cors.dll" />
105-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Cryptography.Internal.dll" />
106-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.DataProtection.Abstractions.dll" />
107-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.DataProtection.Extensions.dll" />
108-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.DataProtection.dll" />
109-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Diagnostics.dll" />
110-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Hosting.dll" />
111-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Http.Abstractions.dll" />
112-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Identity.dll" />
113-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Localization.dll" />
114-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Abstractions.dll" />
115-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Core.dll" />
116-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Cors.dll" />
117-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.DataAnnotations.dll" />
118-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Formatters.Xml.dll" />
119-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.Razor.dll" />
120-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.RazorPages.dll" />
121-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.TagHelpers.dll" />
122-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Mvc.ViewFeatures.dll" />
123-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Authorization.Policy.dll" />
124-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Razor.Runtime.dll" />
125-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Rewrite.dll" />
126-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Routing.dll" />
127-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.HttpSys.dll" />
128-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.IIS.dll" />
129-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.IIS.CoreStrings.dll" />
130-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Core.dll" />
131-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Core.CoreStrings.dll" />
132-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.SocketsStrings.dll" />
133-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll" />
134-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.Session.dll" />
135-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.StaticFiles.dll" />
136-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.AspNetCore.WebUtilities.dll" />
137-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Binder.dll" />
138-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.CommandLine.dll" />
139-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.FileExtensions.dll" />
140-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Ini.dll" />
141-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Json.dll" />
142-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.dll" />
143-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.UserSecrets.dll" />
144-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Configuration.Xml.dll" />
145-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.DependencyInjection.Abstractions.dll" />
146-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.DependencyInjection.dll" />
147-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.DependencyModel.dll" />
148-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Http.dll" />
149-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Identity.Core.dll" />
150-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Localization.dll" />
151-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Logging.Abstractions.dll" />
152-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Logging.Abstractions.Resource.dll" />
153-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Options.dll" />
154-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/Microsoft.Extensions.Primitives.dll" />
155-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Diagnostics.Contracts.dll" />
156-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.IO.Pipelines.dll" />
157-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Memory.dll" />
158-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Text.Encodings.Web.dll" />
159-
<ReferenceOnlyPackageDlls Remove="$(ReferencePackagesSourceDir)**/System.Threading.Channels.dll" />
160-
</ItemGroup>
161-
<!-- End Temporary workaround -->
162-
16392
<Message Importance="High" Text="Reference-only Packages:" />
16493
<Message Importance="High" Text="%(ReferenceOnlyPackages.Identity)" />
16594

build.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ export NUGET_PACKAGES="$scriptroot/packages/restored/"
6969
set -x
7070
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
7171

72+
# runtime 2.1.0 required for darc
73+
"$scriptroot/eng/common/dotnet-install.sh" -runtime dotnet -version 2.1.0
74+
7275
if [ "$alternateTarget" == "true" ]; then
7376
CLIPATH="$scriptroot/.dotnet"
7477
SDKPATH="$CLIPATH/sdk/$SDK_VERSION"

dir.props

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,9 @@
5858
<ToolPackageExtractDir>$(ToolsDir)source-built/</ToolPackageExtractDir>
5959
<ToolsLocalDir>$(ProjectDir)tools-local/</ToolsLocalDir>
6060
<TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
61-
<DarcDll>$(ToolsLocalDir)arcade-services/artifacts/bin/Microsoft.DotNet.Darc/Release/netcoreapp3.0/Microsoft.DotNet.Darc.dll</DarcDll>
61+
<DarcInstallDir>$(DotNetCliToolDir)tools/</DarcInstallDir>
62+
<DarcVersion>$([System.IO.File]::ReadAllText('$(ProjectDir)DarcVersion.txt').Trim())</DarcVersion>
63+
<DarcDll>$(DotNetCliToolDir)tools/.store/microsoft.dotnet.darc/$(DarcVersion)/microsoft.dotnet.darc/$(DarcVersion)/tools/netcoreapp2.1/any/Microsoft.DotNet.Darc.dll</DarcDll>
6264
<TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
6365
<SourceBuildTasksAssembly>$(TasksBinDir)Microsoft.DotNet.SourceBuild.Tasks.dll</SourceBuildTasksAssembly>
6466
<XPlatTasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks.XPlat/bin/Debug/netstandard2.0/</XPlatTasksBinDir>
@@ -193,12 +195,14 @@
193195
<!-- same thing here for CLI -->
194196
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64Version" Version="$(coresetupOutputPackageVersion)" />
195197
<!-- same thing here for toolset -->
196-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="$(coresetupOutputPackageVersion)" />
198+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimewinx64PackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
197199
<!-- same thing here for core-sdk -->
198-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreAppVersion)" />
199-
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreAppVersion)" />
200+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
201+
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
200202
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
201203
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinuxX64PackageVersion)" />
204+
<!-- core-sdk uses this property for ASP.NET blob directory -->
205+
<ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
202206
<!-- OSX needs the OSX version instead of Linux. We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing. -->
203207
<ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeOsxX64PackageVersion)" DoNotOverwrite="true" />
204208
</ItemGroup>

eng/common/darc-init.sh

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
source="${BASH_SOURCE[0]}"
44
darcVersion=''
55
versionEndpoint="https://maestro-prod.westus2.cloudapp.azure.com/api/assets/darc-version?api-version=2019-01-16"
6+
verbosity=m
67

78
while [[ $# > 0 ]]; do
89
opt="$(echo "$1" | awk '{print tolower($0)}')"
@@ -15,6 +16,14 @@ while [[ $# > 0 ]]; do
1516
versionEndpoint=$2
1617
shift
1718
;;
19+
--verbosity)
20+
verbosity=$2
21+
shift
22+
;;
23+
--toolpath)
24+
toolpath=$2
25+
shift
26+
;;
1827
*)
1928
echo "Invalid argument: $1"
2029
usage
@@ -34,7 +43,6 @@ while [[ -h "$source" ]]; do
3443
[[ $source != /* ]] && source="$scriptroot/$source"
3544
done
3645
scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
37-
verbosity=m
3846

3947
. "$scriptroot/tools.sh"
4048

@@ -48,17 +56,27 @@ function InstallDarcCli {
4856
InitializeDotNetCli
4957
local dotnet_root=$_InitializeDotNetCli
5058

51-
local uninstall_command=`$dotnet_root/dotnet tool uninstall $darc_cli_package_name -g`
52-
local tool_list=$($dotnet_root/dotnet tool list -g)
53-
if [[ $tool_list = *$darc_cli_package_name* ]]; then
54-
echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g)
59+
if [ -z "$toolpath" ]; then
60+
local tool_list=$($dotnet_root/dotnet tool list -g)
61+
if [[ $tool_list = *$darc_cli_package_name* ]]; then
62+
echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name -g)
63+
fi
64+
else
65+
local tool_list=$($dotnet_root/dotnet tool list --tool-path "$toolpath")
66+
if [[ $tool_list = *$darc_cli_package_name* ]]; then
67+
echo $($dotnet_root/dotnet tool uninstall $darc_cli_package_name --tool-path "$toolpath")
68+
fi
5569
fi
5670

57-
local arcadeServicesSource="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json"
71+
local arcadeServicesSource="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json"
5872

5973
echo "Installing Darc CLI version $darcVersion..."
6074
echo "You may need to restart your command shell if this is the first dotnet tool you have installed."
61-
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
75+
if [ -z "$toolpath" ]; then
76+
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity -g)
77+
else
78+
echo $($dotnet_root/dotnet tool install $darc_cli_package_name --version $darcVersion --add-source "$arcadeServicesSource" -v $verbosity --tool-path "$toolpath")
79+
fi
6280
}
6381

6482
InstallDarcCli

patches/arcade/0004-Import-PackageVersions-props-if-exists.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)