Commit graph

23680 commits

Author SHA1 Message Date
v-wuzhai
ef4c352c92
Merge pull request #13982 from dotnet/darc-release/6.0.1xx-e7e2a401-5a42-485b-927a-257e3456d809
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-06-14 22:40:33 -07:00
v-wuzhai
b2b27d6041
Merge pull request #13983 from dotnet/darc-release/6.0.4xx-1ee5e6cc-743d-4fa0-8da8-860c89867398
[release/6.0.4xx] Update dependencies from dotnet/arcade
2022-06-14 22:39:57 -07:00
v-wuzhai
61febc0ff7
Merge pull request #13984 from dotnet/darc-release/6.0.1xx-2d70cfad-1cbf-4ad7-9851-d1d3fcf05278
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-14 22:39:14 -07:00
v-wuzhai
acb851980d
Merge pull request #13956 from dotnet/darc-release/6.0.4xx-3d1323cf-ba28-4b83-b434-4887ab5fef9d
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-14 22:18:46 -07:00
dotnet-maestro[bot]
3b7c25c763 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:08 +00:00
dotnet-maestro[bot]
e3cd1424a0 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22309.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:02 +00:00
dotnet-maestro[bot]
57d6928a19 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:59:12 +00:00
dotnet-maestro[bot]
353bef46e2 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:48:03 +00:00
dotnet-bot
17ac46f848 Merge in 'release/6.0.3xx' changes 2022-06-14 23:46:23 +00:00
Manodasan Wignarajah
aac14e609b
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13976) 2022-06-14 16:34:46 -07:00
Manodasan Wignarajah
616cfe956e
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13975) 2022-06-14 16:34:39 -07:00
William Godbe
985a087175
Update asp.net templates (#13967) 2022-06-14 16:06:11 -07:00
Daniel Plaisted
2b6b35eb59
Merge pull request #13977 from manodasanW/release/6.0.4xx
[release/6.0.4xx] Add support for targeting Windows version 22621 and update Windows SDK projections
2022-06-14 16:02:40 -07:00
dotnet-maestro-bot
46ba3d49a8
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#13962)
* Update format of multiple /p parameters

* [release/6.0.3xx] Add razor-compiler to Source Build (#13652)

* Remove NuGet.Client source-build patches

Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-06-14 14:58:21 -07:00
Michael Simons
46f03f644c
Remove source-build nuget.client patch that was backported (#13972) 2022-06-14 20:41:51 +00:00
dotnet-bot
88bffe07a9 Merge in 'release/6.0.3xx' changes 2022-06-14 19:26:16 +00:00
William Godbe
c6cc5179c7
Update Asp.Net template (#13964) 2022-06-14 12:09:13 -07:00
William Godbe
9a4017803e
Update asp.net template (#13965) 2022-06-14 12:09:07 -07:00
dotnet-maestro[bot]
c26eab078e Update dependencies from https://github.com/dotnet/sdk build 20220614.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22314.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 18:32:05 +00:00
Sean Reeser
dc1bc88432 Merge commit '43f9b184817e4f48ba091d068a4d517c86daafd3' into internal-merge-6.0.3xx-2022-06-14-1031 2022-06-14 10:31:06 -07:00
Sean Reeser
caa27c6ae0 Merge commit 'e83a22f55807cbb06f22f80426ed4997c9e82822' into internal-merge-6.0.1xx-2022-06-14-1030 2022-06-14 10:30:57 -07:00
Manodasan Wignarajah
87fc91672a Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:23:16 -07:00
dotnet-maestro[bot]
003993b07f Update dependencies from https://github.com/dotnet/sdk build 20220613.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.15

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 07:49:07 +00:00
dotnet-maestro[bot]
afa31ba60b Update dependencies from https://github.com/dotnet/sdk build 20220613.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 06:28:07 +00:00
dotnet-maestro[bot]
d34b4bc9cb Update dependencies from https://github.com/dotnet/sdk build 20220613.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.11

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 05:16:12 +00:00
dotnet-maestro[bot]
4a38b3c148 Update dependencies from https://github.com/dotnet/sdk build 20220613.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.3 (parent: Microsoft.NET.Sdk
2022-06-13 22:49:44 +00:00
dotnet-bot
0b772a389e Merge in 'release/6.0.3xx' changes 2022-06-13 22:36:59 +00:00
Logan Bussell
85086602ad
[release/6.0.3xx] Add razor-compiler to Source Build (#13652) 2022-06-13 22:26:28 +00:00
dotnet-maestro[bot]
e585cf9284 Update dependencies from https://github.com/dotnet/sdk build 20220612.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22312.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22311.3 (parent: Microsoft.NET.Sdk
2022-06-13 03:18:55 +00:00
dotnet-bot
bfd4dc864a Merge in 'release/6.0.3xx' changes 2022-06-11 04:31:24 +00:00
Marc Paine
a8b81e9095
Merge pull request #13949 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-06-10 21:20:11 -07:00
Marc Paine
06251264f0
Merge pull request #13950 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-06-10 21:19:57 -07:00
Marc Paine
0ed33a50e3
Merge pull request #13941 from dotnet/darc-release/6.0.4xx-2bf079f6-3b9c-4109-9804-0c72eca720f3
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-10 13:59:58 -07:00
dotnet-bot
fb2794324a Merge in 'release/6.0.3xx' changes 2022-06-10 20:33:07 +00:00
Marc Paine
d62c7a24e4
Update format of multiple /p parameters 2022-06-10 13:23:02 -07:00
Marc Paine
28948923ce
Update format of multiple /p parameters 2022-06-10 13:22:26 -07:00
Marc Paine
862f52c85c
Merge pull request #13946 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-06-10 12:31:47 -07:00
Marc Paine
df9d0b48b1
Update .vsts-ci.yml 2022-06-10 12:28:33 -07:00
dotnet-maestro[bot]
1d99eb666f Update dependencies from https://github.com/dotnet/sdk build 20220610.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22310.5

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 6.0.400-preview.22306.2 -> To Version 6.0.400-preview.22309.5 (parent: Microsoft.NET.Sdk
2022-06-10 19:10:20 +00:00
dotnet-maestro[bot]
0ccc85fe51 Update dependencies from https://github.com/dotnet/sdk build 20220609.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.23

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 6.0.400-preview.22306.2 -> To Version 6.0.400-preview.22309.5 (parent: Microsoft.NET.Sdk
2022-06-10 06:56:34 +00:00
dotnet-bot
5e7bf21a15 Merge in 'release/6.0.3xx' changes 2022-06-10 06:35:36 +00:00
v-wuzhai
09abb090ac
Merge pull request #13947 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-06-09 23:24:36 -07:00
Jason Zhai
7a7252f19c Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-09 22:38:19 -07:00
dotnet-maestro[bot]
131e6ed24b Update dependencies from https://github.com/dotnet/sdk build 20220609.17
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.17

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.7 (parent: Microsoft.NET.Sdk
2022-06-10 04:09:51 +00:00
Jason Zhai
be2059a26b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-06-09 20:11:25 -07:00
v-wuzhai
ab5c14e9a6
Merge pull request #13945 from dotnet/darc-release/6.0.1xx-0eefc296-43fb-47af-9e31-a8871911972a
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-09 19:49:51 -07:00
dotnet-bot
3daa86c8c3 Merge in 'release/6.0.3xx' changes 2022-06-09 18:11:27 +00:00
Chris Rummel
17c1d67be5
[release/6.0.3xx] Handle NuGet package source mapping in source-build tasks. (#13733) 2022-06-09 12:57:38 -05:00
dotnet-maestro[bot]
787b7ce629 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220609.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22309.1
2022-06-09 15:03:29 +00:00
dotnet-maestro[bot]
9069c44814 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220609.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22302.1 -> To Version 6.0.0-servicing.22309.1
2022-06-09 15:03:25 +00:00