Commit graph

10069 commits

Author SHA1 Message Date
dotnet-maestro[bot]
1639aa0eb9
Update dependencies from https://github.com/dotnet/sdk build 20211022.10 (#12498)
[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.21521.5 to 6.0.0-rtm.21522.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21522.2 (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.21521.6 to 6.0.0-rtm.21522.1 (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.21521.7 to 6.0.0-rtm.21522.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-10-22 22:47:44 +00:00
dotnet-maestro[bot]
321cc8b49a
Update dependencies from https://github.com/dotnet/sdk build 20211022.8 (#12496)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.0.0-release-20210923-02 to 17.0.0 (parent: Microsoft.NET.Sdk)
2021-10-22 21:05:39 +00:00
Davis Goodin
17feead1af Remove PrivateSourceBuiltPrebuiltsPackageVersion: no prebuilts used 2021-10-22 14:20:58 -05:00
Davis Goodin
24f68585c3 Prepare source-build for prebuiltless build 2021-10-22 14:20:30 -05:00
Michael Simons
8cd48143b2
Merge pull request #12488 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-build
2021-10-22 08:23:59 -05:00
dotnet-maestro[bot]
2b005f3491
Update dependencies from https://github.com/dotnet/sdk build 20211021.16 (#12490)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.9 to 6.0.0-rtm.21521.10 (parent: Microsoft.NET.Sdk)
2021-10-22 08:05:35 +00:00
dotnet-maestro[bot]
1e7dbb727a
Update dependencies from https://github.com/dotnet/sdk build 20211021.15 (#12489)
[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.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.17 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.5 to 6.0.0-rtm.21521.9 (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.21520.13 to 6.0.0-rtm.21521.6 (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.21520.13 to 6.0.0-rtm.21521.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-10-22 06:10:31 +00:00
dotnet-maestro[bot]
7ae99ce59f
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12482)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0 to 6.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21521.1 to 6.0.0-rtm.21521.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.FSharp.Compiler: from 12.0.0-beta.21519.2 to 12.0.0-beta.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.1-beta.21519.2 to 6.0.1-beta.21521.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.0.0-preview-21515-03 to 17.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21520.9 to 6.0.0-rtm.21521.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.Manifest-6.0.100: from 6.0.0 to 6.0.0 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0)

 - edit sourcebuild metadata for stable versioning

 - Merge branch 'release/6.0.1xx' into darc-release/6.0.1xx-90ae2a78-bcca-4d8e-aedf-7eaa99dfc9bf
2021-10-22 05:34:48 +00:00
Michael Simons
ffcb72fbdc Update source-build prebuilts and previous source-build 2021-10-22 02:56:26 +00:00
dotnet-maestro[bot]
a2c7b5b277
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211021.1 (#12484)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-21 23:47:27 +00: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
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
MichaelSimons
b0217294ed aspnetcore stable version workaround 2021-10-21 17:19:38 +00: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
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
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
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
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
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
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
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
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
dotnet-maestro[bot]
cb356a0814 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.4
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21519.1 -> To Version 6.0.0-alpha.1.21519.4
2021-10-20 02:27:12 +00:00
Michael Simons
d64125fa04 Update source-build prebuilts and previous source-build 2021-10-20 01:03:22 +00:00
dotnet-maestro[bot]
df28f0a902 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.3
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21519.1 -> To Version 6.0.0-alpha.1.21519.3
2021-10-19 20:52:10 +00:00
dotnet-maestro[bot]
3d7f71a34d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-alpha.1.21519.1 -> To Version 6.0.0-alpha.1.21519.2
2021-10-19 19:00:16 +00:00
Michael Simons
d9c398514c
Merge pull request #12449 from MichaelSimons/update-sb
Update source-build prebuilts and previous source-built
2021-10-19 12:29:04 -05:00
Sarah Oslund
b60ceadd4e
Merge pull request #12447 from dotnet/darc-release/6.0.1xx-135dd21d-33ba-4356-881f-aa6e6f6b86be
[release/6.0.1xx] Update dependencies from dotnet/sdk
2021-10-19 09:03:04 -07:00
dotnet-maestro[bot]
6834fb954d
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211019.1 (#12450)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-19 14:42:47 +00:00
dotnet-maestro[bot]
927359a1d9 Update dependencies from https://github.com/dotnet/sdk build 20211019.2
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21519.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,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
2021-10-19 14:33:05 +00:00
Michael Simons
cf368887e0 Update source-build prebuilts and previous source-built 2021-10-19 12:50:56 +00:00
dotnet-maestro[bot]
4ad613d326 Update dependencies from https://github.com/dotnet/sdk build 20211018.56
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.56

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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
2021-10-19 06:35:13 +00:00
dotnet-maestro[bot]
5da1dd1b56 Update dependencies from https://github.com/dotnet/sdk build 20211018.54
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.54

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.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
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
2021-10-19 06:06:33 +00:00
dotnet-maestro[bot]
0f9e17c468 Update dependencies from https://github.com/dotnet/sdk build 20211018.53
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.53

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.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
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
2021-10-19 04:27:16 +00:00
dotnet-maestro[bot]
33753c85f0 Update dependencies from https://github.com/dotnet/sdk build 20211018.51
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.100-rtm.21518.48 -> To Version 6.0.100-rtm.21518.51

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.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
 From Version 6.0.0 -> To Version 6.0.0 (parent: Microsoft.NET.Sdk
2021-10-19 03:51:12 +00:00
dotnet-maestro[bot]
a896cafdfa
Update dependencies from https://github.com/dotnet/sdk build 20211018.48 (#12446)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21518.14 to 6.0.0-rtm.21518.18 (parent: Microsoft.NET.Sdk)
2021-10-19 03:49:29 +00:00
dotnet-maestro[bot]
e2cded5205
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.5 (#12445)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-19 03:32:53 +00:00
dotnet-maestro[bot]
e392cd5e6d
Update dependencies from https://github.com/dotnet/sdk build 20211018.45 (#12444)
[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.9 to 6.0.0-rtm.21518.12 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21518.9 to 6.0.0-rtm.21518.12 (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.2 to 6.0.0-rtm.21518.6 (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.5 to 6.0.0-rtm.21518.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2021-10-19 03:03:23 +00:00
dotnet-maestro[bot]
7f93d2a775
Update dependencies from https://github.com/dotnet/sdk build 20211018.42 (#12443)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21518.12 to 6.0.0-rtm.21518.14 (parent: Microsoft.NET.Sdk)
2021-10-19 01:14:34 +00:00
dotnet-maestro[bot]
5245649d9d
Update dependencies from https://github.com/dotnet/sdk build 20211018.41 (#12442)
[release/6.0.1xx] Update dependencies from dotnet/sdk
2021-10-19 00:43:59 +00:00
dotnet-maestro[bot]
87d65a7283
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211018.4 (#12440)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-10-19 00:09:14 +00:00