Commit graph

28220 commits

Author SHA1 Message Date
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
Marc Paine
f935d3aa12
Merging internal commits for release/7.0.3xx (#17139) 2023-08-08 11:12:35 -07:00
Sean Reeser
ac2cf5e978 Merge commit '7b77e35a2bc056a01180bfdec51ad27a11b1d412' into internal-merge-7.0.3xx-2023-08-08-1042 2023-08-08 10:42:16 -07:00
Marc Paine
05a4749353
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17078) 2023-08-01 14:44:37 -07:00
Marc Paine
a2cd644e69
Update branding to 7.0.308 (#17108) 2023-08-01 12:04:02 -07:00
Sean Reeser
1cc16c4f4d Update branding to 7.0.308 2023-08-01 11:01:14 -07:00
dotnet-maestro[bot]
536ba6ad99 Update dependencies from https://github.com/dotnet/arcade build 20230720.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3
2023-07-27 18:02:21 +00:00
DotNet Bot
7b77e35a2b Merged PR 32710: [internal/release/7.0.3xx] 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.WindowsDesktop.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23367.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23367.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.9-servicing.23320.18 to 7.0.10-servicing.23363.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.9-servicing.23321.6 to 7.0.10-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.9-servicing.23321.9 to 7.0.10-servicing.23364.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.NET.Test.Sdk**: from 17.6.3-release-20230616-01 to 17.6.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Net.Compilers.Toolset**: from 4.6.0-3.23259.8 to 4.6.0-3.23329.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Bui...
2023-07-17 21:56:41 +00:00
DotNet-Bot
2fd6547cc1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.21
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.306 -> To Version 7.0.307

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.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,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk
2023-07-17 21:10:50 +00:00
Sean Reeser
6c0c0d063d Remove applied source build patch 2023-07-17 14:03:39 -07:00
DotNet-Bot
ece5b130b1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.12
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.306 -> To Version 7.0.307

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.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,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,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.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk
2023-07-17 21:00:03 +00:00
dotnet-bot
833764f954 Merge in 'release/7.0.3xx' changes 2023-07-14 23:26:21 +00:00
Forgind
9d01f1819a
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16994) 2023-07-14 16:17:57 -07:00
Forgind
75b787625a
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#16986) 2023-07-14 11:08:08 -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
2e334e8e8b Merge in 'release/7.0.3xx' changes 2023-07-13 20:00:16 +00: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
Jason Zhai
0cc3091826 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-12 20:05:55 -07:00
Jason Zhai
3a98864d75 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-07-12 19:51:26 -07:00
Matt Thalman
4bf374a7b1
Update SB SDK diff baseline (#16973) 2023-07-12 16:57:31 -07:00
dotnet-bot
c814b20a86 Merge in 'release/7.0.3xx' changes 2023-07-12 20:59:34 +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]
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]
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
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
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
NET Source-Build Bot
2c2d698597
.NET Source-Build 7.0.109 July 2023 Updates (#16943) 2023-07-11 14:34:43 -05:00
Marc Paine
d1746a1c30
Merging internal commits for release/7.0.1xx (#16941) 2023-07-11 12:14:03 -07:00
NET Source-Build Bot
03de5438b7
.NET Source-Build 6.0.120 July 2023 Updates (#16942) 2023-07-11 14:01:05 -05:00
dotnet-bot
2960a542b2 Merge in 'release/7.0.3xx' changes 2023-07-11 18:48:36 +00:00
Marc Paine
810f8e82ba
Merging internal commits for release/6.0.1xx (#16937) 2023-07-11 11:47:50 -07:00
Marc Paine
6e5de6525b
Merging internal commits for release/7.0.3xx (#16940) 2023-07-11 11:35:58 -07:00
Marc Paine
2bc80e92a1
Merging internal commits for release/6.0.4xx (#16939) 2023-07-11 11:35:46 -07:00
Marc Paine
eb4b20c720
Merging internal commits for release/6.0.3xx (#16938) 2023-07-11 11:35:33 -07:00
Forgind
96ddfa6596
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#16926) 2023-07-11 10:36:52 -07:00
Sean Reeser
0743ee8b28 Merge commit '3e9283a8e906761fcf9973c0007a75c0eb20baea' into internal-merge-7.0.1xx-2023-07-11-1023 2023-07-11 10:23:49 -07:00
Sean Reeser
39702acb5c Merge commit 'f500069cb7cdd01b435961287361b9ad21203c67' into internal-merge-7.0.3xx-2023-07-11-1023 2023-07-11 10:23:40 -07:00
Sean Reeser
272b39f66e Merge commit 'ee124f7fe1946ba82febd79ef25c3040de461d3a' into internal-merge-6.0.4xx-2023-07-11-1017 2023-07-11 10:17:06 -07:00
Sean Reeser
8ad8121e95 Merge commit '2282fe998c54635c744653971f1903f98a33d49b' into internal-merge-6.0.3xx-2023-07-11-1016 2023-07-11 10:16:57 -07:00
Sean Reeser
3ee1863ab0 Merge commit 'd63b17be66f766a5381950bce677884e4e3bb5b6' into internal-merge-6.0.1xx-2023-07-11-1016 2023-07-11 10:16:47 -07:00
Michael Simons
786df50860 Resolve source-build patch conflicts 2023-07-11 14:31:03 +00:00
Jason Zhai
1ee0b6e012 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-07-11 00:45:34 -07:00
Forgind
de86f1f4cd
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16914) 2023-07-10 10:27:21 -07:00
Matt Thalman
c5f29a611d Update format patch 2023-07-10 09:31:51 -05:00
Matt Thalman
65db63eb44 Update format patch 2023-07-10 08:06:04 -05:00