Commit graph

23656 commits

Author SHA1 Message Date
dotnet-maestro[bot]
39a522c001 Update dependencies from https://github.com/dotnet/sdk build 20220323.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22173.6 -> To Version 7.0.100-preview.4.22173.11

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.3.22171.6 -> To Version 7.0.0-preview.4.22172.7 (parent: Microsoft.NET.Sdk
2022-03-23 21:13:10 +00:00
dotnet-maestro[bot]
2cfeb15a2d Update dependencies from https://github.com/dotnet/sdk build 20220323.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22173.6 -> To Version 7.0.100-preview.3.22173.9

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.3.22171.6 -> To Version 7.0.0-preview.4.22172.7 (parent: Microsoft.NET.Sdk
2022-03-23 19:59:29 +00:00
dotnet-maestro[bot]
f63b49c1a6 Update dependencies from https://github.com/dotnet/sdk build 20220323.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22173.6 -> To Version 7.0.100-preview.3.22173.7

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.3.22171.6 -> To Version 7.0.0-preview.4.22172.7 (parent: Microsoft.NET.Sdk
2022-03-23 18:19:17 +00:00
dotnet-maestro[bot]
96c8cd8592
[main] Update dependencies from dotnet/sdk (#13376)
* Update dependencies from https://github.com/dotnet/sdk build 20220309.17

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22159.17

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22160.15

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22160.18

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.2 (parent: Microsoft.NET.Sdk

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

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.14 -> To Version 7.0.100-preview.3.22161.5

Dependency coherency updates

Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22160.15 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-23 17:56:05 +00:00
v-wuzhai
df07212ca6
Merge pull request #13451 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-23 02:32:49 -07:00
Jason Zhai
797dec7558 Merge branch 'release/6.0.3xx' into main 2022-03-22 23:14:38 -07:00
v-wuzhai
fdc723db25
Merge pull request #13449 from dotnet/darc-release/6.0.3xx-5b6d27f5-8771-4797-8016-bf0699db2a84
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-22 03:01:10 -07:00
dotnet-maestro[bot]
e1a3ae032d Update dependencies from https://github.com/dotnet/sdk build 20220321.21
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.21

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22166.2 -> To Version 6.0.300-preview.22171.2 (parent: Microsoft.NET.Sdk
2022-03-21 23:19:39 +00:00
dotnet-maestro[bot]
7eccbbbf34 Update dependencies from https://github.com/dotnet/sdk build 20220321.10
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.10
2022-03-21 19:24:03 +00:00
dotnet-maestro[bot]
785ff022a1 Update dependencies from https://github.com/dotnet/sdk build 20220321.8
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22168.1 -> To Version 6.0.300-preview.22171.8
2022-03-21 18:15:09 +00:00
v-wuzhai
de88eefa40
Merge pull request #13445 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-21 02:16:51 -07:00
Jason Zhai
9a6c3a3cfc Merge branch 'release/6.0.3xx' into main 2022-03-20 22:55:43 -07:00
Marc Paine
b8d6c48574
Merge pull request #13446 from dotnet/darc-release/6.0.3xx-cd564e94-6d89-4d89-8698-aca8db10add9
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-18 10:52:34 -07:00
dotnet-maestro[bot]
0bdd5cc952 Update dependencies from https://github.com/dotnet/sdk build 20220318.1
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22167.13 -> To Version 6.0.300-preview.22168.1

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-2.22165.9 -> To Version 4.2.0-2.22167.6 (parent: Microsoft.NET.Sdk
2022-03-18 11:13:08 +00:00
v-wuzhai
e45c7d15e5
Merge pull request #13444 from dotnet/darc-release/6.0.3xx-73538446-acb8-42b6-a0f0-f685b4980e01
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-18 03:01:18 -07:00
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-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
v-wuzhai
319b645486
Merge pull request #13435 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-17 00:25:27 -07:00
Jason Zhai
3da944a4d3 Merge branch 'release/6.0.3xx' into main 2022-03-16 23:17:48 -07: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
bed7a37b62
Merge pull request #13428 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-16 16:53:29 -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
Jason Zhai
74bb220c7b Merge branch 'release/6.0.3xx' into main 2022-03-15 20:01:24 -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
Marc Paine
e5ccd2f220
Merge pull request #13426 from manodasanW/patch-5
[main] Windows SDK projection update
2022-03-15 11:21:44 -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
Manodasan Wignarajah
587bac23dd
[main] Windows SDK projection update 2022-03-15 09:26:13 -07:00
Manodasan Wignarajah
7dbbf21923
[release/6.0.2xx] Windows SDK projection update 2022-03-15 09:25:17 -07:00
v-wuzhai
f9d834e483
Merge pull request #13412 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-15 02:57:00 -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
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
v-wuzhai
637a4d7bf1
Merge pull request #13414 from dotnet/darc-main-89780d3c-459e-41c2-95f7-6babc48a8622
[main] Update dependencies from dotnet/source-build-reference-packages
2022-03-15 00:58:28 -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
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
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
dotnet-maestro[bot]
9fefd90920 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220314.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22160.2 -> To Version 7.0.0-alpha.1.22164.1
2022-03-14 19:42:18 +00:00
MichaelSimons
8ec456efa7 Remove unnecessary runtime source-build patch 2022-03-14 14:46:02 +00:00
Michael Simons
146dc6feac Correct difference in source-build pipeline pool references 2022-03-14 09:18:08 -05:00
Jason Zhai
61d316d9df Merge branch 'release/6.0.3xx' into main 2022-03-14 02:50:13 -07:00