Commit graph

27334 commits

Author SHA1 Message Date
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
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
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
Jason Zhai
bf62ec46b4 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-07-09 22:51:32 -07:00
dotnet-maestro-bot
fd5696554a
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16898)
Co-authored-by: Nikola Milosavljevic <nikolam@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-07 13:07:58 -07:00
dotnet-maestro-bot
7a0352f5fb
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16891)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-07-06 10:09:19 -07:00
v-wuzhai
a2e9ed9df1
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#16797) 2023-07-05 19:12:24 -07:00
Marc Paine
dae68bd9f7
Update branding to 7.0.110 (#16888) 2023-07-05 15:45:16 -07:00
Marc Paine
f3d7896093
Update branding to 6.0.413 (#16887) 2023-07-05 15:38:55 -07:00
Marc Paine
59ad809023
Update branding to 6.0.316 (#16886) 2023-07-05 15:11:44 -07:00
Sean Reeser
369e1e683a Update branding to 7.0.110 2023-07-05 14:38:56 -07:00
Sean Reeser
c6222f0702 Update branding to 6.0.413 2023-07-05 14:38:50 -07:00
Sean Reeser
ab99c450a0 Update branding to 6.0.316 2023-07-05 14:38:44 -07:00
Jason Zhai
3fbd26591e Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-24 22:42:40 -07:00
Matt Thalman
1aeb92395a
Fix SDK version of source-build global.json (#16798) 2023-06-23 18:31:22 +00:00
dotnet-bot
3e9283a8e9 Merge in 'release/7.0.1xx' changes 2023-06-23 17:36:23 +00:00
Matt Thalman
c255b45852
.NET Source-Build 7.0.108 June 2023 OOB Updates (#16795) 2023-06-23 17:27:37 +00:00
NET Source-Build Bot
8f7ebafe7b
.NET Source-Build 6.0.118 June 2023 Updates (#16670) 2023-06-23 14:27:22 +00:00
DotNet Bot
a975c9588d Merged PR 32191: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230622.18
- **Date Produced**: June 22, 2023 7:43:04 PM UTC
- **Commit**: 2b3241fd09fe88b953a4fca6b8e79fa7e993c488
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1]
  - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23322.6 to 7.0.109-servicing.23322.18][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe4f279b133&targetVersion=GC2b3241fd09&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2023-06-23 00:24:11 +00:00
Matt Thalman
1dbbc52520 Merged PR 32192: Set OmniSharp run script to be executable
Backport of https://github.com/dotnet/installer/pull/16772
2023-06-22 22:11:11 +00:00
DotNet Bot
2b8b3238ef Merged PR 32177: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230622.6
- **Date Produced**: June 22, 2023 4:39:37 PM UTC
- **Commit**: e4f279b13323ec1e4ca16a5f0d44abf1bba14326
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.109 to 7.0.109][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1]
  - **Microsoft.NET.Sdk**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.109-servicing.23321.34 to 7.0.109-servicing.23322.6][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC02690a4117&targetVersion=GCe4f279b133&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2023-06-22 17:23:28 +00:00
DotNet Bot
8fa4a8d83b Merged PR 32045: [internal/release/7.0.1xx] 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.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.8-servicing.23315.5 to 7.0.9-servicing.23321.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.8-servicing.23313.27 to 7.0.9-servicing.23320.18 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.Platforms**: from 7.0.4 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.8-servicing.23315.16 to 7.0.9-servicing.23321.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.8 to 7.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.8-servicing.23314.7 to 7.0.9-servicing.23321.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.Build**: from 17.4.6 to 17.4.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.8-servicing.23313.27 t...
2023-06-22 13:13:28 +00:00
dotnet-bot
460423c9fe Merge in 'release/7.0.1xx' changes 2023-06-21 21:29:21 +00:00
Nikola Milosavljevic
83d8c761bd
Update poison-usage baseline (#16775) 2023-06-21 21:20:41 +00:00
dotnet-bot
ded66756b4 Merge in 'release/7.0.1xx' changes 2023-06-19 20:30:15 +00:00
Marc Paine
220626aee9
Update branding to 6.0.120 (#16736) 2023-06-19 13:20:08 -07:00
Marc Paine
4d8f58d0a3
Update branding to 6.0.315 (#16737) 2023-06-19 13:20:06 -07:00
Marc Paine
b350e37726
Update branding to 6.0.412 (#16738) 2023-06-19 13:20:04 -07:00
Marc Paine
4b1013211a
Update branding to 7.0.109 (#16739) 2023-06-19 13:20:01 -07:00
Sean Reeser
92014f47c6 Update branding to 7.0.109 2023-06-19 10:36:48 -07:00
Sean Reeser
4359922858 Update branding to 6.0.412 2023-06-19 10:36:43 -07:00
Sean Reeser
7ffe202ef6 Update branding to 6.0.315 2023-06-19 10:36:37 -07:00
Sean Reeser
2c285f563a Update branding to 6.0.120 2023-06-19 10:36:32 -07:00
dotnet-bot
7928c0c620 Merge in 'release/7.0.1xx' changes 2023-06-19 17:31:22 +00:00
Michael Simons
523e11f7df
Update source-build-tarball-build-official.yml triggers (#16733) 2023-06-19 17:19:35 +00:00
DotNet Bot
a0f1d99cf7 [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.8 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.8 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.8-servicing.23314.7 to 7.0.8-servicing.23315.16 (parent: Microsoft.NET.Sdk)
2023-06-16 22:23:25 +00:00
DotNet Bot
53e9a51eb5 [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.7-servicing.23275.3 to 7.0.8-servicing.23315.5 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.7-servicing.23275.3 to 7.0.8-servicing.23315.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.3 to 7.0.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.7-servicing.23274.8 to 7.0.8-servicing.23314.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.7-servicing.23274.5 to 7.0.8-servicing.23314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.7 to 7.0.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.7-servicing.23274.5 to 7.0.8-servicing.23314.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100: from 7.0.7 to 7.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.7-servicing.23274.4 to 7.0.8-servicing.23313.27 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100: from 7.0.7 to 7.0.8 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
2023-06-16 19:25:33 +00:00
Sean Reeser
d99ea595d0 Merged PR 31974: [internal/release/7.0.1xx] Merge from public
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
2023-06-16 18:51:01 +00:00
Noah Gilson
e0d106f081
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#16695) 2023-06-16 10:58:42 -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
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
d04344ab77 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-06-15 20:09:53 -07:00
v-wuzhai
f036db2064
[release/6.0.4xx] Update dependencies from dotnet/arcade (#16697) 2023-06-15 19:52:16 -07:00