Commit graph

23644 commits

Author SHA1 Message Date
v-wuzhai
70e189db5c
Merge pull request #14296 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-08-09 23:36:50 -07:00
v-wuzhai
e2d1611b9b
Merge pull request #14293 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-08-09 23:01:49 -07:00
Jason Zhai
4045c96779 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-08-09 19:17:12 -07:00
NET Source-Build Bot
f2498acf16
update global.json and Versions.props for .NET SDK 6.0.108 (#14291) 2022-08-09 23:05:31 +00:00
Marc Paine
5276384f94
Merge pull request #14290 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-08-09 14:06:44 -07:00
Marc Paine
1fa0da7fc4
Merge pull request #14289 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-08-09 14:06:31 -07:00
Marc Paine
feab66b98e
Merge pull request #14284 from vseanreesermsft/internal-merge-6.0.1xx-2022-08-09-1110
Merging internal commits for release/6.0.1xx
2022-08-09 14:03:14 -07:00
Marc Paine
eaaf3b3160
Merge pull request #14276 from dotnet/marcpopMSFT-addbuildtoversion
Add the full nuget version into the .version file
2022-08-09 14:02:46 -07:00
Doug Bunting
7268b5cff3
[6.0.3xx] Update template versions from dotnet/aspnetcore (#14244) 2022-08-09 19:27:54 +00:00
Doug Bunting
c4fc9114a7
[6.0.1xx] Update template versions from dotnet/aspnetcore (#14243) 2022-08-09 19:27:40 +00:00
Doug Bunting
d2d8560f0e
[6.0.4xx] Update template versions from dotnet/aspnetcore (#14245) 2022-08-09 19:22:46 +00:00
Marc Paine
b33d35cbe4
Merge pull request #14266 from dotnet/marcpopMSFT-fixapphostdownload
Stop app host downloads for android
2022-08-09 11:48:32 -07:00
Sean Reeser
9927e69501 Merge commit '4e3a463d2b2ad382a04bdf570e9154c8ec7fe37e' into internal-merge-6.0.1xx-2022-08-09-1110 2022-08-09 11:10:12 -07:00
Marc Paine
063d79ea3e
Merge pull request #14270 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-08-08 15:51:27 -07:00
Marc Paine
16df0cb2b2
Merge pull request #14182 from dotnet/darc-release/6.0.4xx-aad6e795-4562-4ce8-b1b6-b44b2ab82baf
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-08-08 15:49:43 -07:00
Marc Paine
e2a0da3d8f Add the full nuget version into the .version file 2022-08-08 14:21:30 -07:00
Marc Paine
372935eab6
Merge pull request #14268 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-08-05 15:48:17 -07:00
Michael Simons
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
Marc Paine
005dd2364d
Stop app host downloads for android 2022-08-05 12:04:17 -07:00
dotnet-maestro[bot]
4514a2a032 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220805.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22405.1
2022-08-05 14:28:27 +00:00
dotnet-maestro[bot]
807fbf16c4 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220804.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22404.1
2022-08-04 15:01:09 +00:00
Marc Paine
a55a0d2fba
Merge pull request #14247 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-08-02 18:29:20 -07:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
Marc Paine
8dcf8232d7
Merge pull request #14236 from vseanreesermsft/branding-6.0.401-2022-08-02-0918
Update branding to 6.0.401
2022-08-02 15:33:45 -07:00
Marc Paine
4113612ee8
Merge pull request #14241 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-08-02 14:56:31 -07:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Marc Paine
8c3b1d2045
Revert branding 2022-08-02 12:54:22 -07:00
Marc Paine
7132adc319
Merge pull request #14152 from dotnet/marcpopMSFT-updatemacosimage
Update MacOS image
2022-08-02 12:50:20 -07:00
Marc Paine
9438d7ec6f
Merge pull request #14214 from dotnet/marcpopMSFT-fix50templateversion
Fix the 5.0 wpf/winforms template versions
2022-08-02 12:47:45 -07:00
Marc Paine
b873af05ec
Merge pull request #14234 from vseanreesermsft/branding-6.0.109-2022-08-02-0918
Update branding to 6.0.109
2022-08-02 12:46:55 -07:00
Marc Paine
7046244198
Servicing label 2022-08-02 12:45:21 -07:00
Marc Paine
978fee91b6
Merge pull request #14235 from vseanreesermsft/branding-6.0.304-2022-08-02-0918
Update branding to 6.0.304
2022-08-02 10:56:20 -07:00
Sean Reeser
fdea79d106 Update branding to 6.0.401 2022-08-02 09:18:19 -07:00
Sean Reeser
f66d2fea34 Update branding to 6.0.304 2022-08-02 09:18:15 -07:00
Sean Reeser
d7230fb9bd Update branding to 6.0.109 2022-08-02 09:18:10 -07:00
Marc Paine
cf729ea84f Fix the 6.0 WD template bundles to use the 6.0 templates. 2022-07-28 13:34:38 -07:00
Marc Paine
10cd2639da
Update Versions.props 2022-07-28 10:02:41 -07:00
dotnet-maestro[bot]
d7a4d67024 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220728.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22378.1
2022-07-28 14:53:29 +00:00
dotnet-maestro[bot]
a6eb5ad33e Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220727.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22377.1
2022-07-27 15:04:08 +00:00
dotnet-maestro[bot]
f6d8ed6077 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220722.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22372.1
2022-07-22 15:45:39 +00:00
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
dotnet-maestro[bot]
f2596c2ac9 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220720.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22370.1
2022-07-20 15:27:24 +00:00
Chris Rummel
4e3a463d2b Merged PR 24267: Revert CoherentParentDependency and fix version of source-build externals 2022-07-20 00:21:19 +00:00
DotNet Bot
486395280b Merged PR 24232: [internal/release/6.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 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698
- **Build**: 20220718.19
- **Date Produced**: July 18, 2022 9:38:19 PM UTC
- **Commit**: 17ea4a71a1adac805a17c272977139ddc6200bf9
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1]
  - **Microsoft.NET.Sdk**: [from 6.0.108-servicing.22368.7 to 6.0.108-servicing.22368.19][1]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.8 to 6.0.8][2]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.8-servicing.22363.10 to 6.0.8-servicing.22368.4][2]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.8-servicing.22363.7 to 6.0.8-servicing.22368.4][3]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.8 to 6.0.8][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.8-servicing.22363.8 to 6.0.8-servicing.22368.7][4]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a42b2d&targetVersion=GC17ea4a7&_a=files
[2]: https://dev.azure.com/dnceng/internal/_g...
2022-07-18 22:22:57 +00:00
DotNet Bot
f18b980dc0 Merged PR 24216: [internal/release/6.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.NETCore.Platforms**: from 6.0.5 to 6.0.5 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

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

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.108-servicing.22364.10 to 6.0.108-servicing.22368.7][1]
  - **Microsoft.NET.Sdk**: [from 6.0.108-servicing.22364.10 to 6.0.108-servicing.22368.7][1]
  - **Microsoft.NETCore.Platforms**: [from 6.0.5 to 6.0.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC7ee6a81&targetVersion=GC5a42b2d&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCf316191&targetVersion=GC0ec02c8&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-07-18 18:50:10 +00:00
DotNet-Bot
a1f9d557b3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220718.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.108-servicing.22364.10 -> To Version 6.0.108-servicing.22368.7

Dependency coherency updates

Microsoft.NETCore.Platforms
 From Version 6.0.5 -> To Version 6.0.5 (parent: Microsoft.NET.Sdk
2022-07-18 17:27:05 +00:00
Marc Paine
9b8f47e0f2
Update .vsts-ci.yml 2022-07-15 13:07:12 -07:00
Marc Paine
7a5b36b4a4
Merge pull request #13851 from dotnet/darc-release/6.0.4xx-6a07086d-2076-46c3-8687-e9435a81260c
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-07-14 16:33:24 -07:00
DotNet Bot
d12cf74ec8 Merged PR 24155: [internal/release/6.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 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.8-servicing.22362.4 to 6.0.8-servicing.22363.10 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.8-servicing.22362.4 to 6.0.8-servicing.22363.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.8-servicing.22362.13 to 6.0.8-servicing.22363.6 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.8-servicing.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.8-servicing.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.8-servicing.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.8-servicing.22363.5 to 6.0.8-servicing.22363.16 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.108 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.108-servicing.22363.6 to 6.0.108-servicing.22363.24 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.108 to 6.0.108 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.7-servicing.22322.3 to 6.0.8-servicing.22363.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.8 to 6.0.8 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.7-servicing.22322.2 to 6.0.8-servicing.22363.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **VS.Redist.Common.NetCore.Sha...
2022-07-14 22:33:58 +00:00
Marc Paine
9b9fc6cf97
Merge pull request #14144 from dotnet/marcpopMSFT-stabilizebranding
Stabilize branding and implicit version
2022-07-14 14:25:07 -07:00