Commit graph

28649 commits

Author SHA1 Message Date
dotnet-bot
bedcfd3281 Merge in 'release/7.0.4xx' changes 2023-07-19 19:37:14 +00:00
Marc Paine
b07e54c89f
Update implicit version for August release (#17016) 2023-07-19 12:27:17 -07:00
Marc Paine
ad6ee0fd85
Update implicit version for August release 2023-07-19 09:56:46 -07:00
DotNet Bot
cef5f51085 Merged PR 32712: [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.WindowsDesktop.App.Ref**: from 7.0.10 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.10 to 7.0.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:42f6b899-0677-45e7-d6f8-08db826b460b)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 42f6b899-0677-45e7-d6f8-08db826b460b
- **Build**: 20230717.20
- **Date Produced**: July 17, 2023 8:24:02 PM UTC
- **Commit**: 9f9d6fed9c294ab1689c274616ef1e969b32d34a
- **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.23367.7 to 7.0.400-rtm.23367.20][1]
  - **Microsoft.NET.Sdk**: [from 7.0.400-rtm.23367.7 to 7.0.400-rtm.23367.20][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.400-rtm.23367.7 to 7.0.400-rtm.23367.20][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 7.0.10 to 7.0.10][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: [from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: [from 7.0.10-servicing.23364.4 to 7.0.10-servicing.23367.2][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.10 to 7.0.10][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.10-servicing.23363.13 to 7.0.10-servicing.23364.5][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 7.0.10 to 7.0.10][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.10-servicing.23364.1 to 7.0.10-servicing.23364.4][4]
...
2023-07-17 21:53:26 +00:00
DotNet-Bot
79bfb91009 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.20
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.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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.10 (parent: Microsoft.NET.Sdk
2023-07-17 21:11:18 +00:00
DotNet Bot
ae53b8aa72 Merged PR 32699: [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.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.23364.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23364.4 (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.23363.13 (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.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.9-servicing.23320.18 to 7.0.10-servicing.23363.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.9 to 7.0.10...
2023-07-17 20:31:04 +00:00
dotnet-bot
d76bf1b7c8 Merge in 'release/7.0.4xx' changes 2023-07-17 19:25:01 +00:00
Forgind
99dc801b34
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16998) 2023-07-17 12:00:17 -07:00
Jason Zhai
b85ce887ab Merge branch 'release/7.0.3xx' into release/7.0.4xx 2023-07-16 22:56:32 -07:00
Forgind
9d01f1819a
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.3xx' (#16994) 2023-07-14 16:17:57 -07:00
dotnet-bot
e1b374fabe Merge in 'release/7.0.4xx' changes 2023-07-14 18:20:14 +00:00
Forgind
a277d24b3f
[automated] Merge branch 'release/7.0.3xx' => 'release/7.0.4xx' (#16987) 2023-07-14 11:08:27 -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
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
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
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
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-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]
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
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
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
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
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