Commit graph

28495 commits

Author SHA1 Message Date
DotNet-Bot
ad876c0b5d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.62
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.311 -> To Version 7.0.311

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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-19 04:41:41 +00:00
DotNet-Bot
bedf712c81 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.45
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.311 -> To Version 7.0.311

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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk
2023-10-19 03:36:40 +00:00
DotNet Bot
9492353f48 Merged PR 34520: [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.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.2 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.12-servicing.23478.2 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.12-servicing.23477.20 to 7.0.13-servicing.23516.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23479.22 to 7.0.13-servicing.23517.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.12-servicing.23478.3 to 7.0.13-servicing.23513.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.12 to 7.0.13 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.12-servicing.23478.2 to 7.0.13-servicing.23516.16 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23477.20 to 7.0.13-servicing.23516.30 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7....
2023-10-19 01:59:39 +00:00
DotNet-Bot
5047ef9061 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.32
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.311

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,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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk
2023-10-19 00:47:08 +00:00
dotnet-bot
832133a57c Merge in 'release/7.0.3xx' changes 2023-10-18 23:22:38 +00:00
Marc Paine
7322dae702
Update branding to 7.0.311 (#17567) 2023-10-18 16:08:55 -07:00
Sean Reeser
db57dadd26 Update branding to 7.0.311 2023-10-18 12:30:23 -07:00
dotnet-bot
da48c574a4 Merge in 'release/7.0.3xx' changes 2023-10-18 05:57:32 +00:00
v-wuzhai
668a871cf0
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17549) 2023-10-17 22:47:50 -07:00
DotNet-Bot
04962e3078 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.56
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.310

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,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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk
2023-10-18 03:22:59 +00:00
DotNet-Bot
4705b63277 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.42
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.310

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,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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk
2023-10-18 00:13:59 +00:00
dotnet-bot
de60c7d168 Merge in 'release/7.0.3xx' changes 2023-10-17 20:09:30 +00:00
dotnet-maestro[bot]
aa942314ca Update dependencies from https://github.com/dotnet/arcade build 20231017.4
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23513.2 -> To Version 7.0.0-beta.23517.4
2023-10-17 20:02:01 +00:00
Marc Paine
6d083ff154
[release/7.0.3xx] Update Windows SDK projection (#17544) 2023-10-17 13:00:58 -07:00
Manodasan Wignarajah
eee9b65420
Update Windows SDK projection 2023-10-17 11:27:27 -07:00
dotnet-bot
e870570068 Merge in 'release/7.0.3xx' changes 2023-10-16 20:09:30 +00:00
dotnet-maestro[bot]
7b19e53bf2
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17530)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2023-10-16 20:01:22 +00:00
Sean Reeser
30d2de7b69 Merged PR 34377: [internal/release/7.0.3xx] Merge from public
Merge from public release/7.0.3xx to internal/release/7.0.3xx and resolve conflicts if necessary
2023-10-13 19:14:09 +00:00
Marc Paine
611d25df33
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17496) 2023-10-12 11:29:13 -07:00
v-wuzhai
242c03a366
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17507) 2023-10-11 19:24:15 -07:00
dotnet-maestro[bot]
8cf3bdf83c Update dependencies from https://github.com/dotnet/arcade build 20231011.9
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9
2023-10-12 00:04:46 +00:00
Jason Zhai
b828069725 Merge branch 'release/7.0.1xx' into release/7.0.3xx 2023-10-10 23:26:29 -07:00
Marc Paine
8be1e68454
Merging internal commits for release/7.0.3xx (#17491) 2023-10-10 17:01:05 -07:00
Nikola Milosavljevic
010d736fac
.NET Source-Build 7.0.112 October 2023 Updates (#17495) 2023-10-10 15:41:29 -07:00
Sean Reeser
d79042907c Merge commit '552bd6c89b07627bc57be1c07b59e0e2c8934207' into internal-merge-7.0.3xx-2023-10-10-1031 2023-10-10 10:31:45 -07:00
Forgind
f6f1b4c098
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#17468) 2023-10-04 14:58:52 -07:00
Forgind
b97ea40f83
Merge branch 'release/7.0.3xx' into merge/release/7.0.1xx-to-release/7.0.3xx 2023-10-04 14:09:18 -07:00
Forgind
0dd530d64d
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#17465) 2023-10-04 14:00:27 -07:00
Forgind
58833719fe
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2023-10-04 12:53:49 -07:00
dotnet-maestro[bot]
23c6cc4823
[release/7.0.3xx] Update dependencies from dotnet/arcade (#17446)
[release/7.0.3xx] Update dependencies from dotnet/arcade
2023-10-04 17:13:57 +00:00
dotnet-bot
fe78b0ef49 Merge in 'release/7.0.3xx' changes 2023-10-04 00:23:55 +00:00
Marc Paine
510dea50c0
Update branding to 7.0.310 (#17462) 2023-10-03 17:14:29 -07:00
Marc Paine
3e619d3199
Update branding to 7.0.113 (#17461) 2023-10-03 17:14:26 -07:00
Marc Paine
eee6cb916f
Update branding to 6.0.416 (#17460) 2023-10-03 17:14:23 -07:00
Sean Reeser
07b77653a1 Update branding to 7.0.310 2023-10-03 15:46:52 -07:00
Sean Reeser
e30e5b6c74 Update branding to 7.0.113 2023-10-03 15:46:48 -07:00
Sean Reeser
b29045dcd4 Update branding to 6.0.416 2023-10-03 15:46:44 -07:00
DotNet Bot
552bd6c89b Merged PR 34164: [internal/release/frameshift/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230930.36
- **Date Produced**: October 1, 2023 2:06:09 AM UTC
- **Commit**: f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:d52de2a0-7c5a-452e-752b-08dbbf92e774)
2023-10-01 02:24:36 +00:00
DotNet Bot
bbe858fa8c Merged PR 34114: [internal/release/frameshift/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.AspNetCore.App.Ref**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230929.68
- **Date Produced**: September 30, 2023 5:41:36 AM UTC
- **Commit**: 5a48ee082690a5e3b6a0b51632071f89c2f8d725
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.6 to 7.0.309-servicing.23479.68][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 7.0.12 to 7.0.12][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 7.0.12 to 7.0.12][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **dotnet-dev-certs**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **dotnet-user-jwts**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]
  - **dotnet-user-secrets**: [from 7.0.12-servicing.23478.22 to 7.0.12-servicing.23479.22][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2cabc04368&targetVersion=GC...
2023-09-30 06:08:31 +00:00
DotNet-Bot
e610891a41 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.68
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309

Dependency coherency updates

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
 From Version 7.0.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-30 06:02:58 +00:00
Sean Reeser
a86bb55379 Merged PR 34044: Deleted 0002-Add-explicit-System.Text.Json-dependency.patch
Deleted 0002-Add-explicit-System.Text.Json-dependency.patch

The patch is unable to be applied.
2023-09-29 17:44:36 +00:00
Sean Reeser
f10d699fa9 Deleted 0002-Add-explicit-System.Text.Json-dependency.patch
The patch is unable to be applied.
2023-09-29 17:27:12 +00:00
DotNet Bot
655027cbb6 Merged PR 34041: [internal/release/frameshift/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.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.10-servicing.23367.2 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.10-servicing.23367.2 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.12 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.12-servicing.23478.2 to 7.0.12-servicing.23478.22 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.10-servicing.23364.4 to 7.0.12-servicing.23478.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230929.6
- **Date Produced**: September 29, 2023 4:28:01 PM UTC
- **Commit**: 2cabc043689054a1f0ddf5895d32572190515ae8
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23478.17 to 7.0.309-servicing.23479.6][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servic...
2023-09-29 16:49:52 +00:00
DotNet-Bot
8b85dc17dd Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.6
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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
 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-29 16:46:28 +00:00
DotNet Bot
46b5572002 Merged PR 34018: [internal/release/frameshift/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.NETCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-jwts**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 7.0.10-servicing.23364.39 to 7.0.12-servicing.23478.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.ILLink.Tasks**: from 7.0.100-1.23321.1 to 7.0.100-1.23401.1 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.10 to 7.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100**: from 7.0.10 to 7.0.11 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.7.0)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774
- **Build**: 20230928.17
- **Date Produced**: September 28, 2023 3:39:44 PM UTC
- **Commit**: 804aff807ca42d6f112bf7dd26dfe6161aa1f11b
- **Branch**: refs/heads/internal/release/frameshift/7.0.3xx
...
2023-09-28 16:26:56 +00:00
DotNet-Bot
ce6ed2d04a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.17
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.309

Dependency coherency updates

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.NET.ILLink.Tasks,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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-28 16:10:16 +00:00
DotNet-Bot
2f011300bf Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.8
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.307 -> To Version 7.0.309

Dependency coherency updates

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.NET.ILLink.Tasks
 From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk
2023-09-28 15:01:07 +00:00
Matt Thalman
71749d3383
Handle variations in branch names for triggering SB tarball build (#17434) 2023-09-27 21:48:21 +00:00
DotNet Bot
3f0b731d1d Merged PR 33761: [internal/release/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:ca5481e4-f667-4dcd-b176-08db3b93de76)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: ca5481e4-f667-4dcd-b176-08db3b93de76
- **Build**: 20230919.17
- **Date Produced**: September 19, 2023 6:25:46 PM UTC
- **Commit**: afdaa753974497c5189c6f8713aac005589771a5
- **Branch**: refs/heads/internal/release/7.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23465.30 to 7.0.309-servicing.23469.17][1]
  - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23465.30 to 7.0.309-servicing.23469.17][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23465.30 to 7.0.309-servicing.23469.17][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:ca5481e4-f667-4dcd-b176-08db3b93de76)
2023-09-19 18:52:23 +00:00
DotNet-Bot
21a1321b35 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.17
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.309 -> To Version 7.0.309
2023-09-19 18:48:29 +00:00