Commit graph

24012 commits

Author SHA1 Message Date
DotNet-Bot
952fd4a43a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220914.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22464.21

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.2.1-rc.7 -> To Version 6.2.2-rc.1 (parent: Microsoft.NET.Sdk
2022-09-14 16:08:36 +00:00
dotnet-bot
cfc0f130dc Merge in 'release/6.0.1xx' changes 2022-09-14 04:00:44 +00:00
NET Source-Build Bot
f9c278be33
.NET Source-Build 6.0.109 September 2022 Updates (#14482)
* update global.json and Versions.props for .NET SDK 6.0.109

* Use re-uploaded SB artifacts tarball version

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-09-14 03:50:12 +00:00
DotNet-Bot
b45ac4a743 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.41
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.41
2022-09-14 00:56:34 +00:00
DotNet-Bot
05ac09da1c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220913.34
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22463.34
2022-09-13 23:54:36 +00:00
dotnet-bot
eb1d52b430 Merge in 'release/6.0.4xx' changes 2022-09-13 22:49:56 +00:00
Marc Paine
5707f80e81
Merge pull request #14479 from vseanreesermsft/internal-merge-6.0.4xx-2022-09-13-1003
Merging internal commits for release/6.0.4xx
2022-09-13 15:37:52 -07:00
Daniel Plaisted
af7672089f Merged PR 25723: use mktemp to correctly use temp files
Apply https://dev.azure.com/dnceng/internal/_git/dotnet-installer/pullrequest/24828 to 6.0.4xx
2022-09-13 22:09:00 +00:00
Sean Reeser
24feaa10a1 Merge commit '58a93139d80490d0724b4d862ba8ee00ceae45d3' into internal-merge-6.0.1xx-2022-09-13-1003 2022-09-13 10:03:50 -07:00
Sean Reeser
1fdee73365 Merge commit 'd61314894c0fdcdb6e9d9c9f1ff5f8a483570d33' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-13 10:03:41 -07:00
Sean Reeser
2115855cf9 Merge commit '0906eae6f8c72882c197e346b9125f0b69c4b3a7' into internal-merge-6.0.4xx-2022-09-13-1003 2022-09-13 10:03:32 -07:00
73436261e3
GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516) 2022-09-13 09:20:55 -04:00
Noah Gilson
be85081b6f use mktemp to correctly use temp files 2022-09-12 21:35:42 -04:00
DotNet-Bot
4ba209a45a Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220912.31
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22462.31
2022-09-13 00:20:00 +00:00
DotNet-Bot
7a7236272e Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220908.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22458.13
2022-09-08 22:07:13 +00:00
DotNet-Bot
d10c9b7871 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220907.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22457.5
2022-09-07 08:49:12 +00:00
dotnet-bot
3866bd13ee Merge in 'release/6.0.4xx' changes 2022-09-07 07:48:09 +00:00
v-wuzhai
87b6130a29
Merge pull request #14455 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-09-07 00:37:49 -07:00
Jason Zhai
8e5444f2c8 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-09-06 23:26:24 -07:00
DotNet-Bot
24a4bb58f0 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220906.40
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.305-servicing.22456.40
2022-09-06 21:34:39 +00:00
dotnet-bot
10f48276b0 Merge in 'release/6.0.1xx' changes 2022-09-06 20:27:47 +00:00
dotnet-bot
1a05eb9e93 Merge in 'release/6.0.3xx' changes 2022-09-06 20:27:19 +00:00
dotnet-bot
e2d551c38e Merge in 'release/6.0.4xx' changes 2022-09-06 20:27:19 +00:00
Marc Paine
207228c695
Merge pull request #14450 from vseanreesermsft/branding-6.0.110-2022-09-06-1031
Update branding to 6.0.110
2022-09-06 13:16:07 -07:00
Marc Paine
d9b20a5108
Merge pull request #14451 from vseanreesermsft/branding-6.0.305-2022-09-06-1031
Update branding to 6.0.305
2022-09-06 13:15:56 -07:00
Marc Paine
f81ede1f6a
Merge pull request #14452 from vseanreesermsft/branding-6.0.402-2022-09-06-1031
Update branding to 6.0.402
2022-09-06 13:15:44 -07:00
Sean Reeser
b1ee7db7b0 Update branding to 6.0.402 2022-09-06 10:31:43 -07:00
Sean Reeser
97aa46b7d2 Update branding to 6.0.305 2022-09-06 10:31:38 -07:00
Sean Reeser
1f6925cf96 Update branding to 6.0.110 2022-09-06 10:31:33 -07:00
dotnet-bot
6115afb690 Merge in 'release/6.0.4xx' changes 2022-09-02 06:29:56 +00:00
v-wuzhai
30a267be62
Merge pull request #14436 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-09-01 23:15:13 -07:00
Jason Zhai
7d79033164 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-09-01 20:10:07 -07:00
dotnet-bot
4f86da42de Merge in 'release/6.0.1xx' changes 2022-09-01 19:28:34 +00:00
dotnet-bot
f4b36d794d Merge in 'release/6.0.3xx' changes 2022-09-01 19:28:34 +00:00
dotnet-bot
78380c12c3 Merge in 'release/6.0.4xx' changes 2022-09-01 19:28:26 +00:00
Marc Paine
cd66fd022e
Merge pull request #14426 from dotnet/release/6.0.1xx-publicPoolNames
Update public pool names
2022-09-01 12:18:50 -07:00
Marc Paine
ac6f5c3c8a
Merge pull request #14427 from dotnet/release/6.0.3xx-publicPoolNames
Update public pool names
2022-09-01 12:18:38 -07:00
Marc Paine
5d12035c88
Merge pull request #14428 from dotnet/release/6.0.4xx-publicPoolNames
Update public pool names
2022-09-01 12:18:28 -07:00
DotNet-Bot
956a61ea04 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220901.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22421.4 -> To Version 6.0.304-servicing.22451.9
2022-09-01 18:00:10 +00:00
Alex Perovich
95d55b351e Update public pool names 2022-08-31 17:18:01 -07:00
Alex Perovich
ddfb6a9e05 Update public pool names 2022-08-31 17:17:51 -07:00
Alex Perovich
e3842453dc Update public pool names 2022-08-31 17:17:42 -07:00
DotNet Bot
69459735fb [internal/release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages 2022-08-31 13:09:27 +00:00
DotNet Bot
d61314894c Merged PR 25187: [internal/release/6.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.DotNet.Common.ItemTemplates**: from 6.0.304 to 6.0.304 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.304-servicing.22420.6 to 6.0.304-servicing.22420.10 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.304 to 6.0.304 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:b5bca336-8d99-407e-c145-08d9d60066b9)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: b5bca336-8d99-407e-c145-08d9d60066b9
- **Build**: 20220821.4
- **Date Produced**: August 22, 2022 2:15:16 AM UTC
- **Commit**: 092f7d6f55df8dd0e5e88058aeb7f831679112d3
- **Branch**: refs/heads/internal/release/6.0.3xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.304-servicing.22420.10 to 6.0.304-servicing.22421.4][1]
  - **Microsoft.NET.Sdk**: [from 6.0.304-servicing.22420.10 to 6.0.304-servicing.22421.4][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.304 to 6.0.304][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.304-servicing.22420.6 to 6.0.304-servicing.22420.10][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.304 to 6.0.304][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCbc6e626&targetVersion=GC092f7d6&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC1931b9e&targetVersion=GC0b3a1bf&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:b5bca336-8d99-407e-c145-08d9d60066b9)
2022-08-22 05:26:53 +00:00
DotNet Bot
0906eae6f8 Merged PR 25184: [internal/release/6.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 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.401 to 6.0.401 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.401-rtm.22417.14 to 6.0.401-rtm.22420.12 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.401 to 6.0.401 (parent: Microsoft.NET.Sdk)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.9-servicing.22417.1 to 6.0.9-servicing.22419.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.9 to 6.0.9 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31
- **Build**: 20220820.14
- **Date Produced**: August 21, 2022 7:25:14 AM UTC
- **Commit**: ed5baa44710ee9337df44cfd8044e5513dba77ef
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.401-servicing.22419.41 to 6.0.401-servicing.22420.14][3]
  - **Microsoft.NET.Sdk**: [from 6.0.401-servicing.22419.41 to 6.0.401-servicing.22420.14][3]
  - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.9 to 6.0.9][4]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3][4]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.9-servicing.22417.4 to 6.0.9-servicing.22420.3][4]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.401 to 6.0.401][5]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.401-rtm.22417.14 to 6.0.401-rtm.22420.7][5]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [...
2022-08-22 03:48:01 +00:00
DotNet-Bot
d7151f758e Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220821.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.304-servicing.22420.10 -> To Version 6.0.304-servicing.22421.4

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.304 -> To Version 6.0.304 (parent: Microsoft.NET.Sdk
2022-08-22 02:41:08 +00:00
dotnet-bot
6d2b7ccd6c Merge in 'release/6.0.4xx' changes 2022-08-22 02:16:22 +00:00
v-wuzhai
139aa5903a
Merge pull request #14358 from dotnet/darc-release/6.0.4xx-a4d96a8d-92b6-4469-a94a-65c27bcf3263
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-08-21 19:06:47 -07:00
DotNet Bot
58a93139d8 Merged PR 25186: [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.DotNet.Common.ItemTemplates**: from 6.0.109 to 6.0.109 (parent: Microsoft.NET.Sdk)
  - **Microsoft.TemplateEngine.Cli**: from 6.0.109-servicing.22419.5 to 6.0.109-servicing.22420.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.109 to 6.0.109 (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**: 20220821.3
- **Date Produced**: August 21, 2022 4:38:16 PM UTC
- **Commit**: 7fffe6d57cecdb3a726b915334d1add560bd6134
- **Branch**: refs/heads/internal/release/6.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.109-servicing.22420.9 to 6.0.109-servicing.22421.3][1]
  - **Microsoft.NET.Sdk**: [from 6.0.109-servicing.22420.9 to 6.0.109-servicing.22421.3][1]
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.109 to 6.0.109][2]
  - **Microsoft.TemplateEngine.Cli**: [from 6.0.109-servicing.22419.5 to 6.0.109-servicing.22420.11][2]
  - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.109 to 6.0.109][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf89584a&targetVersion=GC7fffe6d&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC95bb9a2&targetVersion=GC2410d64&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698)
2022-08-22 01:38:28 +00:00
DotNet-Bot
1474578b5d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220821.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.401-servicing.22419.41 -> To Version 6.0.401-servicing.22421.5

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 6.0.9 -> To Version 6.0.9 (parent: Microsoft.NET.Sdk
2022-08-21 17:06:53 +00:00