Commit graph

29024 commits

Author SHA1 Message Date
Jason Zhai
2dbb8f541d Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-08-15 00:10:06 -07:00
dotnet-bot
a7cf66e5b6 Merge in 'release/7.0.1xx' changes 2023-08-15 06:25:49 +00:00
v-wuzhai
18de2eb04b
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17184) 2023-08-14 23:17:44 -07:00
Jason Zhai
35cc0eb708 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-08-14 19:27:32 -07:00
dotnet-bot
613062a256 Merge in 'release/6.0.4xx' changes 2023-08-15 02:00:31 +00:00
v-wuzhai
64882681b2
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#17172) 2023-08-14 18:52:40 -07:00
v-wuzhai
9960d134a1
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#17171) 2023-08-14 18:52:25 -07:00
v-wuzhai
7d19adb842
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17180) 2023-08-14 03:04:01 -07:00
dotnet-maestro[bot]
f42900e18f Update dependencies from https://github.com/dotnet/test-templates build 20230810.2
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.1.0-rc.23409.2 -> To Version 1.1.0-rc.23410.2
2023-08-14 08:07:10 +00:00
Jason Zhai
f3abd918cb Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-08-10 19:46:36 -07:00
Jason Zhai
2698dc3e0a Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-08-10 19:43:13 -07:00
Matt Thalman
cdfa6bad98 Merged PR 33071: Update 7.0 SDK diff
Update MSFT to SB SDK diff baseline
2023-08-10 19:58:12 +00:00
dotnet-bot
8af6f932d5 Merge in 'release/7.0.3xx' changes 2023-08-10 18:56:00 +00:00
dotnet-bot
b9502049d1 Merge in 'release/6.0.3xx' changes 2023-08-10 18:54:11 +00:00
Marc Paine
f3025fe86c
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#17146) 2023-08-10 11:45:15 -07:00
Marc Paine
73402b23d5
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17148) 2023-08-10 11:44:55 -07:00
Matt Thalman
e64c1a447c Merged PR 33069: Update 6.0 SDK diff
Update MSFT to SB SDK diff baseline
2023-08-10 15:12:34 +00:00
dotnet-bot
0dee7ea267 Merge in 'release/7.0.1xx' changes 2023-08-10 06:52:29 +00:00
v-wuzhai
2501eb3e61
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17163) 2023-08-09 23:44:46 -07:00
Jason Zhai
c3098a65da Merge branch 'release/7.0.4xx' 2023-08-09 22:50:56 -07:00
Jason Zhai
bc6663f989 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-08-09 22:41:09 -07:00
DotNet Bot
8c0198c436 Merged PR 32912: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20230809.9
- **Date Produced**: August 9, 2023 6:06:24 PM UTC
- **Commit**: abf876d5642725dcfc24748308ba5fe849d6fab7
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.413-servicing.23367.15 to 6.0.414-servicing.23409.9][4]
  - **Microsoft.NET.Sdk**: [from 6.0.413-servicing.23367.15 to 6.0.414-servicing.23409.9][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC32a105ca98&targetVersion=GCabf876d564&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2023-08-10 03:21:02 +00:00
DotNet Bot
fe119776ac Merged PR 32913: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20230809.16
- **Date Produced**: August 10, 2023 12:16:49 AM UTC
- **Commit**: 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.316-servicing.23367.14 to 6.0.317-servicing.23409.16][4]
  - **Microsoft.NET.Sdk**: [from 6.0.316-servicing.23367.14 to 6.0.317-servicing.23409.16][4]

[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC68456cae29&targetVersion=GC4a3a5b0ba3&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2023-08-10 03:20:52 +00:00
DotNet Bot
8d7d58655b Merged PR 33042: [internal/release/6.0.3xx] Update dependencies from dotnet/arcade
This pull request updates the following dependencies

[marker]: <> (Begin:6d383863-e2a5-4edc-fb90-08da32c10934)
## From https://github.com/dotnet/arcade
- **Subscription**: 6d383863-e2a5-4edc-fb90-08da32c10934
- **Build**: 20230808.5
- **Date Produced**: August 8, 2023 10:19:38 PM UTC
- **Commit**: 98fd22588fbb0f407faa6a74cb1aa79031306151
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Arcade.Sdk**: [from 6.0.0-beta.23361.3 to 6.0.0-beta.23408.5][1]
  - **Microsoft.DotNet.Build.Tasks.Installers**: [from 6.0.0-beta.23361.3 to 6.0.0-beta.23408.5][1]
  - **Microsoft.DotNet.CMake.Sdk**: [from 6.0.0-beta.23361.3 to 6.0.0-beta.23408.5][1]

[1]: cd79d2e8f7...98fd22588f

[DependencyUpdate]: <> (End)

- **Updates to .NET SDKs:**
  - Updates tools.dotnet to 6.0.121

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2023-08-10 03:07:22 +00:00
v-wuzhai
47ac4be63f
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17168) 2023-08-09 19:04:08 -07:00
DotNet-Bot
e68b8872b0 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23409.16
2023-08-10 00:35:35 +00:00
dotnet-maestro[bot]
1349348f8d Update dependencies from https://github.com/dotnet/test-templates build 20230809.2
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.1.0-rc.23409.1 -> To Version 1.1.0-rc.23409.2
2023-08-09 21:39:28 +00:00
dotnet-bot
be8b2ab844 Merge in 'release/7.0.1xx' changes 2023-08-09 18:32:00 +00:00
DotNet-Bot
9ed07936ec Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.9
2023-08-09 18:27:09 +00:00
dotnet-maestro[bot]
66301b23fb
[release/7.0.1xx] Update dependencies from dotnet/arcade (#17160)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 11:23:55 -07:00
dotnet-bot
c104168dea Merge in 'release/6.0.4xx' changes 2023-08-09 17:36:05 +00:00
dotnet-bot
3195b05a14 Merge in 'release/6.0.1xx' changes 2023-08-09 17:34:06 +00:00
dotnet-maestro[bot]
95c297b5f7
[release/6.0.4xx] Update dependencies from dotnet/arcade (#17158)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 10:27:14 -07:00
dotnet-maestro[bot]
936590bd49
[release/6.0.1xx] Update dependencies from dotnet/arcade (#17161)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 10:25:31 -07:00
dotnet-bot
829ffca204 Merge in 'release/6.0.1xx' changes 2023-08-09 16:26:36 +00:00
NET Source-Build Bot
f2a927934b
.NET Source-Build 6.0.121 August 2023 Updates (#17149) 2023-08-09 16:18:30 +00:00
dotnet-maestro[bot]
683e2d9b57
[release/7.0.4xx] Update dependencies from dotnet/test-templates (#17154)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-08-09 08:44:20 -07:00
DotNet-Bot
4cc5d8c18a Update dependencies from https://github.com/dotnet/arcade build 20230808.5
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23361.3 -> To Version 6.0.0-beta.23408.5
2023-08-09 15:10:40 +00:00
DotNet-Bot
67ece7f3cb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.2
2023-08-09 10:15:06 +00:00
Jason Zhai
f1de5c6ece Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-08-09 00:02:33 -07:00
dotnet-bot
39c800fbb7 Merge in 'release/7.0.3xx' changes 2023-08-09 06:12:03 +00:00
v-wuzhai
4ad4e9d713
[release/7.0.4xx] Update dependencies from dotnet/arcade (#17151) 2023-08-08 23:04:52 -07:00
v-wuzhai
4082b3037c
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17152) 2023-08-08 23:04:07 -07:00
dotnet-maestro[bot]
1a3b7c0d49 Update dependencies from https://github.com/dotnet/arcade build 20230808.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3
2023-08-08 23:59:03 +00:00
dotnet-maestro[bot]
13a9c86583 Update dependencies from https://github.com/dotnet/arcade build 20230808.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3
2023-08-08 23:59:03 +00:00
NET Source-Build Bot
51976bbb72
.NET Source-Build 7.0.110 August 2023 Updates (#17150) 2023-08-08 23:03:28 +00:00
dotnet-bot
70625222d7 Merge in 'release/6.0.1xx' changes 2023-08-08 22:17:30 +00:00
Marc Paine
bf10800c27
Merging internal commits for release/6.0.1xx (#17134) 2023-08-08 15:08:38 -07:00
DotNet-Bot
10caa4a7f1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23408.18
2023-08-08 21:55:54 +00:00
Matt Thalman
4ace1423c3 Remove extra XML doc entry 2023-08-08 15:32:35 -05:00