Commit graph

23076 commits

Author SHA1 Message Date
dotnet-maestro[bot]
fd8148368c Update dependencies from https://github.com/dotnet/sdk build 20220317.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22166.21 -> To Version 6.0.300-preview.22167.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22164.2 -> To Version 12.0.3-beta.22165.2 (parent: Microsoft.NET.Sdk
2022-03-17 22:18:28 +00:00
dotnet-bot
343b232864 Merge in 'release/6.0.2xx' changes 2022-03-17 19:34:25 +00:00
Marc Paine
dfe7f2a2e5
Merge pull request #13442 from MichaelSimons/6.0.2xx-bundled-templates-fix
[release/6.0.2xx] Fix issue with BundledTemplates condition
2022-03-17 12:24:16 -07:00
dotnet-bot
1190bde43a Merge in 'release/6.0.1xx' changes 2022-03-17 18:48:02 +00:00
Marc Paine
3ee3845f3e
Merge pull request #13440 from MichaelSimons/bundled-templates-fix
[release/6.0.1xx] Fix issue with BundledTemplates condition
2022-03-17 11:36:19 -07:00
Michael Simons
57292e300c Make a source-build targetted fix to unblock release 2022-03-17 13:29:45 -05:00
Michael Simons
64addbe5bf Fix issue with BundledTemplates condition 2022-03-17 13:29:36 -05:00
Michael Simons
aff4e2553e Make a source-build targetted fix to unblock release 2022-03-17 12:38:23 -05:00
Michael Simons
fe2e9b9fb8 Fix issue with BundledTemplates condition 2022-03-17 10:57:41 -05:00
dotnet-maestro[bot]
532bd64d19
Update dependencies from https://github.com/dotnet/sdk build 20220316.21 (#13437)
[release/6.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Build: from 17.2.0-preview-22165-11 to 17.2.0-preview-22166-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.2.0-preview.2.107 to 6.2.0-preview.2.109 (parent: Microsoft.NET.Sdk)
2022-03-17 12:21:11 +00:00
Marc Paine
df77d499ae
Merge pull request #13427 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-03-16 16:53:45 -07:00
Marc Paine
2647692b78
Merge pull request #13430 from dotnet/darc-release/6.0.3xx-e2cd6255-6e44-4079-9eb4-04ef764573f5
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-16 16:52:53 -07:00
dotnet-maestro[bot]
45a7670092 Update dependencies from https://github.com/dotnet/sdk build 20220316.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.10

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22161.3 -> To Version 6.0.300-preview.22166.2 (parent: Microsoft.NET.Sdk
2022-03-16 22:35:54 +00:00
dotnet-maestro[bot]
5c8b478170 Update dependencies from https://github.com/dotnet/sdk build 20220316.3
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.3

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Build,NuGet.Build.Tasks
 From Version 6.0.300-preview.22161.3 -> To Version 6.0.300-preview.22165.1 (parent: Microsoft.NET.Sdk
2022-03-16 10:50:15 +00:00
dotnet-maestro[bot]
554e3e4578 Update dependencies from https://github.com/dotnet/sdk build 20220316.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.29 -> To Version 6.0.300-preview.22166.1

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.2.0-preview.2.91 -> To Version 6.2.0-preview.2.107 (parent: Microsoft.NET.Sdk
2022-03-16 09:35:19 +00:00
v-wuzhai
831a58ef30
Merge pull request #13429 from dotnet/darc-release/6.0.3xx-0de56aa1-ec85-4074-b932-2929a3c1bd27
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-16 02:18:20 -07:00
dotnet-maestro[bot]
15675c82df Update dependencies from https://github.com/dotnet/sdk build 20220315.29
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22165.4 -> To Version 6.0.300-preview.22165.29

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-2.22159.10 -> To Version 4.2.0-2.22165.9 (parent: Microsoft.NET.Sdk
2022-03-16 07:24:02 +00:00
dotnet-bot
63878e8eb2 Merge in 'release/6.0.2xx' changes 2022-03-16 01:31:08 +00:00
v-wuzhai
971d5c6e12
Merge pull request #13399 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-03-15 18:17:28 -07:00
Marc Paine
e4032f3cc3
Merge pull request #13420 from dotnet/darc-release/6.0.3xx-917cef8e-b735-4fb9-bb4d-0c2582b8d860
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-15 13:46:24 -07:00
dotnet-bot
dec307b02f Merge in 'release/6.0.2xx' changes 2022-03-15 18:11:39 +00:00
dotnet-bot
bd4fdd307c Merge in 'release/6.0.1xx' changes 2022-03-15 18:10:38 +00:00
Logan Bussell
bc714f97e9
[release/6.0.1xx] dotnet watch smoke test (#13392)
* add dotnet watch smoke test
2022-03-15 11:00:38 -07:00
Marc Paine
4938a371ec
Merge pull request #13425 from manodasanW/patch-4
[release/6.0.2xx] Windows SDK projection update
2022-03-15 10:59:26 -07:00
Marc Paine
b0516d4281
Merge pull request #13424 from manodasanW/patch-3
[release/6.0.1xx] Windows SDK projection update
2022-03-15 10:59:23 -07:00
Manodasan Wignarajah
7dbbf21923
[release/6.0.2xx] Windows SDK projection update 2022-03-15 09:25:17 -07:00
Manodasan Wignarajah
3ae2197673
[release/6.0.1xx] Windows SDK projection update 2022-03-15 09:22:56 -07:00
dotnet-maestro[bot]
9fd1cb9959 Update dependencies from https://github.com/dotnet/sdk build 20220315.4
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.4

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 12.0.3-beta.22161.4 -> To Version 12.0.3-beta.22164.2 (parent: Microsoft.NET.Sdk
2022-03-15 09:54:10 +00:00
Jason Zhai
b6ca26dd0b Merge branch 'release/6.0.1xx' into release/6.0.2xx 2022-03-15 01:56:45 -07:00
dotnet-maestro[bot]
75bdbcd4e1 Update dependencies from https://github.com/dotnet/sdk build 20220315.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22164.17 -> To Version 6.0.300-preview.22165.1
2022-03-15 08:47:11 +00:00
v-wuzhai
bfe04f5150
Merge pull request #13416 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-03-15 01:02:11 -07:00
v-wuzhai
f46f04d56a
Merge pull request #13415 from dotnet/darc-release/6.0.3xx-f56a538c-e7a5-4b4e-a48b-ddd77ddb167d
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-15 01:01:16 -07:00
Jason Zhai
afd76b47f4 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-15 00:01:35 -07:00
dotnet-maestro[bot]
681bebd311 Update dependencies from https://github.com/dotnet/sdk build 20220314.17
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.17
2022-03-14 23:55:32 +00:00
Marc Paine
6a8cc38b66
Merge pull request #13417 from dotnet/marcpopMSFT-fixduplicatepackages
Revert prior templatelocator and msbuildextension changes as they weren't required
2022-03-14 16:50:06 -07:00
dotnet-bot
634dc053b3 Merge in 'release/6.0.2xx' changes 2022-03-14 21:35:45 +00:00
dotnet-bot
3496d1dcb2 Merge in 'release/6.0.1xx' changes 2022-03-14 21:33:51 +00:00
Marc Paine
ab3ddec440 Revert prior changes as only the first and last change were actually needed. 2022-03-14 14:27:34 -07:00
dotnet-maestro[bot]
a882615ccd
Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220311.1 (#13409)
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:26:07 -07:00
dotnet-maestro[bot]
a2621d473d
Update dependencies from https://github.com/dotnet/arcade build 20220311.1 (#13405)
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22161.1

Dependency coherency updates

Microsoft.SourceBuild.Intermediate.source-build
 From Version 0.1.0-alpha.1.21616.4 -> To Version 0.1.0-alpha.1.21519.2 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-14 14:24:26 -07:00
Marc Paine
c365b60bad
Merge pull request #13390 from dotnet/marcpopMSFT-removemaui601
Remove maui workloads from 6.0.100
2022-03-14 14:22:49 -07:00
dotnet-maestro[bot]
b054be41f9 Update dependencies from https://github.com/dotnet/sdk build 20220314.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22163.5 -> To Version 6.0.300-preview.22164.6
2022-03-14 20:14:02 +00:00
v-wuzhai
4969ceaeee
Merge pull request #13413 from dotnet/darc-release/6.0.3xx-58f749c3-a750-4f1f-bec8-24a95951a3ff
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-14 01:07:32 -07:00
dotnet-maestro[bot]
d10705cf90 Update dependencies from https://github.com/dotnet/sdk build 20220313.5
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22161.14 -> To Version 6.0.300-preview.22163.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22161.2 -> To Version 12.0.3-beta.22161.4 (parent: Microsoft.NET.Sdk
2022-03-14 06:57:01 +00:00
dotnet-bot
8e99611236 Merge in 'release/6.0.1xx' changes 2022-03-14 05:50:45 +00:00
v-wuzhai
fbddf9d272
Merge pull request #13402 from dotnet/darc-release/6.0.1xx-d47734a0-c243-46cb-bfbc-f421dd29a3d5
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-03-13 22:40:48 -07:00
v-wuzhai
61e6adbc39
Merge pull request #13403 from dotnet/darc-release/6.0.3xx-3b54c85c-cc7f-491b-8592-7a98c5acb747
[release/6.0.3xx] Update dependencies from dotnet/arcade
2022-03-13 22:40:02 -07:00
v-wuzhai
22be0e23d2
Merge pull request #13406 from dotnet/darc-release/6.0.3xx-7d762506-e7c8-49ef-b540-d2c131d77a7d
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-13 22:39:24 -07:00
v-wuzhai
79975b9016
Merge pull request #13407 from dotnet/darc-release/6.0.1xx-449458a7-ce3a-4fbe-b142-21f6f78cf1b0
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-13 22:38:35 -07:00
v-wuzhai
41336c3545
Merge pull request #13408 from dotnet/darc-release/6.0.3xx-c85a0547-bf78-4a6b-a942-5ef1255675a0
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-13 22:37:51 -07:00