Commit graph

23727 commits

Author SHA1 Message Date
dotnet-maestro[bot]
13a3901c10 Update dependencies from https://github.com/dotnet/sdk build 20220712.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.18

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.2 (parent: Microsoft.NET.Sdk
2022-07-12 23:04:27 +00:00
Marc Paine
96fd3f4e9d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-07-12 15:55:24 -07:00
Marc Paine
667bae46a4
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-12 15:53:48 -07:00
DotNet Bot
451555d8a4 Merged PR 24064: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220712.9
- **Date Produced**: July 12, 2022 8:29:17 PM UTC
- **Commit**: 4d9c8c2a2188ca251ddddaa8fde44cc364925518
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.303-servicing.22358.14 to 6.0.303-servicing.22362.9][1]
  - **Microsoft.NET.Sdk**: [from 6.0.303-servicing.22358.14 to 6.0.303-servicing.22362.9][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-07-12 22:36:14 +00:00
dotnet-maestro[bot]
50bd0f6567 Update dependencies from https://github.com/dotnet/sdk build 20220712.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.14
2022-07-12 21:49:35 +00:00
DotNet-Bot
5334c3f76c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.303-servicing.22358.14 -> To Version 6.0.303-servicing.22362.9
2022-07-12 20:57:27 +00:00
DotNet-Bot
23560d61e3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220712.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22355.10 -> To Version 6.0.108-servicing.22362.8

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.NETCore.Platforms,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.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.SourceBuild.Intermediate.source-build
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-12 20:53:11 +00:00
dotnet-bot
4f2c281cf7 Merge in 'release/6.0.3xx' changes 2022-07-12 19:22:06 +00:00
dotnet-bot
834af7b5f3 Merge in 'release/6.0.1xx' changes 2022-07-12 19:21:53 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
William Godbe
853275fdcb
Update Asp.Net template (#14111) 2022-07-12 12:13:55 -07:00
William Godbe
e22344fc38
Update asp.net template version (#14112) 2022-07-12 12:13:47 -07:00
Marc Paine
310d3c954f
Merge pull request #14114 from wtgodbe/internal-merge-6.0.3xx-2022-07-12-1057
Merging internal commits for release/6.0.3xx
2022-07-12 12:10:30 -07:00
Marc Paine
7bc522bbb6
Merge pull request #14115 from wtgodbe/internal-merge-6.0.1xx-2022-07-12-1057
Merging internal commits for release/6.0.1xx
2022-07-12 12:10:27 -07:00
Will Godbe
23a55e8341 Merge commit 'f6ec7508e3b20ad6fbc4ffa8ea4ed8818ffccc1d' into internal-merge-6.0.1xx-2022-07-12-1057 2022-07-12 10:57:21 -07:00
Will Godbe
4d81493240 Merge commit 'c857713418e715e1ca1a5c9fa5c360aaf71d2231' into internal-merge-6.0.3xx-2022-07-12-1057 2022-07-12 10:57:14 -07:00
Marc Paine
fcac10b492
Merge pull request #14082 from mmitche/branding-6.0.303-2022-07-05-1230
Update branding to 6.0.303
2022-07-12 09:17:07 -07:00
v-wuzhai
dd1baed893
Merge pull request #14105 from dotnet/darc-release/6.0.4xx-cbcfeb9b-5f60-40bd-9b18-50ae67fa66f9
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 19:20:41 -07:00
DotNet-Bot
be25e9cf89 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220711.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22355.10 -> To Version 6.0.108-servicing.22361.14

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.NETCore.Platforms,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.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.6.0
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-12 00:07:18 +00:00
dotnet-maestro[bot]
6a9c07da4d Update dependencies from https://github.com/dotnet/sdk build 20220711.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.7 -> To Version 6.0.400-preview.22361.12
2022-07-11 23:21:37 +00:00
DotNet Bot
d023c2b972 Merged PR 23888: [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220708.14
- **Date Produced**: July 9, 2022 12:29:05 AM UTC
- **Commit**: 8306089959e2e9a8d60145dbb09e6e97d78c088c
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.302-servicing.22323.12 to 6.0.303-servicing.22358.14][5]
  - **Microsoft.NET.Sdk**: [from 6.0.302-servicing.22323.12 to 6.0.303-servicing.22358.14][5]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.7 to 6.0.8][6]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22356.2][6]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22356.2][6]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22356.4][7]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.7 to 6.0.8][7]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22356.4][7]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.7 to 6.0.8][7]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.7 to 6.0.8][7]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.7 to 6.0.8][7]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.5][7]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.7 to 6.0.8][8]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15][8]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.7 to 6.0.8][8]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15][8]
  - **dotnet-dev-certs**: [from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15][8]
  - **dotnet-user-secrets**: [from 6.0.7-servicing.22322.5 to 6.0.8-servicing.22356.15][8]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.302 to 6.0.303][9]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.302-servicing.22323.9 to 6.0.303-servicing.22358.5][9]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.302 to 6.0.303][9]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.7 to 6.0.8][6]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.7 to 6.0.8][6]
  - **Microsoft.FSharp.Compiler**: [from 12.0.4-beta.22274.4 to 12.0.4-beta.22329.1][10]
  - **Microsoft.SourceBuild.Intermediate.fsharp**: [from 6.0.5-beta.22274.4 to 6.0.5-beta.22329.1][10]

[5]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdc262f0&targetVersion=GC8306089&_a=files
[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC657c81c&targetVersion=GC03bd31...
2022-07-11 23:00:37 +00:00
Grace Kulin
d8947e4fe2
Merge pull request #14104 from dotnet/darc-release/6.0.4xx-625886fc-478d-4959-9e60-accd4b88bc0e
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 14:58:24 -07:00
dotnet-maestro[bot]
ef25719e7c Update dependencies from https://github.com/dotnet/sdk build 20220711.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22356.20 -> To Version 6.0.400-preview.22361.7

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.3.0-release-20220627-03 -> To Version 17.3.0-release-20220708-01 (parent: Microsoft.NET.Sdk
2022-07-11 17:11:21 +00:00
v-wuzhai
49f92edbb1
Merge pull request #14097 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-07-10 18:19:54 -07:00
DotNet-Bot
d384f3f5f7 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220708.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22358.14

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.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.NETCore.Platforms,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.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 6.0.7 -> To Version 6.0.8 (parent: Microsoft.NET.Sdk
2022-07-09 00:56:00 +00:00
DotNet Bot
6d466e5903 Merged PR 23894: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220705.10
- **Date Produced**: July 5, 2022 11:43:51 PM UTC
- **Commit**: 7f5abe2c7c62767d67bdcd81f9b1cd9e788fdf0d
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.107-servicing.22323.13 to 6.0.108-servicing.22355.10][1]
  - **Microsoft.NET.Sdk**: [from 6.0.107-servicing.22323.13 to 6.0.108-servicing.22355.10][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-07-08 23:51:13 +00:00
MichaelSimons
d8580fbd61 Remove unneccessary source-build patch 2022-07-08 15:01:48 +00:00
Jason Zhai
46ac9ba248 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-07-07 19:22:36 -07:00
Marc Paine
5892113c0e
Merge pull request #14017 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-07-07 14:09:43 -07:00
dotnet-maestro[bot]
5eb8a241c8 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22357.1
2022-07-07 14:58:40 +00:00
DotNet-Bot
f3f06aa629 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22357.1
2022-07-07 14:58:35 +00:00
v-wuzhai
c671341ee8
Merge pull request #14091 from dotnet/darc-release/6.0.4xx-8fbeedc3-67ca-409f-a41c-9e3cbef13571
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-06 19:07:41 -07:00
Marc Paine
af4b8739b3 run update dependencies. This may conflict when it tries to merge internally though 2022-07-06 16:49:00 -07:00
DotNet-Bot
25bd4e7cbb Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.21

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22274.4 -> To Version 12.0.4-beta.22329.1 (parent: Microsoft.NET.Sdk
2022-07-06 22:48:10 +00:00
dotnet-maestro[bot]
b27b4ecf9f Update dependencies from https://github.com/dotnet/sdk build 20220706.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22355.11 -> To Version 6.0.400-preview.22356.20
2022-07-06 22:38:20 +00:00
Marc Paine
2e0a0276d8
Merge pull request #14075 from dotnet/Jason/UpdateAlpine313
Update alpine.3.13 to the new one
2022-07-06 14:47:43 -07:00
DotNet-Bot
2b4cdefbd1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220706.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22356.2
2022-07-06 08:20:55 +00:00
v-wuzhai
4070eca813
Merge pull request #14085 from dotnet/darc-release/6.0.4xx-f2281bb1-7336-4277-a761-882bf8f46349
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-05 19:12:33 -07:00
dotnet-maestro[bot]
e77bb371d7 Update dependencies from https://github.com/dotnet/sdk build 20220705.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.11 -> To Version 6.0.400-preview.22355.11
2022-07-06 00:32:05 +00:00
DotNet-Bot
f94f58591a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.107-servicing.22323.13 -> To Version 6.0.108-servicing.22355.10
2022-07-06 00:09:57 +00:00
DotNet-Bot
995f7cd6e2 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220705.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.302-servicing.22323.12 -> To Version 6.0.303-servicing.22355.5
2022-07-05 22:39:42 +00:00
Marc Paine
0479ac2dc2
Merge pull request #14081 from mmitche/branding-6.0.108-2022-07-05-1230
Update branding to 6.0.108
2022-07-05 13:33:06 -07:00
Matt Mitchell
da15ec1396 Update branding to 6.0.303 2022-07-05 12:30:19 -07:00
Matt Mitchell
0e6c0b83d5 Update branding to 6.0.108 2022-07-05 12:30:15 -07:00
dotnet-maestro[bot]
4efe6994e3 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220705.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22355.1
2022-07-05 15:01:11 +00:00
DotNet-Bot
2eaeea4697 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220705.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22314.1 -> To Version 6.0.0-servicing.22355.1
2022-07-05 15:00:58 +00:00
Jason Zhai
ff9ad3ef23 Update alpine.3.13 to the new one 2022-07-05 00:38:26 -07:00
v-wuzhai
dc1792703b
Merge pull request #14070 from dotnet/darc-release/6.0.4xx-2b473fa1-5cd8-4c21-b16a-aa5de84ecccd
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-03 22:36:39 -07:00
dotnet-maestro[bot]
35e532cfe0 Update dependencies from https://github.com/dotnet/sdk build 20220701.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.1 -> To Version 6.0.400-preview.22351.11
2022-07-02 01:15:45 +00:00
dotnet-maestro[bot]
8a608b5043 Update dependencies from https://github.com/dotnet/sdk build 20220701.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22351.1 -> To Version 6.0.400-preview.22351.6
2022-07-02 00:11:20 +00:00