Commit graph

28879 commits

Author SHA1 Message Date
Noah Gilson
461815dab5
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16696) 2023-06-16 10:58:13 -07:00
Noah Gilson
296c45e5f4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16707) 2023-06-16 10:57:39 -07:00
Noah Gilson
89bf9ef7e6
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16713) 2023-06-16 10:55:46 -07:00
Sean Reeser
c4224a2c39 Merged PR 31963: [internal/release/6.0.1xx] Merge from public
Merge from public release/6.0.1xx to internal/release/6.0.1xx and resolve conflicts if necessary
2023-06-16 17:01:13 +00:00
dotnet-maestro[bot]
aed95cb167 Update dependencies from https://github.com/dotnet/sdk build 20230616.4
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23315.52 -> To Version 7.0.400-preview.23316.4

Dependency coherency updates

Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
 From Version 17.7.0-preview-23315-03 -> To Version 17.7.0-preview-23316-03 (parent: Microsoft.NET.Sdk
2023-06-16 11:45:55 +00:00
dotnet-maestro[bot]
155e170849 Update dependencies from https://github.com/dotnet/sdk build 20230616.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23315.52 -> To Version 7.0.400-preview.23316.1
2023-06-16 10:40:38 +00:00
v-wuzhai
d18a58b390
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16711) 2023-06-16 00:28:04 -07:00
dotnet-maestro[bot]
601b0afd6b Update dependencies from https://github.com/dotnet/sdk build 20230615.52
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23315.41 -> To Version 7.0.400-preview.23315.52

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.7.0-3.23315.3 -> To Version 4.7.0-3.23315.4 (parent: Microsoft.NET.Sdk
2023-06-16 06:43:06 +00:00
Jason Zhai
078d557112 Fix the build errors 2023-06-15 22:31:35 -07:00
Jason Zhai
bb531ffeab Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-06-15 22:27:02 -07:00
Jason Zhai
33bda0e66f Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-06-15 20:15:47 -07:00
Jason Zhai
d04344ab77 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-15 20:09:53 -07:00
dotnet-bot
cf27aa8b9b Merge in 'release/6.0.4xx' changes 2023-06-16 03:02:44 +00:00
v-wuzhai
f036db2064
[release/6.0.4xx] Update dependencies from dotnet/arcade (#16697) 2023-06-15 19:52:16 -07:00
v-wuzhai
6b08d75c57
[release/7.0.1xx] Update dependencies from dotnet/arcade (#16698) 2023-06-15 19:51:12 -07:00
v-wuzhai
eedbfe2829
[release/6.0.1xx] Update dependencies from dotnet/arcade (#16700) 2023-06-15 19:50:35 -07:00
v-wuzhai
ebe3261e11
[release/7.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#16701) 2023-06-15 19:49:51 -07:00
v-wuzhai
500d5e0f4b
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16702) 2023-06-15 19:49:07 -07:00
dotnet-maestro[bot]
844e87fb49 Update dependencies from https://github.com/dotnet/sdk build 20230615.41
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23315.22 -> To Version 7.0.400-preview.23315.41
2023-06-15 23:06:35 +00:00
DotNet Bot
717240d065 [internal/release/6.0.3xx] Update dependencies from dotnet/arcade 2023-06-15 22:02:18 +00:00
dotnet-maestro[bot]
1c897ede8a Update dependencies from https://github.com/dotnet/sdk build 20230615.26
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23315.22 -> To Version 7.0.400-preview.23315.26
2023-06-15 21:35:46 +00:00
dotnet-maestro[bot]
4f9a50fd1c Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230419.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.23063.1 -> To Version 7.0.0-alpha.1.23219.1
2023-06-15 21:30:27 +00:00
dotnet-maestro[bot]
5dd4806718 Update dependencies from https://github.com/dotnet/arcade build 20230613.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
2023-06-15 21:19:12 +00:00
dotnet-maestro[bot]
146d6510b5 Update dependencies from https://github.com/dotnet/arcade build 20230613.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23313.4
2023-06-15 20:51:46 +00:00
dotnet-maestro[bot]
298f1196d1 Update dependencies from https://github.com/dotnet/arcade build 20230613.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23211.7 -> To Version 6.0.0-beta.23313.5
2023-06-15 20:46:29 +00:00
dotnet-bot
f11f230328 Merge in 'release/6.0.3xx' changes 2023-06-15 20:34:40 +00:00
dotnet-maestro[bot]
51285ddca1
[release/7.0.3xx] Update dependencies from dotnet/arcade (#16691)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2023-06-15 20:27:17 +00:00
dotnet-maestro[bot]
489f6679a0
[release/7.0.4xx] Update dependencies from dotnet/arcade (#16690)
[release/7.0.4xx] Update dependencies from dotnet/arcade
2023-06-15 20:27:15 +00:00
Marc Paine
f4a3c0b72d
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16664) 2023-06-15 13:26:43 -07:00
Marc Paine
697dd0c934
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16680) 2023-06-15 13:25:28 -07:00
Marc Paine
c46292b0fb
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16677) 2023-06-15 13:24:54 -07:00
dotnet-maestro[bot]
e34e788c09
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16685)
[release/7.0.4xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.7.0-preview-23313-04 to 17.7.0-preview-23315-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.7.0-3.23314.8 to 4.7.0-3.23315.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.7.0-preview-23314-04 to 17.7.0-preview-23315-03 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.msbuild: from 17.7.0-preview-23314-04 to 17.7.0-preview-23315-03 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.7.0-preview.3.77 to 6.7.0-preview.3.80 (parent: Microsoft.NET.Sdk)
2023-06-15 20:24:27 +00:00
v-wuzhai
366783eb84
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16684) 2023-06-15 03:06:06 -07:00
dotnet-maestro[bot]
cfae4d4dc5 Update dependencies from https://github.com/dotnet/sdk build 20230615.1
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23314.29 -> To Version 7.0.400-preview.23315.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.7.0-beta.23314.8 -> To Version 12.7.0-beta.23314.12 (parent: Microsoft.NET.Sdk
2023-06-15 09:17:11 +00:00
v-wuzhai
31185d914b
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16683) 2023-06-15 02:13:58 -07:00
DotNet Bot
50296d00ff [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 2023-06-15 08:03:53 +00:00
DotNet Bot
04bf45ed6e [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.Build: from 17.4.4 to 17.4.6 (parent: Microsoft.NET.Sdk)
2023-06-15 08:03:37 +00:00
dotnet-maestro[bot]
7ead94985f Update dependencies from https://github.com/dotnet/sdk build 20230614.29
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23314.17 -> To Version 7.0.400-preview.23314.29

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.7.0-3.23312.16 -> To Version 4.7.0-3.23314.8 (parent: Microsoft.NET.Sdk
2023-06-15 07:38:23 +00:00
dotnet-maestro[bot]
f1774dea81 Update dependencies from https://github.com/dotnet/sdk build 20230614.28
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23314.17 -> To Version 7.0.400-preview.23314.28

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.7.0-3.23312.16 -> To Version 4.7.0-3.23314.6 (parent: Microsoft.NET.Sdk
2023-06-15 04:30:54 +00:00
v-wuzhai
54781ff210
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16679) 2023-06-15 10:26:24 +08:00
v-wuzhai
1bb2fe637e
[release/7.0.3xx] Update dependencies from dotnet/arcade (#16681) 2023-06-15 10:25:42 +08:00
dotnet-maestro[bot]
56f73a41c5 Update dependencies from https://github.com/dotnet/sdk build 20230614.17
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23313.39 -> To Version 7.0.400-preview.23314.17

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks
 From Version 12.7.0-beta.23313.7 -> To Version 12.7.0-beta.23314.8 (parent: Microsoft.NET.Sdk
2023-06-14 22:48:13 +00:00
DotNet Bot
5cae2790d7 [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk 2023-06-14 22:36:12 +00:00
dotnet-maestro[bot]
e0e3cab77a Update dependencies from https://github.com/dotnet/sdk build 20230614.14
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23313.39 -> To Version 7.0.400-preview.23314.14

Dependency coherency updates

Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks
 From Version 17.7.0-preview-23312-02 -> To Version 17.7.0-preview-23314-04 (parent: Microsoft.NET.Sdk
2023-06-14 21:08:41 +00:00
dotnet-maestro[bot]
b121f8feeb Update dependencies from https://github.com/dotnet/arcade build 20230531.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23281.4
2023-06-14 20:00:12 +00:00
Marc Paine
a5708e110a
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2023-06-14 12:57:55 -07:00
Marc Paine
5df4f2e766
Merge branch 'release/7.0.4xx' into merge/release/7.0.3xx-to-release/7.0.4xx 2023-06-14 12:56:35 -07:00
Marc Paine
fae9cf2b3c
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2023-06-14 12:51:33 -07:00
dotnet-maestro[bot]
6a82b655ac Update dependencies from https://github.com/dotnet/sdk build 20230614.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23313.39 -> To Version 7.0.400-preview.23314.13

Dependency coherency updates

Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks
 From Version 17.7.0-preview-23312-02 -> To Version 17.7.0-preview-23314-01 (parent: Microsoft.NET.Sdk
2023-06-14 19:45:21 +00:00
Marc Paine
3bf636278c
Merging internal commits for release/7.0.3xx (#16655) 2023-06-14 12:43:44 -07:00