Commit graph

23868 commits

Author SHA1 Message Date
Marc Paine
ff52e56145
Revert emsdk hash 2022-10-05 14:43:28 -07:00
Marc Paine
b779db552d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-10-05 11:50:00 -07:00
Marc Paine
d1a0d6bb62
Merge pull request #14659 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-10-05 10:16:46 -07:00
Marc Paine
fd7ea35f90 Merge branch 'merge/release/6.0.1xx-to-release/6.0.3xx' of https://github.com/dotnet-maestro-bot/core-sdk into merge/release/6.0.1xx-to-release/6.0.3xx 2022-10-04 15:48:00 -07:00
Marc Paine
c0718ca0ae
Merge pull request #14603 from dotnet/Jason/UpdateImagesFor601xx
Update windows images for release/6.0.1xx
2022-10-04 11:22:19 -07:00
Marc Paine
a7dfb6260f
Merge pull request #14654 from vseanreesermsft/branding-6.0.111-2022-10-04-0937
Update branding to 6.0.111
2022-10-04 11:20:05 -07:00
Marc Paine
9944284877
Merge pull request #14655 from vseanreesermsft/branding-6.0.306-2022-10-04-0937
Update branding to 6.0.306
2022-10-04 11:19:55 -07:00
Marc Paine
9d749467a5
Merge pull request #14656 from vseanreesermsft/branding-6.0.403-2022-10-04-0937
Update branding to 6.0.403
2022-10-04 11:19:44 -07:00
Sean Reeser
19a9961977 Update branding to 6.0.403 2022-10-04 09:37:55 -07:00
Sean Reeser
ba1239dfc7 Update branding to 6.0.306 2022-10-04 09:37:50 -07:00
Sean Reeser
32d8c6f54d Update branding to 6.0.111 2022-10-04 09:37:46 -07:00
Jason Zhai
c736ce2bdd Update windows images for release/6.0.1xx 2022-09-27 23:44:43 -07:00
Logan Bussell
8aec008f2e
Fix MS.Extensions versions in dotnet-format (#14566) 2022-09-21 21:54:18 -07:00
v-wuzhai
f51c5f05f5
Merge pull request #14515 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-15 22:29:11 -07:00
Jason Zhai
5b3fdeda69 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-09-15 19:39:44 -07:00
Matt Mitchell
5f257aebc3
Merge pull request #14480 from vseanreesermsft/internal-merge-6.0.3xx-2022-09-13-1003
Merging internal commits for release/6.0.3xx
2022-09-15 12:18:55 -07:00
v-wuzhai
1c38151cab
Merge pull request #14502 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-14 23:59:02 -07:00
Jason Zhai
f6029750a6 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-09-14 19:25:04 -07:00
Matt Mitchell
437a3088ea
Merge branch 'release/6.0.3xx' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-14 14:45:49 -07:00
Matt Mitchell
ed966db67a
Merge pull request #14497 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-09-14 14:44:54 -07:00
Matt Mitchell
b5f732e4b5
Merge pull request #14481 from vseanreesermsft/internal-merge-6.0.1xx-2022-09-13-1003
Merging internal commits for release/6.0.1xx
2022-09-14 14:38:45 -07:00
dotnet-maestro[bot]
934d6b31df
Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14498)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-14 14:36:42 -07:00
dotnet-maestro[bot]
5364e129c0
Update dependencies from https://github.com/dotnet/arcade build 20220913.7 (#14499)
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22412.2 -> To Version 6.0.0-beta.22463.7

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-09-14 14:36:17 -07:00
Marc Paine
2138fc1031
Merge pull request #14496 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-14 12:32:48 -07:00
Marc Paine
c50431e473
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-09-14 12:31:35 -07:00
Doug Bunting
d42f27ecbe
[6.0.1xx] Update template versions from dotnet/aspnetcore (#14485) 2022-09-14 10:00:30 -07:00
Doug Bunting
a5a36d4af5
[6.0.3xx] Update template versions from dotnet/aspnetcore (#14486) 2022-09-14 10:00:19 -07:00
Doug Bunting
ed6ae3ed1e
[6.0.4] Update template versions from dotnet/aspnetcore (#14487) 2022-09-14 10:00:10 -07: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
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
Sean Reeser
24feaa10a1 Merge commit '58a93139d8' into internal-merge-6.0.1xx-2022-09-13-1003 2022-09-13 10:03:50 -07:00
Sean Reeser
1fdee73365 Merge commit 'd61314894c' into internal-merge-6.0.3xx-2022-09-13-1003 2022-09-13 10:03:41 -07:00
Sean Reeser
2115855cf9 Merge commit '0906eae6f8' into internal-merge-6.0.4xx-2022-09-13-1003 2022-09-13 10:03:32 -07: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
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
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
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
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
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