Commit graph

23888 commits

Author SHA1 Message Date
Jason Zhai
797dec7558 Merge branch 'release/6.0.3xx' into main 2022-03-22 23:14:38 -07:00
dotnet-maestro[bot]
c7abb23bff Update dependencies from https://github.com/dotnet/arcade build 20220321.2
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22157.6 -> To Version 7.0.0-beta.22171.2

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.7.0,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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,Microsoft.SourceBuild.Intermediate.source-build,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk
2022-03-22 12:32:37 +00:00
dotnet-maestro[bot]
3d1b624a88 Update dependencies from https://github.com/dotnet/sdk build 20220322.2
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22171.21 -> To Version 6.0.300-preview.22172.2

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.3-beta.22165.2 -> To Version 12.0.3-beta.22171.1 (parent: Microsoft.NET.Sdk
2022-03-22 11:13:38 +00: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
Michael Simons
46c2e6ddf7
Refactor build.sh to optimize PackageVersions.props retrieval (#13443) 2022-03-21 08:13:23 -05: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
Jacques Eloff
887e46cae6 Add SDL checks 2022-03-20 01:29:22 -07:00
dotnet-maestro[bot]
9e45a0f62c Update dependencies from https://github.com/dotnet/arcade build 20220318.2
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22157.6 -> To Version 7.0.0-beta.22168.2

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.7.0,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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,Microsoft.SourceBuild.Intermediate.source-build,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk
2022-03-19 12:29:46 +00: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]
3871b9c0bb Update dependencies from https://github.com/dotnet/arcade build 20220317.4
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22157.6 -> To Version 7.0.0-beta.22167.4

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.7.0,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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,Microsoft.SourceBuild.Intermediate.source-build,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk
2022-03-18 12:31:38 +00: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
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
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]
d53983f0cb Update dependencies from https://github.com/dotnet/arcade build 20220316.1
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 7.0.0-beta.22157.6 -> To Version 7.0.0-beta.22166.1

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.7.0,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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,Microsoft.SourceBuild.Intermediate.source-build,Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 7.0.0-preview.3.22151.6 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk
2022-03-17 12:33:02 +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
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
Marc Paine
e5ccd2f220
Merge pull request #13426 from manodasanW/patch-5
[main] Windows SDK projection update
2022-03-15 11:21:44 -07: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
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
Manodasan Wignarajah
3ae2197673
[release/6.0.1xx] Windows SDK projection update 2022-03-15 09:22:56 -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
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