Commit graph

27657 commits

Author SHA1 Message Date
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
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]
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
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
Tom Deseyn
b672d91789
DotNetHelper: fix IsMonoRuntime being initialized before extracting the sdk. (#15646) 2023-03-14 08:03:24 -05:00
v-wuzhai
1c7063a8ef
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15785) 2023-03-14 02:25:59 -07:00
dotnet-maestro[bot]
bb2f4dc0df Update dependencies from https://github.com/dotnet/sdk build 20230314.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23163.13 -> To Version 7.0.300-preview.23164.2
2023-03-14 08:28:02 +00:00
v-wuzhai
8a79187347
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15783) 2023-03-14 00:34:43 -07:00
dotnet-maestro[bot]
0c2053ec5e Update dependencies from https://github.com/dotnet/sdk build 20230313.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23163.9 -> To Version 7.0.300-preview.23163.13

Dependency coherency updates

Microsoft.Build
 From Version 17.6.0-preview-23163-06 -> To Version 17.6.0-preview-23164-01 (parent: Microsoft.NET.Sdk
2023-03-14 06:35:08 +00:00
v-wuzhai
e4e135874b
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15782) 2023-03-13 22:37:51 -07:00
dotnet-maestro[bot]
4c7fe015de Update dependencies from https://github.com/dotnet/sdk build 20230313.9
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23163.6 -> To Version 7.0.300-preview.23163.9

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks
 From Version 12.5.0-beta.23161.1 -> To Version 12.5.0-beta.23163.3 (parent: Microsoft.NET.Sdk
2023-03-14 03:07:21 +00:00
v-wuzhai
32412a8884
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15772) 2023-03-13 19:11:20 -07:00
dotnet-maestro[bot]
c98763de28 Update dependencies from https://github.com/dotnet/sdk build 20230313.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23162.5 -> To Version 7.0.300-preview.23163.6
2023-03-14 00:45:13 +00:00
wtgodbe
67e4bf2cf0 Automate asp.net template updates into dotnet/installer 2023-03-13 14:07:05 -07:00
wtgodbe
0618b2c20d Automate asp.net template updates into dotnet/installer 2023-03-13 14:02:57 -07:00
Marc Paine
223e47f52f
[7.0.1xx] Automate Asp.net template updates in dotnet/installer (#15737) 2023-03-13 13:57:44 -07:00
dotnet-maestro[bot]
54578ddfd8 Update dependencies from https://github.com/dotnet/sdk build 20230313.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23162.5 -> To Version 7.0.300-preview.23163.1
2023-03-13 10:55:43 +00:00
v-wuzhai
76eb6a3105
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15771) 2023-03-13 02:50:08 -07:00
dotnet-maestro[bot]
3b1da70249 Update dependencies from https://github.com/dotnet/sdk build 20230312.5
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23162.2 -> To Version 7.0.300-preview.23162.5

Dependency coherency updates

Microsoft.Build
 From Version 17.6.0-preview-23160-02 -> To Version 17.6.0-preview-23163-03 (parent: Microsoft.NET.Sdk
2023-03-13 06:37:22 +00:00
v-wuzhai
8f8b2e933d
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15770) 2023-03-12 22:37:53 -07:00
dotnet-maestro[bot]
636052dd0c Update dependencies from https://github.com/dotnet/sdk build 20230312.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23160.27 -> To Version 7.0.300-preview.23162.2

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.5.0-beta.23159.2 -> To Version 12.5.0-beta.23161.1 (parent: Microsoft.NET.Sdk
2023-03-13 03:06:49 +00:00
v-wuzhai
74db3f0357
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15764) 2023-03-12 19:08:32 -07:00
dotnet-maestro[bot]
9794e7097d Update dependencies from https://github.com/dotnet/sdk build 20230310.27
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.27

Dependency coherency updates

Microsoft.Build,NuGet.Build.Tasks
 From Version 17.6.0-preview-23160-01 -> To Version 17.6.0-preview-23160-02 (parent: Microsoft.NET.Sdk
2023-03-11 01:06:19 +00:00
dotnet-maestro[bot]
bc88fae6a5 Update dependencies from https://github.com/dotnet/sdk build 20230310.25
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.25

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.6.0-preview.3.43 -> To Version 6.6.0-preview.3.44 (parent: Microsoft.NET.Sdk
2023-03-11 00:07:59 +00:00
dotnet-maestro[bot]
f31f7b69ca Update dependencies from https://github.com/dotnet/sdk build 20230310.18
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.18

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.6.0-preview.3.43 -> To Version 6.6.0-preview.3.44 (parent: Microsoft.NET.Sdk
2023-03-10 23:07:24 +00:00
Marc Paine
dabcbacd84
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15757) 2023-03-10 14:14:30 -08:00
Marc Paine
75df4a886e
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15756) 2023-03-10 14:14:06 -08:00
wtgodbe
06070d10f6 Fixup 2023-03-10 10:18:12 -08:00
wtgodbe
6a0adcbcc0 Generalize 2023-03-10 10:12:51 -08:00
dotnet-maestro[bot]
200e8137b7 Update dependencies from https://github.com/dotnet/sdk build 20230310.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23159.32 -> To Version 7.0.300-preview.23160.2
2023-03-10 09:54:56 +00:00
v-wuzhai
d3e638c536
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15762) 2023-03-09 23:26:37 -08:00
dotnet-maestro[bot]
a4d57dc25c Update dependencies from https://github.com/dotnet/sdk build 20230309.32
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.300-preview.23159.17 -> To Version 7.0.300-preview.23159.32

Dependency coherency updates

Microsoft.Build
 From Version 17.6.0-preview-23159-04 -> To Version 17.6.0-preview-23160-01 (parent: Microsoft.NET.Sdk
2023-03-10 06:44:19 +00:00
Jason Zhai
ca3926094a Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-03-09 21:57:02 -08:00
Jason Zhai
f8496d511c Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-09 21:49:55 -08:00
dotnet-maestro[bot]
43a4d99ea1
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15760)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-03-09 15:34:43 -08:00
dotnet-maestro[bot]
93a37b2719
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15754)
[release/7.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.5.0-beta.23158.5 to 12.5.0-beta.23159.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23158.5 to 7.0.300-beta.23159.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.6.0-preview-23159-01 to 17.6.0-preview-23159-04 (parent: Microsoft.NET.Sdk)
2023-03-09 21:20:52 +00:00
Marc Paine
7ca349a7d4
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15731) 2023-03-09 13:18:15 -08:00
Marc Paine
e4695f8df2
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15724) 2023-03-09 13:18:05 -08:00
Marc Paine
90b6aec8ee
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15730) 2023-03-09 13:17:57 -08:00
Marc Paine
b16f378013
[release/7.0.2xx] Update dependencies from dotnet/arcade (#15610) 2023-03-09 13:17:19 -08:00
v-wuzhai
da6c386331
[automated] Merge branch 'release/7.0.2xx' => 'release/7.0.3xx' (#15726) 2023-03-09 01:26:03 -08:00