Commit graph

22351 commits

Author SHA1 Message Date
Logan Bussell
374f8b5faa
add patch for lifting versions of roslyn prebuilts 2021-10-21 23:24:30 +00:00
Michael Simons
ef208026a2
Merge pull request #12481 from MichaelSimons/smoke-test-fixes
Workaround missing smoke-test prereqs
2021-10-21 17:24:56 -05:00
Michael Simons
c6594de659
Merge pull request #12465 from lbussell/build-roslyn-ca-features
[ArPow] Re-enable building Microsoft.CodeAnalysis.Features* in roslyn source-build
2021-10-21 15:41:26 -05:00
Michael Simons
dd90b93727
Merge pull request #12456 from dagood/rm-compilers-apphost-prebuilt
[release/6.0.1xx] Remove compiler project apphosts in source-build to remove apphost pack prebuilt
2021-10-21 15:39:27 -05:00
Matt Mitchell
2736213c68
Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding"" (#12471)
* Revert "Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470)"

This reverts commit 2bca7f450a.

* Workaround F# failures in tests

* No need for feed
2021-10-21 13:26:34 -07:00
Michael Simons
4e2d434f9a Workaround missing smoke-test prereqs 2021-10-21 19:38:00 +00:00
dotnet-maestro[bot]
228b577bf4
Update dependencies from https://github.com/dotnet/sdk build 20211021.8 (#12480)
[release/6.0.1xx] Update dependencies from dotnet/sdk
2021-10-21 18:57:08 +00:00
Michael Simons
8dc521acfa
Merge pull request #12477 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-build
2021-10-21 13:53:35 -05:00
Michael Simons
9326af2814
Merge pull request #12472 from dseefeld/fixMsBuild
[ArPow] Build msbuild for net472 and remove dependency on VS component
2021-10-21 13:29:55 -05:00
Michael Simons
1d2eee3e93
Merge pull request #12478 from mmitche/tweak-source-build-version
[release/6.0.1xx] Repoint source-build dependencies for runtime and aspnet
2021-10-21 13:00:58 -05:00
Davis Goodin
4674b50a34 Polish patch files: squash and add links 2021-10-21 12:49:15 -05:00
MichaelSimons
b0217294ed aspnetcore stable version workaround 2021-10-21 17:19:38 +00:00
Matt Mitchell
00a9212068 touch sb dir 2021-10-21 08:08:10 -07:00
Matt Mitchell
d87673683c Repoint source-build dependencies for runtime and aspnet 2021-10-21 08:06:10 -07:00
dotnet-maestro[bot]
f0fe351603
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12473)
* Update dependencies from https://github.com/dotnet/sdk build 20211020.26

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.26

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

* Update dependencies from https://github.com/dotnet/sdk build 20211020.31

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21520.31

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211021.1

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.1

* Update dependencies from https://github.com/dotnet/sdk build 20211021.2

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21521.1 -> To Version 6.0.100-rtm.21521.2

* Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20211021.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21520.1 -> To Version 6.0.100-rtm.21521.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2021-10-21 06:22:35 -07:00
Michael Simons
08fc0161cb Update source-build prebuilts and previous source-build 2021-10-21 12:32:30 +00:00
Michael Simons
023e0d7186 Update to not include CA.Collection package in source-build 2021-10-21 12:26:21 +00:00
Michael Simons
5bf7c8e147
Merge pull request #12466 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-built
2021-10-21 04:43:30 -05:00
Michael Simons
d38d8049ef
Merge pull request #12469 from dagood/prebuilt-apphost-aspnetcore
Fix patch removing aspnetcore apphost pack prebuilt
2021-10-21 04:33:04 -05:00
Michael Simons
f958686c51
Merge pull request #12475 from dotnet/darc-release/6.0.1xx-2e97760a-a081-4c03-88ad-f2a59ca3c0ef
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-21 02:22:19 -05:00
dotnet-maestro[bot]
f165d9f83a Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.5
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21520.4 -> To Version 6.0.0-alpha.1.21520.5
2021-10-21 06:48:43 +00:00
Michael Simons
544f720d0c Edits per code review 2021-10-21 04:32:21 +00:00
Michael Simons
b897fdf33d
Merge pull request #12474 from dotnet/darc-release/6.0.1xx-1be052a5-04e7-4567-99c2-aef9aa164b55
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-20 23:02:15 -05:00
dotnet-maestro[bot]
95a170d57b Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.4
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21520.3 -> To Version 6.0.0-alpha.1.21520.4
2021-10-21 03:20:26 +00:00
Michael Simons
16d51bd2aa Patch edits 2021-10-21 03:14:32 +00:00
Michael Simons
57ab17c67a Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into build-roslyn-ca-features 2021-10-21 00:56:31 +00:00
Michael Simons
375383b5fa Refactor patches to build additional projects 2021-10-21 00:55:46 +00:00
Davis Goodin
388ed26a0c Fix patch removing aspnetcore apphost pack prebuilt 2021-10-20 19:53:47 -05:00
Michael Simons
931367000f
Merge pull request #12468 from MichaelSimons/sb-format-references
[ArPow] Add roslyn-analyzers as format dependency
2021-10-20 19:19:43 -05:00
Michael Simons
63429f4050
Merge pull request #12463 from dotnet/darc-release/6.0.1xx-e3b95aaf-a8af-4ffe-aab0-6a120cfe0928
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-20 17:34:43 -05:00
Matt Mitchell
2bca7f450a
Revert "[release/6.0.1xx] Switch to stable RTM branding" (#12470) 2021-10-20 15:00:49 -07:00
dseefeld
d2e491a787 Build msbuild for net472 and remove depdency on VS 2021-10-20 21:59:04 +00:00
Michael Simons
b14e9a8e77 Add roslyn-analyzer as format dependency 2021-10-20 21:03:14 +00:00
Dan Seefeldt
25b214363d
Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-e3b95aaf-a8af-4ffe-aab0-6a120cfe0928 2021-10-20 15:03:41 -05:00
dotnet-maestro[bot]
01b2e9438d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.3
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21519.4 -> To Version 6.0.0-alpha.1.21520.3
2021-10-20 19:39:57 +00:00
Logan Bussell
a429914541
build Microsoft.CodeAnalysis.Features* in roslyn 2021-10-20 19:13:20 +00:00
Michael Simons
5f76b4d101 Update source-build prebuilts and previous source-built 2021-10-20 19:00:31 +00:00
dotnet-maestro[bot]
dca28b2c52
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12451)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.16 to 6.0.0-rtm.21519.11 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21518.20 to 6.0.0-rtm.21519.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21519.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21519.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21518.8 to 12.0.0-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21518.8 to 6.0.1-beta.21519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 6.0.100-1.21473.1 to 6.0.100-1.21519.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-6.21515.3 to 4.0.0-6.21519.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.source-build: from 0.1.0-alpha.1.21515.2 to 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk)

 - Revert removed feed

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patches

 - Merge branch 'darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Merge branch 'release/6.0.1xx' of https://github.com/dotnet/installer into darc-release/6.0.1xx-c4f44800-5848-4386-a894-0ae69ed74d6b

 - Resolve source-build patch conflicts
2021-10-20 18:30:45 +00:00
Marc Paine
960b7c6d5e
Merge pull request #12427 from mmitche/switch-to-stable
[release/6.0.1xx] Switch to stable RTM branding
2021-10-20 11:17:29 -07:00
dotnet-maestro[bot]
51a09f7e5c Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21519.4 -> To Version 6.0.0-alpha.1.21520.2
2021-10-20 17:52:00 +00:00
Michael Simons
d0676ba094
Merge pull request #12462 from MichaelSimons/linker-prebuilts
[ArPow] Eliminate linker prebuilts
2021-10-20 12:10:07 -05:00
Dan Seefeldt
757ac5dd9f
Flow version of Microsoft.CodeAnalysis.Common in roslyn (#12461) 2021-10-20 17:04:25 +00:00
dotnet-maestro[bot]
68be5005fd Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211020.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21519.4 -> To Version 6.0.0-alpha.1.21520.1
2021-10-20 16:17:59 +00:00
dotnet-maestro[bot]
83818e8038
[release/6.0.1xx] Update dependencies from dotnet/arcade (#12457)
* Update dependencies from https://github.com/dotnet/arcade build 20211019.3

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.21515.3 -> To Version 6.0.0-beta.21519.3

* Resolve source-build patch conflicts

* Restore the windowsdesktop feed

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2021-10-20 09:14:05 -07:00
Michael Simons
286b597ea3
Merge pull request #12397 from lbussell/roslyn-build-more-projects
[ArPow] Add patches for building more roslyn projects
2021-10-20 11:09:17 -05:00
Michael Simons
6e31861fea Eliminate linker prebuilts 2021-10-20 15:00:05 +00:00
Michael Simons
c7bc75eb87
Merge pull request #12454 from dotnet/darc-release/6.0.1xx-35a93be7-abc9-42c7-a6c0-6367d6827728
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-20 08:02:17 -05:00
Michael Simons
1f41ef82c9
Merge pull request #12458 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-build
2021-10-20 07:40:11 -05:00
Jason Zhai
63174a7e71 Restore the windowsdesktop feed 2021-10-19 22:57:37 -07:00
Michael Simons
a6871de837
Merge pull request #12455 from crummel/updateRoslynPatches
Update to Roslyn version of patch.
2021-10-19 22:14:19 -05:00