Commit graph

23610 commits

Author SHA1 Message Date
Marc Paine
667bae46a4
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-12 15:53:48 -07:00
dotnet-maestro[bot]
50bd0f6567 Update dependencies from https://github.com/dotnet/sdk build 20220712.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.14
2022-07-12 21:49:35 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
William Godbe
853275fdcb
Update Asp.Net template (#14111) 2022-07-12 12:13:55 -07:00
William Godbe
e22344fc38
Update asp.net template version (#14112) 2022-07-12 12:13:47 -07:00
Marc Paine
310d3c954f
Merge pull request #14114 from wtgodbe/internal-merge-6.0.3xx-2022-07-12-1057
Merging internal commits for release/6.0.3xx
2022-07-12 12:10:30 -07:00
Marc Paine
7bc522bbb6
Merge pull request #14115 from wtgodbe/internal-merge-6.0.1xx-2022-07-12-1057
Merging internal commits for release/6.0.1xx
2022-07-12 12:10:27 -07:00
Will Godbe
23a55e8341 Merge commit 'f6ec7508e3b20ad6fbc4ffa8ea4ed8818ffccc1d' into internal-merge-6.0.1xx-2022-07-12-1057 2022-07-12 10:57:21 -07:00
Will Godbe
4d81493240 Merge commit 'c857713418e715e1ca1a5c9fa5c360aaf71d2231' into internal-merge-6.0.3xx-2022-07-12-1057 2022-07-12 10:57:14 -07:00
Marc Paine
fcac10b492
Merge pull request #14082 from mmitche/branding-6.0.303-2022-07-05-1230
Update branding to 6.0.303
2022-07-12 09:17:07 -07:00
v-wuzhai
dd1baed893
Merge pull request #14105 from dotnet/darc-release/6.0.4xx-cbcfeb9b-5f60-40bd-9b18-50ae67fa66f9
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 19:20:41 -07:00
dotnet-maestro[bot]
6a9c07da4d Update dependencies from https://github.com/dotnet/sdk build 20220711.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.7 -> To Version 6.0.400-preview.22361.12
2022-07-11 23:21:37 +00:00
Grace Kulin
d8947e4fe2
Merge pull request #14104 from dotnet/darc-release/6.0.4xx-625886fc-478d-4959-9e60-accd4b88bc0e
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 14:58:24 -07:00
dotnet-maestro[bot]
ef25719e7c Update dependencies from https://github.com/dotnet/sdk build 20220711.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22356.20 -> To Version 6.0.400-preview.22361.7

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.3.0-release-20220627-03 -> To Version 17.3.0-release-20220708-01 (parent: Microsoft.NET.Sdk
2022-07-11 17:11:21 +00:00
v-wuzhai
49f92edbb1
Merge pull request #14097 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-07-10 18:19:54 -07:00
MichaelSimons
d8580fbd61 Remove unneccessary source-build patch 2022-07-08 15:01:48 +00:00
Jason Zhai
46ac9ba248 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-07-07 19:22:36 -07:00
Marc Paine
5892113c0e
Merge pull request #14017 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-07-07 14:09:43 -07:00
dotnet-maestro[bot]
5eb8a241c8 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22357.1
2022-07-07 14:58:40 +00:00
v-wuzhai
c671341ee8
Merge pull request #14091 from dotnet/darc-release/6.0.4xx-8fbeedc3-67ca-409f-a41c-9e3cbef13571
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-06 19:07:41 -07:00
Marc Paine
af4b8739b3 run update dependencies. This may conflict when it tries to merge internally though 2022-07-06 16:49:00 -07:00
dotnet-maestro[bot]
b27b4ecf9f Update dependencies from https://github.com/dotnet/sdk build 20220706.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22355.11 -> To Version 6.0.400-preview.22356.20
2022-07-06 22:38:20 +00:00
Marc Paine
2e0a0276d8
Merge pull request #14075 from dotnet/Jason/UpdateAlpine313
Update alpine.3.13 to the new one
2022-07-06 14:47:43 -07:00
v-wuzhai
4070eca813
Merge pull request #14085 from dotnet/darc-release/6.0.4xx-f2281bb1-7336-4277-a761-882bf8f46349
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-05 19:12:33 -07:00
dotnet-maestro[bot]
e77bb371d7 Update dependencies from https://github.com/dotnet/sdk build 20220705.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.11 -> To Version 6.0.400-preview.22355.11
2022-07-06 00:32:05 +00:00
Marc Paine
0479ac2dc2
Merge pull request #14081 from mmitche/branding-6.0.108-2022-07-05-1230
Update branding to 6.0.108
2022-07-05 13:33:06 -07:00
Matt Mitchell
da15ec1396 Update branding to 6.0.303 2022-07-05 12:30:19 -07:00
Matt Mitchell
0e6c0b83d5 Update branding to 6.0.108 2022-07-05 12:30:15 -07:00
dotnet-maestro[bot]
4efe6994e3 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220705.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22355.1
2022-07-05 15:01:11 +00:00
Jason Zhai
ff9ad3ef23 Update alpine.3.13 to the new one 2022-07-05 00:38:26 -07:00
v-wuzhai
dc1792703b
Merge pull request #14070 from dotnet/darc-release/6.0.4xx-2b473fa1-5cd8-4c21-b16a-aa5de84ecccd
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-03 22:36:39 -07:00
dotnet-maestro[bot]
35e532cfe0 Update dependencies from https://github.com/dotnet/sdk build 20220701.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.1 -> To Version 6.0.400-preview.22351.11
2022-07-02 01:15:45 +00:00
dotnet-maestro[bot]
8a608b5043 Update dependencies from https://github.com/dotnet/sdk build 20220701.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.1 -> To Version 6.0.400-preview.22351.6
2022-07-02 00:11:20 +00:00
Marc Paine
0293c36d33
Merge pull request #14063 from dotnet/darc-release/6.0.4xx-57f4779e-c916-4b7b-89ed-46dcc16a80bd
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-01 14:18:47 -07:00
dotnet-maestro[bot]
5d309242cb Update dependencies from https://github.com/dotnet/sdk build 20220701.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22330.4 -> To Version 6.0.400-preview.22351.1

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 6.0.400-preview.22327.5 -> To Version 6.0.400-preview.22330.1 (parent: Microsoft.NET.Sdk
2022-07-01 09:38:58 +00:00
dotnet-maestro[bot]
7d9996016a Update dependencies from https://github.com/dotnet/sdk build 20220630.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22330.4 -> To Version 6.0.400-preview.22330.16

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 6.0.400-preview.22327.5 -> To Version 6.0.400-preview.22330.1 (parent: Microsoft.NET.Sdk
2022-07-01 03:51:36 +00:00
Marc Paine
da7c9ccceb
Merge pull request #14057 from dotnet/darc-release/6.0.4xx-eb208574-a237-4e77-b939-806f43984dfa
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-30 15:18:38 -07:00
Logan Bussell
33743c8b9d
Update aspnetcore patch 2022-06-30 10:03:32 -07:00
dotnet-maestro[bot]
c6a8b2fa24 Update dependencies from https://github.com/dotnet/sdk build 20220630.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22330.4

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-30 11:44:31 +00:00
dotnet-maestro[bot]
346856fb66 Update dependencies from https://github.com/dotnet/sdk build 20220630.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22330.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-30 08:29:24 +00:00
dotnet-maestro[bot]
5bed471c0f Update dependencies from https://github.com/dotnet/sdk build 20220629.27
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.27

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-30 07:02:40 +00:00
dotnet-maestro[bot]
0ef95c1796 Update dependencies from https://github.com/dotnet/sdk build 20220629.22
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.22

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-30 03:10:57 +00:00
dotnet-maestro[bot]
56fc94fa80 Update dependencies from https://github.com/dotnet/sdk build 20220629.17
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.17

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-30 01:23:42 +00:00
dotnet-maestro[bot]
090e994beb Update dependencies from https://github.com/dotnet/sdk build 20220629.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.16

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.Build
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-30 00:09:48 +00:00
dotnet-maestro[bot]
f620353e49 Update dependencies from https://github.com/dotnet/sdk build 20220629.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.12 -> To Version 6.0.400-preview.22329.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.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.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.5 -> To Version 6.0.6 (parent: Microsoft.NET.Sdk
2022-06-29 23:01:29 +00:00
Marc Paine
18e849b732
Merge pull request #14056 from dotnet/darc-release/6.0.4xx-e6ca9833-144b-492c-ab7f-bfaf8a1fc6e5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-29 15:41:42 -07:00
Marc Paine
8e4a978d55
Merge pull request #14053 from dotnet/marcpopMSFT-implicitversionsupdate
Update the 3.1 implicit versions
2022-06-29 15:06:52 -07:00
dotnet-maestro[bot]
8b99513f18 Update dependencies from https://github.com/dotnet/sdk build 20220629.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.10 -> To Version 6.0.400-preview.22329.12

Dependency coherency updates

Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 4.3.0-3.22328.29 -> To Version 4.3.0-3.22329.4 (parent: Microsoft.NET.Sdk
2022-06-29 21:42:06 +00:00
Marc Paine
dd61f98d91
Merge pull request #14054 from dotnet/darc-release/6.0.4xx-7d9d3ddf-d850-4260-b812-d4bab9c15240
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-29 14:27:27 -07:00
dotnet-maestro[bot]
ee4f22993d Update dependencies from https://github.com/dotnet/sdk build 20220629.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22329.2 -> To Version 6.0.400-preview.22329.10
2022-06-29 20:28:59 +00:00