Commit graph

28876 commits

Author SHA1 Message Date
DotNet-Bot
ed642f02d8 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.315-servicing.23322.16 -> To Version 6.0.316-servicing.23364.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk
2023-07-14 13:05:58 +00:00
DotNet-Bot
5db1934e43 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230714.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.120-servicing.23322.14 -> To Version 6.0.121-servicing.23364.11

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.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.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.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100
 From Version 6.0.20 -> To Version 6.0.21 (parent: Microsoft.NET.Sdk
2023-07-14 13:05:29 +00:00
DotNet Bot
1d8493312b Merged PR 32552: [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**: 20230711.3
- **Date Produced**: July 11, 2023 9:00:39 PM UTC
- **Commit**: cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34
- **Branch**: refs/heads/release/6.0

[DependencyUpdate]: <> (Begin)

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

[1]: 91616785a1...cd79d2e8f7

[DependencyUpdate]: <> (End)

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

[marker]: <> (End:6d383863-e2a5-4edc-fb90-08da32c10934)
2023-07-14 03:24:52 +00:00
Jason Zhai
c4596ee6aa Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-13 19:41:41 -07:00
Jason Zhai
78cdd6d8ba Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-13 19:37:41 -07:00
DotNet Bot
1842e6d045 Merged PR 32581: [internal/release/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Test.Sdk**: from 17.7.0-preview-23317-01 to 17.7.0-preview-23362-01 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.7.0-3.23360.7 to 4.7.0-3.23361.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.7.0 to 17.7.1 (parent: Microsoft.NET.Sdk)
  - **Microsoft.SourceBuild.Intermediate.msbuild**: from 17.7.0-preview-23323-05 to 17.7.1-preview-23362-02 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://github.com/dotnet/sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20230713.6
- **Date Produced**: July 13, 2023 7:38:36 PM UTC
- **Commit**: 651aa1d1eacfacff7110b6075feaa27ddf00a808
- **Branch**: refs/heads/internal/release/7.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.400 to 7.0.400][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.400-rtm.23361.22 to 7.0.400-rtm.23363.6][1]
  - **Microsoft.NET.Sdk**: [from 7.0.400-rtm.23361.22 to 7.0.400-rtm.23363.6][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.400-rtm.23361.22 to 7.0.400-rtm.23363.6][1]
  - **Microsoft.NET.Test.Sdk**: [from 17.7.0-preview-23317-01 to 17.7.0-preview-23362-01][2]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.7.0-3.23360.7 to 4.7.0-3.23361.9][3]
  - **Microsoft.Build**: [from 17.7.0 to 17.7.1][4]
  - **Microsoft.SourceBuild.Intermediate.msbuild**: [from 17.7.0-preview-23323-05 to 17.7.1-preview-23362-02][4]

[1]: 6b937a456e...651aa1d1ea
[2]: 919ec83588...d7f4faa42b
[3]: 7c338f34cd...91c9c05370
[4]: 5785ed5c22...971bf70db7

[DependencyUpdate]: <> (End)

[marker]: <> (End:42f6b899-0677-45e7-d6f8-08db826b460b)
2023-07-13 21:15:23 +00:00
DotNet-Bot
823a87ea90 Update dependencies from https://github.com/dotnet/sdk build 20230713.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400 -> To Version 7.0.400

Dependency coherency updates

Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild
 From Version 17.7.0-preview-23317-01 -> To Version 17.7.0-preview-23362-01 (parent: Microsoft.NET.Sdk
2023-07-13 20:08:54 +00:00
dotnet-bot
d7f519ffad Merge in 'release/6.0.4xx' changes 2023-07-13 20:03:50 +00:00
dotnet-bot
2e334e8e8b Merge in 'release/7.0.3xx' changes 2023-07-13 20:00:16 +00:00
Forgind
2c72dd1000
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16966) 2023-07-13 12:50:24 -07:00
Forgind
3b39b3a08b
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16976) 2023-07-13 12:50:16 -07:00
Forgind
4223ef804e
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16967) 2023-07-13 12:49:43 -07:00
dotnet-bot
285100665a Merge in 'release/6.0.3xx' changes 2023-07-13 18:36:36 +00:00
Marc Paine
14ef081cb6
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16970) 2023-07-13 11:27:45 -07:00
Jason Zhai
63048382f3 Update format patch 2023-07-13 00:12:24 -07:00
Jason Zhai
4c531d279a Try to resolve source-build patch conflicts 2023-07-12 23:40:52 -07:00
Jason Zhai
10cf86df8b Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-12 20:14:11 -07:00
Jason Zhai
0cc3091826 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-12 20:05:55 -07:00
Jason Zhai
5c7af0f162 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-12 20:01:36 -07:00
Jason Zhai
3a98864d75 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-07-12 19:51:26 -07:00
dotnet-bot
9e5ae07e57 Merge in 'release/7.0.1xx' changes 2023-07-13 00:07:22 +00:00
Matt Thalman
4bf374a7b1
Update SB SDK diff baseline (#16973) 2023-07-12 16:57:31 -07:00
dotnet-bot
355fe4120b Merge in 'release/6.0.4xx' changes 2023-07-12 21:05:25 +00:00
dotnet-bot
30943937b3 Merge in 'release/6.0.1xx' changes 2023-07-12 21:02:42 +00:00
dotnet-bot
c814b20a86 Merge in 'release/7.0.3xx' changes 2023-07-12 20:59:34 +00:00
dotnet-bot
22e9ed43f1 Merge in 'release/7.0.1xx' changes 2023-07-12 20:58:57 +00:00
dotnet-maestro[bot]
a1073db7fc
[release/6.0.4xx] Update dependencies from dotnet/arcade (#16968)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:55:29 -07:00
dotnet-maestro[bot]
5677e50878
[release/6.0.1xx] Update dependencies from dotnet/arcade (#16969)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:53:44 -07:00
dotnet-maestro[bot]
c940151653
[release/7.0.3xx] Update dependencies from dotnet/arcade (#16962)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:51:28 -07:00
dotnet-maestro[bot]
9460454a1d
[release/7.0.4xx] Update dependencies from dotnet/arcade (#16963)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:51:19 -07:00
dotnet-maestro[bot]
ae5b538ae4
[release/7.0.1xx] Update dependencies from dotnet/arcade (#16964)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-07-12 13:50:38 -07:00
DotNet-Bot
d1ab1020fd Update dependencies from https://github.com/dotnet/arcade build 20230711.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.23313.5 -> To Version 6.0.0-beta.23361.3
2023-07-12 18:35:57 +00:00
dotnet-bot
7b89b61f03 Merge in 'release/6.0.3xx' changes 2023-07-12 18:30:19 +00:00
dotnet-bot
aeeca61d91 Merge in 'release/7.0.3xx' changes 2023-07-12 18:29:50 +00:00
Forgind
75f4ed5036
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16949) 2023-07-12 11:21:44 -07:00
Forgind
2acabacb0f
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16944) 2023-07-12 11:21:26 -07:00
dotnet-bot
a34b113b63 Merge in 'release/6.0.1xx' changes 2023-07-12 16:58:53 +00:00
Matt Thalman
f326414f09
Update MissingXmlDoc baseline (#16959) 2023-07-12 16:50:32 +00:00
Marc Paine
cd4ab70550
Stabilize branding (#16916) 2023-07-12 09:28:40 -07:00
Jason Zhai
7381bec755 Try to resolve source-build patch conflicts 2023-07-12 01:42:25 -07:00
Jason Zhai
ba7651ffbc Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-07-11 23:20:56 -07:00
Jason Zhai
eb232fd2eb Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-07-11 23:03:16 -07:00
v-wuzhai
4968400e17
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16954) 2023-07-11 22:37:12 -07:00
dotnet-maestro[bot]
67d2bafabf Update dependencies from https://github.com/dotnet/sdk build 20230711.22
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23361.13 -> To Version 7.0.400
2023-07-12 00:03:10 +00:00
Marc Paine
eff002e760
[release/7.0.4xx] Update dependencies from dotnet/sdk (#16952) 2023-07-11 16:56:26 -07:00
dotnet-maestro[bot]
24d2abce13 Update dependencies from https://github.com/dotnet/sdk build 20230711.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.400-preview.23360.14 -> To Version 7.0.400-preview.23361.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100
 From Version 7.0.8 -> To Version 7.0.9 (parent: Microsoft.NET.Sdk
2023-07-11 23:02:44 +00:00
dotnet-bot
5e9cfaf200 Merge in 'release/7.0.1xx' changes 2023-07-11 19:46:11 +00:00
NET Source-Build Bot
2c2d698597
.NET Source-Build 7.0.109 July 2023 Updates (#16943) 2023-07-11 14:34:43 -05:00
dotnet-bot
8eb60d7b75 Merge in 'release/7.0.1xx' changes 2023-07-11 19:23:54 +00:00
Marc Paine
d1746a1c30
Merging internal commits for release/7.0.1xx (#16941) 2023-07-11 12:14:03 -07:00