Commit graph

23323 commits

Author SHA1 Message Date
Matt Mitchell
6ed57a137b
Merge pull request #13601 from vseanreesermsft/internal-merge-6.0.2xx-2022-04-12-1157
Merging internal commits for release/6.0.2xx
2022-04-13 07:47:32 -07:00
Matt Mitchell
40f5222a0d
Merge pull request #13602 from vseanreesermsft/internal-merge-6.0.1xx-2022-04-12-1157
Merging internal commits for release/6.0.1xx
2022-04-13 07:47:09 -07:00
v-wuzhai
319635a0eb
Merge pull request #13609 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-13 02:05:41 -07:00
Jason Zhai
abb75d6449 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-13 01:09:20 -07:00
v-wuzhai
8fd1aa5965
Merge pull request #13603 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-12 19:43:04 -07:00
Jason Zhai
aec691922a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-12 18:53:50 -07:00
NET Source-Build Bot
8d32713c4e
update global.json and Versions.props for .NET SDK 6.0.104 (#13607) 2022-04-13 00:36:01 +00:00
Marc Paine
32eddb2738
Merge pull request #13594 from dotnet/darc-release/6.0.3xx-3b451efb-a515-4325-8d94-febe2965868c
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-12 14:56:17 -07:00
William Godbe
f001fc0f1f
[6.0.3xx] Update asp.net template versions (#13545) 2022-04-12 20:37:09 +00:00
William Godbe
753cdcf45f
[6.0.2xx] Update asp.net template versions (#13544) 2022-04-12 20:30:37 +00:00
William Godbe
aca24a9b5a
[6.0.1xx] Update asp.net template versions (#13543) 2022-04-12 20:27:03 +00:00
Marc Paine
0870a9684a
Merge pull request #13534 from vseanreesermsft/branding-6.0.203-2022-04-05-1259
Update branding to 6.0.203
2022-04-12 12:04:42 -07:00
Marc Paine
608561c76d
Merge pull request #13533 from vseanreesermsft/branding-6.0.105-2022-04-05-1258
Update branding to 6.0.105
2022-04-12 12:04:31 -07:00
Sean Reeser
72e5a349ae Merge commit '915d644e451858f4f7c6e1416ea202695ddd54fb' into internal-merge-6.0.1xx-2022-04-12-1157 2022-04-12 11:57:14 -07:00
Sean Reeser
8e7442b2d8 Merge commit 'f8a55617d250f5db711e7425428671da5f1967a3' into internal-merge-6.0.2xx-2022-04-12-1157 2022-04-12 11:57:07 -07:00
dotnet-maestro[bot]
07b0deb73e Update dependencies from https://github.com/dotnet/sdk build 20220412.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22212.1 -> To Version 6.0.300-preview.22212.3

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-4.22208.7 -> To Version 4.2.0-4.22211.2 (parent: Microsoft.NET.Sdk
2022-04-12 10:21:01 +00:00
v-wuzhai
ff4f7f50e5
Merge pull request #13593 from dotnet/darc-release/6.0.3xx-963e9e8a-6b30-402e-96ad-89fb8bb7f440
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-12 03:02:17 -07:00
dotnet-maestro[bot]
4f10b352b0 Update dependencies from https://github.com/dotnet/sdk build 20220412.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22211.12 -> To Version 6.0.300-preview.22212.1
2022-04-12 09:14:44 +00:00
v-wuzhai
2490c7faad
Merge pull request #13590 from dotnet/darc-release/6.0.3xx-9c459c82-3b40-4875-9d6f-a3c362a43833
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-11 19:12:53 -07:00
v-wuzhai
9fc7e547cb
Merge pull request #13581 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-11 19:01:05 -07:00
dotnet-maestro[bot]
d42ff0c17c Update dependencies from https://github.com/dotnet/sdk build 20220411.12
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22210.6 -> To Version 6.0.300-preview.22211.12
2022-04-12 00:12:37 +00:00
v-wuzhai
5d5fbd3637
Merge pull request #13582 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-11 02:22:15 -07:00
v-wuzhai
d07ad95997
Merge pull request #13585 from dotnet/darc-release/6.0.3xx-ca59434f-5e2d-4706-87ef-eccb61be39a4
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-11 02:22:01 -07:00
dotnet-maestro[bot]
e021414cb1 Update dependencies from https://github.com/dotnet/sdk build 20220410.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22210.3 -> To Version 6.0.300-preview.22210.6
2022-04-11 05:52:41 +00:00
v-wuzhai
73cfd960ac
Merge pull request #13584 from dotnet/darc-release/6.0.3xx-2f6fd60c-8bfe-43e8-8ca2-1bea749158cd
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-10 21:38:02 -07:00
Jason Zhai
56d30baaa2 Restore the version.details.xml file 2022-04-10 21:29:05 -07:00
Jason Zhai
3d646a39f9 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-04-10 21:23:03 -07:00
Jason Zhai
78655d99e9 Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-10 21:18:37 -07:00
dotnet-maestro[bot]
c0fd61cd73 Update dependencies from https://github.com/dotnet/sdk build 20220410.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22208.8 -> To Version 6.0.300-preview.22210.3

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 17.2.0-release-20220404-03 -> To Version 17.2.0-release-20220408-11 (parent: Microsoft.NET.Sdk
2022-04-11 03:06:16 +00:00
v-wuzhai
d1a55f7846
Merge pull request #13577 from dotnet/darc-release/6.0.1xx-3ce6dc03-cb8b-45ed-80e7-70094f83ea24
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-10 18:36:49 -07:00
v-wuzhai
21c3d887ce
Merge pull request #13576 from dotnet/darc-release/6.0.2xx-262d7395-2db8-45d0-bf52-4636b0064250
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-10 18:36:22 -07:00
v-wuzhai
b47ce1a677
Merge pull request #13575 from dotnet/darc-release/6.0.3xx-080f9333-1741-4b05-9c6c-37bde566ad25
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-10 18:35:32 -07:00
v-wuzhai
b4c72ef480
Merge pull request #13569 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.2xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.2xx'
2022-04-10 18:29:57 -07:00
Chet Husk
fac82769ce
Merge pull request #13572 from dotnet/darc-release/6.0.3xx-ac4f3972-dd08-4044-bc86-d1f31e2cd4c7
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-04-09 10:38:03 -05:00
dotnet-maestro[bot]
6a49bdbb96 Update dependencies from https://github.com/dotnet/sdk build 20220408.8
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22208.8

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build
 From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22208.4 (parent: Microsoft.NET.Sdk
2022-04-09 04:36:02 +00:00
dotnet-maestro[bot]
d4412426a7 Update dependencies from https://github.com/dotnet/sdk build 20220408.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22208.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build
 From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22207.2 (parent: Microsoft.NET.Sdk
2022-04-08 15:25:03 +00:00
dotnet-maestro[bot]
e70e2b3f49 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.1
2022-04-08 15:11:36 +00:00
dotnet-maestro[bot]
8d174cfc31 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.1
2022-04-08 15:11:36 +00:00
dotnet-maestro[bot]
2191fb7009 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220408.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22207.2 -> To Version 6.0.0-servicing.22208.1
2022-04-08 15:11:32 +00:00
dotnet-maestro[bot]
8af385c881
Update dependencies from https://github.com/dotnet/test-templates build 20220407.1 (#13561)
[release/6.0.3xx] Update dependencies from dotnet/test-templates
2022-04-08 14:08:45 +00:00
dotnet-maestro[bot]
db4de9426a Update dependencies from https://github.com/dotnet/sdk build 20220407.25
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22207.25

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build
 From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22207.2 (parent: Microsoft.NET.Sdk
2022-04-08 05:14:50 +00:00
dotnet-maestro[bot]
f33f0a4b2e Update dependencies from https://github.com/dotnet/sdk build 20220407.19
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22207.19

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22204.1 -> To Version 6.0.300-preview.22207.2 (parent: Microsoft.NET.Sdk
2022-04-08 04:10:16 +00:00
dotnet-maestro[bot]
c4566eaf2d Update dependencies from https://github.com/dotnet/sdk build 20220407.14
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22207.3 -> To Version 6.0.300-preview.22207.14
2022-04-08 03:04:24 +00:00
Jason Zhai
316d39733a Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-04-07 19:50:15 -07:00
v-wuzhai
1827808c3e
Merge pull request #13563 from dotnet/darc-release/6.0.3xx-e910b4ea-b20a-4706-8b89-bfe2897e41bd
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-07 19:00:18 -07:00
v-wuzhai
3a3b3de8fe
Merge pull request #13564 from dotnet/darc-release/6.0.2xx-b566dce8-afe0-4c4c-971f-e5c64e675372
[release/6.0.2xx] Update dependencies from dotnet/source-build-reference-packages
2022-04-07 18:59:43 -07:00
v-wuzhai
9726fc58d3
Merge pull request #13566 from dotnet/darc-release/6.0.1xx-aa59b178-eb05-40a8-8d83-41ca14136141
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-04-07 18:59:05 -07:00
v-wuzhai
a979b210de
Merge pull request #13567 from dotnet/darc-release/6.0.2xx-03571cb4-623f-407a-945b-a140c1375553
[release/6.0.2xx] Update dependencies from dotnet/arcade
2022-04-07 18:58:33 -07:00
v-wuzhai
810e6c3bed
Merge pull request #13568 from dotnet/darc-release/6.0.3xx-d94bf39e-c499-423a-90a1-4e410fe2d678
[release/6.0.3xx] Update dependencies from dotnet/arcade
2022-04-07 18:57:59 -07:00
Daniel Plaisted
1a474c0767
Merge pull request #13548 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-04-07 13:05:26 -07:00