3 commits

Author	SHA1	Message	Date
msimons@microsoft.com	c694b83d08	Revert "Resolve conflicts in source-build patches" ... This reverts commit e7cfd82155fd1f5054d89f8a03fd0b4b34d1f5e9.	2021-10-15 15:44:14 +00:00
dotnet-maestro[bot]	e3a96ef1c7	[release/6.0.1xx] Update dependencies from dotnet/arcade (#12349) ... [release/6.0.1xx] Update dependencies from dotnet/arcade - Coherency Updates: - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21423-02 to 1.1.0-beta-21480-02 (parent: Microsoft.DotNet.Arcade.Sdk) - Resolve conflicts in source-build patches - Resolve conflicts in source-build patches	2021-10-14 19:33:05 +00:00
Davis Goodin	b7df57c2b4	[6.0.1xx] dotnet/arcade: Disable Workloads WiX dependency in source-build to remove prebuilt (#12290)	2021-10-11 15:08:32 -05:00