Commit graph

22757 commits

Author SHA1 Message Date
dotnet-bot
16b964c975 Merge in 'release/6.0.1xx' changes 2021-12-14 23:23:33 +00:00
William Godbe
9b9ab15577
Update asp.net template versions (#12764) 2021-12-14 23:22:30 +00:00
dotnet-bot
8df33494b1 Merge in 'release/6.0.1xx' changes 2021-12-14 22:35:54 +00:00
dotnet-maestro[bot]
cad6ba8de3
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12842)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-14 22:34:55 +00:00
William Godbe
6dc017e0d9
Update asp.net template versions (#12765) 2021-12-14 22:32:13 +00:00
dotnet-bot
bd2c4ef3db Merge in 'release/6.0.1xx' changes 2021-12-14 22:30:35 +00:00
Omair Majid
4e9a0b6434
[release/6.0.1xx] Add some additional distros to the CI matrix (#12141) 2021-12-14 16:29:29 -06:00
dotnet-maestro[bot]
0ce201ed68
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211214.1 (#12841)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-14 22:04:25 +00:00
dotnet-bot
fd122a4e52 Merge in 'release/6.0.1xx' changes 2021-12-14 19:56:36 +00:00
dotnet-maestro[bot]
4de9f12e2e
Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12837)
[release/6.0.1xx] Update dependencies from dotnet/arcade
2021-12-14 19:55:22 +00:00
dotnet-maestro[bot]
f2abec4abd
Update dependencies from https://github.com/dotnet/arcade build 20211209.4 (#12834)
[release/6.0.2xx] Update dependencies from dotnet/arcade
2021-12-14 19:34:03 +00:00
Marc Paine
8dd5cd5d9e
Merge pull request #12832 from dotnet/marcpopMSFT-workloadmanifesttext602xx
Fix the logic that generates the fallback text file
2021-12-14 11:15:37 -08:00
Marc Paine
2e29acc142 Fix the logic that generates the fallback text file 2021-12-14 10:40:55 -08:00
Sean Reeser
2c5af44dde Merge commit 'ef49f6213a0256d5e8b10d9a573f8dd355bc8593' into internal-merge-6.0.1xx-2021-12-14-0946 2021-12-14 09:46:54 -08:00
DotNet Bot
e88edad0ea [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-14 08:43:37 +00:00
dotnet-bot
ef5a467861 Merge in 'release/6.0.1xx' changes 2021-12-13 18:42:36 +00:00
dotnet-maestro[bot]
5e966fbff4
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12812)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-13 18:40:48 +00:00
dotnet-maestro[bot]
d8c9c22117
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211213.1 (#12811)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-13 18:20:28 +00:00
dotnet-maestro[bot]
74d83b52e6
Update dependencies from https://github.com/dotnet/sdk build 20211212.4 (#12803)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21609.2 to 6.0.200-alpha.1.21609.4 (parent: Microsoft.NET.Sdk)
2021-12-13 05:02:12 +00:00
DotNet Bot
c8a4f55c85 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-11 01:53:10 +00:00
dotnet-maestro[bot]
9471f49b4a
Update dependencies from https://github.com/dotnet/sdk build 20211210.13 (#12799)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-12-11 00:11:30 +00:00
dotnet-maestro[bot]
19990a7cb8
Update dependencies from https://github.com/dotnet/sdk build 20211210.11 (#12797)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-12-10 22:50:18 +00:00
dotnet-maestro[bot]
70187fdee0
Update dependencies from https://github.com/dotnet/sdk build 20211210.9 (#12792)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.2.0-preview-20211209-03 to 17.2.0-preview-20211210-01 (parent: Microsoft.NET.Sdk)
2021-12-10 20:06:34 +00:00
dotnet-maestro[bot]
948cabe984
Update dependencies from https://github.com/dotnet/sdk build 20211210.7 (#12788)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.1-beta.21608.2 to 12.0.1-beta.21610.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21608.2 to 6.0.2-beta.21610.1 (parent: Microsoft.NET.Sdk)
2021-12-10 18:59:46 +00:00
Marc Paine
9979d00dd5 Fix the logic that generates the fallback text file 2021-12-10 10:10:05 -08:00
dotnet-maestro[bot]
d3ff42d64f
[release/6.0.2xx] Update dependencies from dotnet/sdk (#12757)
* Update dependencies from https://github.com/dotnet/sdk build 20211207.3

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.3

Dependency coherency updates

Microsoft.Build
 From Version 17.1.0-preview-21579-05 -> To Version 17.1.0-preview-21607-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.5

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.32

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 17.1.0-preview-20211130-04 -> To Version 17.1.0-preview-20211203-01 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21607.34

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21608.7

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 12.0.1-beta.21606.4 -> To Version 12.0.1-beta.21607.3 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21609.16

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.2

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

* Disable tarball build in PR validation

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

Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.200-preview.21607.2 -> To Version 6.0.200-preview.21610.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.200-alpha.1.21572.3 -> To Version 6.0.200-alpha.1.21609.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-12-10 07:17:36 -08:00
dotnet-bot
ab1002a48a Merge in 'release/6.0.1xx' changes 2021-12-09 19:38:35 +00:00
Dan Seefeldt
65bbb444f8
Remove un-needed version properties (#12683) 2021-12-09 13:37:17 -06:00
dotnet-bot
f7c54abd06 Merge in 'release/6.0.1xx' changes 2021-12-08 18:58:35 +00:00
Daniel Plaisted
dca53077da
Merge pull request #12773 from MichaelSimons/issue-12673
Refactor build status section to expose public builds
2021-12-08 10:56:03 -08:00
dotnet-bot
3c6e939586 Merge in 'release/6.0.1xx' changes 2021-12-08 17:32:31 +00:00
dotnet-maestro[bot]
d7fe077c1b
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12771)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-08 17:31:24 +00:00
Michael Simons
83418957c1 Refactor build status section to expose public builds 2021-12-08 11:27:56 -06:00
dotnet-maestro[bot]
38a612150c
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211208.1 (#12772)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-08 17:00:56 +00:00
dotnet-maestro[bot]
b0cb972aeb
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12769)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-08 02:24:22 +00:00
dotnet-bot
fb077b968e Merge in 'release/6.0.1xx' changes 2021-12-07 23:09:39 +00:00
dotnet-maestro[bot]
974ce5fc15
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.8 (#12770)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-07 23:07:23 +00:00
dotnet-bot
2b3f0a74dd Merge in 'release/6.0.1xx' changes 2021-12-07 21:40:29 +00:00
dotnet-maestro[bot]
d3d3005612
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12768)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-07 21:39:04 +00:00
dotnet-maestro[bot]
6d5146068a
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211207.3 (#12767)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-07 21:03:27 +00:00
dotnet-bot
049b07e5c0 Merge in 'release/6.0.1xx' changes 2021-12-07 19:32:17 +00:00
vseanreesermsft
a58ef7bebe
Update branding to 6.0.102 (#12761) 2021-12-07 10:31:37 -08:00
dotnet-maestro[bot]
26f2b4eb6c
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20211111.1 (#12756)
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2021-12-07 16:06:45 +00:00
dotnet-maestro[bot]
567091840a
Update dependencies from https://github.com/dotnet/sdk build 20211207.2 (#12755)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-12-07 14:35:36 +00:00
dotnet-maestro[bot]
c56d85f7de
Update dependencies from https://github.com/dotnet/sdk build 20211206.13 (#12753)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.1-beta.21572.8 to 12.0.1-beta.21606.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21572.8 to 6.0.2-beta.21606.4 (parent: Microsoft.NET.Sdk)
2021-12-07 06:48:30 +00:00
Michael Simons
b10c4644ea
Re-enable web https smoke tests (#12739) 2021-12-06 20:50:23 -06:00
dotnet-maestro[bot]
438991aeba
Update dependencies from https://github.com/dotnet/sdk build 20211206.10 (#12752)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-12-07 01:46:04 +00:00
DotNet Bot
769ba58be1 [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2021-12-07 00:13:42 +00:00
dotnet-maestro[bot]
d1d94727f5
Update dependencies from https://github.com/dotnet/sdk build 20211206.5 (#12749)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-12-06 23:21:16 +00:00
Michael Simons
b6a61fcd0d
source-build changes to support release/6.0.2xx (#12750)
* Update dotnet version used by source-build

* Additional source-build patches

* Bring in msbuild patch for committed changes that haven't flown
2021-12-06 17:17:53 -06:00