This fixes a regression in .NET 6 source-build compared to the .NET
5 source-build.
source-build wants to publish runtime symbols tarball for portable (eg,
linux-x64) and non-portable (eg, fedora.33-x64) RIDs here after a build.
Following .NET 5 conventions, I expected to see:
./artifacts/x64/Release/runtime/dotnet-runtime-symbols-fedora.34-x64-6.0.0.tar.gz
./artifacts/x64/Release/runtime/dotnet-runtime-symbols-linux-x64-6.0.0.tar.gz
Unfortunately, only the portable RID (linux-x64) tarball is present
after a full source-build in .NET 6.
It turns out this is a bug in our build scripts. We try and copy
binaries - including the symbol tarballs - after building each of
runtime-portable and runtime. However, the target dependency is wrong:
after `Build`, the intermediate package doesn't exist from the
just-built repo.
What ends up happening is that nothing is copied after building
runtime-portable. However, after building runtime, the runtime-portable
intermediate artifacts are found and copied over. So the end
build has portable RID symbos, but not the non-portable ones.
Fix that by changing the dependency of this target so it runs after
intermediate packages are available.
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21560.2 to 7.0.0-alpha.1.21561.11 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21560.2 to 7.0.0-alpha.1.21561.11 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21560.2 to 7.0.0-alpha.1.21561.11 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21560.2 to 7.0.0-alpha.1.21561.11 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21552.2 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21560.2 to 7.0.0-alpha.1.21561.11 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21560.1 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21561.1 to 7.0.0-alpha.1.21561.18 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-alpha.1.21558.1 to 7.0.0-alpha.1.21560.2 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21561.8 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21561.8 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.8 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21561.8 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 7.0.0-alpha.1.21561.8 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 7.0.0-alpha.1.21561.8 to 7.0.0-alpha.1.21561.9 (parent: Microsoft.NET.Sdk)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21561.4 to 7.0.0-alpha.1.21561.8 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21561.4 to 7.0.0-alpha.1.21561.8 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.4 to 7.0.0-alpha.1.21561.8 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21561.4 to 7.0.0-alpha.1.21561.8 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 7.0.0-alpha.1.21561.4 to 7.0.0-alpha.1.21561.8 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 7.0.0-alpha.1.21561.4 to 7.0.0-alpha.1.21561.8 (parent: Microsoft.NET.Sdk)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21558.1 to 7.0.100-1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21561.1 to 4.0.1-1.21561.4 (parent: Microsoft.NET.Sdk)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21561.2 to 7.0.0-alpha.1.21561.4 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21561.2 to 7.0.0-alpha.1.21561.4 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21561.2 to 7.0.0-alpha.1.21561.4 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21561.2 to 7.0.0-alpha.1.21561.4 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 7.0.0-alpha.1.21561.2 to 7.0.0-alpha.1.21561.4 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 7.0.0-alpha.1.21561.2 to 7.0.0-alpha.1.21561.4 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21560.6 to 4.0.1-1.21561.1 (parent: Microsoft.NET.Sdk)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
- Microsoft.WindowsDesktop.App.Ref: from 7.0.0-alpha.1.21530.1 to 7.0.0-alpha.1.21560.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21530.1 to 7.0.0-alpha.1.21560.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21530.1 to 7.0.0-alpha.1.21560.2 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Ref: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.App.Host.win-x64: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.DotNetHostResolver: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NETCore.Platforms: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21551.8 to 7.0.0-alpha.1.21561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21551.8 to 7.0.0-alpha.1.21561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21551.8 to 7.0.0-alpha.1.21561.2 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21551.8 to 7.0.0-alpha.1.21561.2 (parent: Microsoft.NET.Sdk)
- dotnet-dev-certs: from 7.0.0-alpha.1.21551.8 to 7.0.0-alpha.1.21561.2 (parent: Microsoft.NET.Sdk)
- dotnet-user-secrets: from 7.0.0-alpha.1.21551.8 to 7.0.0-alpha.1.21561.2 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21551.4 to 7.0.100-alpha.1.21554.1 (parent: Microsoft.NET.Sdk)
- Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21551.4 to 7.0.100-alpha.1.21554.1 (parent: Microsoft.NET.Sdk)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21530.1 to 7.0.0-alpha.1.21560.2 (parent: Microsoft.NET.Sdk)
- Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-alpha.1.21528.6 to 7.0.0-alpha.1.21552.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-alpha.1.21530.1 to 7.0.0-alpha.1.21560.2 (parent: Microsoft.NET.Sdk)
- Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-alpha.1.21528.4 to 7.0.0-alpha.1.21560.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
- Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211101-04 to 17.1.0-preview-20211105-01 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.ILLink.Tasks: from 7.0.100-1.21551.1 to 7.0.100-1.21558.1 (parent: Microsoft.NET.Sdk)
- Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21551.1 to 4.0.1-1.21560.6 (parent: Microsoft.NET.Sdk)
- Microsoft.Build: from 17.1.0-preview-21551-02 to 17.1.0-preview-21559-03 (parent: Microsoft.NET.Sdk)
- VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21551.1 to 7.0.0-alpha.1.21561.1 (parent: Microsoft.NET.Sdk)
- Microsoft.NET.Workload.Emscripten.Manifest-7.0.100: from 7.0.0-alpha.1.21527.1 to 7.0.0-alpha.1.21558.1 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
From Version 6.0.0-alpha.1.21521.1 -> To Version 6.0.0-alpha.1.21561.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Remove install location from Windows conclusion
DOTNETHOME will not always be set in the bundle.
It's only set when an existing installation was present and the bundle is run.
As a result this string is sometimes empty. Remove it to avoid confusion.
* Update src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
* Spanish
Co-authored-by: Maira Wenzel <mairaw@microsoft.com>
Co-authored-by: Carlos Sanchez <1175054+carlossanlop@users.noreply.github.com>