Commit graph

29380 commits

Author SHA1 Message Date
v-wuzhai
353bf7b909
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15802) 2023-03-15 03:11:14 -07:00
v-wuzhai
9f7fb0a5f3
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15801) 2023-03-15 03:10:31 -07:00
v-wuzhai
125eb19b1b
[automated] Merge branch 'release/7.0.3xx' => 'main' (#15797) 2023-03-15 03:09:45 -07:00
v-wuzhai
452029e626
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15795) 2023-03-15 03:09:09 -07:00
v-wuzhai
857d9529ba
[main] Update dependencies from dotnet/sdk (#15813) 2023-03-15 01:54:13 -07:00
v-wuzhai
33942f6dc6
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15812) 2023-03-15 01:53:51 -07:00
dotnet-maestro[bot]
958b74c5ef Update dependencies from https://github.com/dotnet/sdk build 20230314.38
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.31 -> To Version 8.0.100-preview.3.23164.38
2023-03-15 07:36:15 +00:00
dotnet-maestro[bot]
7a32cfc478 Update dependencies from https://github.com/dotnet/sdk build 20230314.37
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23164.30 -> To Version 7.0.300-preview.23164.37

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.6.0-preview.3.45 -> To Version 6.6.0-preview.3.46 (parent: Microsoft.NET.Sdk
2023-03-15 07:21:12 +00:00
Jason Zhai
0e0fb6b843 Merge branch 'release/7.0.3xx' 2023-03-15 00:19:11 -07:00
Jason Zhai
d1a1f83b94 Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-15 00:15:51 -07:00
v-wuzhai
8c21eaeea1
[main] Update dependencies from dotnet/sdk (#15798) 2023-03-15 00:12:14 -07:00
Jason Zhai
745d896a35 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-03-15 00:11:11 -07:00
Jason Zhai
83eb1aca7e Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-15 00:04:23 -07:00
v-wuzhai
bed7283d6d
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15811) 2023-03-15 00:02:24 -07:00
Jason Zhai
7c8984f406 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-03-15 00:01:29 -07:00
dotnet-maestro[bot]
52aeec5f31 Update dependencies from https://github.com/dotnet/sdk build 20230314.30
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23164.22 -> To Version 7.0.300-preview.23164.30

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.6.0-2.23152.6 -> To Version 4.6.0-2.23164.1 (parent: Microsoft.NET.Sdk
2023-03-15 03:04:47 +00:00
dotnet-maestro[bot]
e9bf76aad8 Update dependencies from https://github.com/dotnet/sdk build 20230314.31
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.31

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.Sdk
2023-03-15 02:46:40 +00:00
v-wuzhai
28e8a73b0e
[release/7.0.3xx] Update dependencies from dotnet/arcade (#15808) 2023-03-14 18:58:31 -07:00
v-wuzhai
57c9144764
[release/7.0.2xx] Update dependencies from dotnet/arcade (#15809) 2023-03-14 18:58:09 -07:00
v-wuzhai
4ae67a3c80
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15810) 2023-03-14 18:57:49 -07:00
dotnet-maestro[bot]
5be1640353 Update dependencies from https://github.com/dotnet/sdk build 20230314.24
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.24

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.Sdk
2023-03-15 00:45:03 +00:00
dotnet-maestro[bot]
6dc228043a Update dependencies from https://github.com/dotnet/sdk build 20230314.23
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.23

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.Sdk
2023-03-14 23:39:26 +00:00
dotnet-maestro[bot]
c43b7f00f5 Update dependencies from https://github.com/dotnet/sdk build 20230314.22
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23164.4 -> To Version 7.0.300-preview.23164.22
2023-03-14 22:51:03 +00:00
dotnet-maestro[bot]
f1d6cda9f0 Update dependencies from https://github.com/dotnet/arcade build 20230314.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3
2023-03-14 22:40:22 +00:00
dotnet-maestro[bot]
b0f9f6f3c7 Update dependencies from https://github.com/dotnet/arcade build 20230314.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3
2023-03-14 22:40:21 +00:00
dotnet-maestro[bot]
519872ba87 Update dependencies from https://github.com/dotnet/sdk build 20230314.20
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.20

Dependency coherency updates

VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,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.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64
 From Version 8.0.0-preview.3.23164.2 -> To Version 8.0.0-preview.3.23164.4 (parent: Microsoft.NET.Sdk
2023-03-14 22:28:14 +00:00
dotnet-maestro[bot]
68640a3ff2 Update dependencies from https://github.com/dotnet/sdk build 20230314.18
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.18

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 8.0.0-preview.3.23163.11 -> To Version 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk
2023-03-14 21:21:39 +00:00
Marc Paine
be832a92bb
6.0.15 just released to updating the version 2023-03-14 13:40:06 -07:00
dotnet-maestro[bot]
37b2615ffd Update dependencies from https://github.com/dotnet/sdk build 20230314.11
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.11

Dependency coherency updates

Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 8.0.0-preview.3.23163.11 -> To Version 8.0.0-preview.3.23164.1 (parent: Microsoft.NET.Sdk
2023-03-14 20:10:11 +00:00
Marc Paine
4568467fd8
Merging internal commits for release/6.0.1xx (#15790) 2023-03-14 12:53:42 -07:00
Marc Paine
5b75cc65bc
Merging internal commits for release/7.0.1xx (#15793) 2023-03-14 12:53:26 -07:00
Marc Paine
23e36ed23b
Automate template updates into dotnet/installer (#15778) 2023-03-14 12:53:17 -07:00
dotnet-maestro[bot]
01df29f5e3 Update dependencies from https://github.com/dotnet/sdk build 20230314.9
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.9

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build
 From Version 12.5.0-beta.23161.1 -> To Version 12.5.0-beta.23163.3 (parent: Microsoft.NET.Sdk
2023-03-14 19:10:04 +00:00
William Godbe
b957922f2c
Merge branch 'main' into wtgodbe/AutoTemplMain 2023-03-14 11:53:02 -07:00
Marc Paine
4ced9d90ae
Merging internal commits for release/6.0.3xx (#15791) 2023-03-14 11:18:51 -07:00
Marc Paine
d1fc6a8010
Merging internal commits for release/6.0.4xx (#15792) 2023-03-14 11:18:37 -07:00
Marc Paine
d8e8f7a055
Merging internal commits for release/7.0.2xx (#15794) 2023-03-14 11:18:26 -07:00
Marc Paine
7aa843653f
[7.0.3xx] Automate asp.net template updates into dotnet/installer (#15777) 2023-03-14 11:14:13 -07:00
dotnet-maestro[bot]
c5a29d06ee Update dependencies from https://github.com/dotnet/sdk build 20230314.8
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 8.0.100-preview.3.23164.7 -> To Version 8.0.100-preview.3.23164.8
2023-03-14 18:04:40 +00:00
dotnet-maestro[bot]
8d453fa004
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15786)
[release/7.0.3xx] Update dependencies from dotnet/sdk
2023-03-14 17:50:54 +00:00
dotnet-maestro[bot]
0060952987
[main] Update dependencies from dotnet/source-build-externals (#15788)
[main] Update dependencies from dotnet/source-build-externals
2023-03-14 17:50:40 +00:00
dotnet-maestro[bot]
488ee6e383
[main] Update dependencies from dotnet/sdk (#15789)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-preview.3.23163.12 to 8.0.0-preview.3.23164.2 (parent: Microsoft.NET.Sdk)
2023-03-14 17:48:11 +00:00
dotnet-maestro[bot]
f18eda4950
[main] Update dependencies from dotnet/arcade (#15787)
[main] Update dependencies from dotnet/arcade
2023-03-14 17:46:46 +00:00
Marc Paine
446fafdc40
[7.0.2xx] Automate asp.net template updates into dotnet/installer (#15776) 2023-03-14 10:45:47 -07:00
Sean Reeser
b72a2d6071 Merge commit '6c74320bc3ea80d03493a069e4c424b19a5a1983' into internal-merge-7.0.2xx-2023-03-14-1018 2023-03-14 10:18:09 -07:00
Sean Reeser
7201dc8b2a Merge commit '5c12d17216f411669c0beb40956249ec48bcb818' into internal-merge-7.0.1xx-2023-03-14-1017 2023-03-14 10:17:58 -07:00
Sean Reeser
57bd78c21d Merge commit 'd8659ea151969e597785b032f243b7a537c620c1' into internal-merge-6.0.4xx-2023-03-14-1014 2023-03-14 10:14:19 -07:00
Sean Reeser
11ed90bade Merge commit '99a8aa0f90564eefc820dc45d1845fb6bd6dd282' into internal-merge-6.0.3xx-2023-03-14-1014 2023-03-14 10:14:10 -07:00
Sean Reeser
5db3cae3e2 Merge commit '1d8c2d93c0415677f39802a8d47c8aae7c2215a3' into internal-merge-6.0.1xx-2023-03-14-1013 2023-03-14 10:13:59 -07:00
William Godbe
00d8c2d502
Merge branch 'main' into wtgodbe/AutoTemplMain 2023-03-14 09:24:50 -07:00