Commit graph

27423 commits

Author SHA1 Message Date
dotnet-maestro[bot]
f1d6cda9f0 Update dependencies from https://github.com/dotnet/arcade build 20230314.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.23122.4 -> To Version 7.0.0-beta.23164.3
2023-03-14 22:40:22 +00:00
Marc Paine
4568467fd8
Merging internal commits for release/6.0.1xx (#15790) 2023-03-14 12:53:42 -07:00
Marc Paine
5b75cc65bc
Merging internal commits for release/7.0.1xx (#15793) 2023-03-14 12:53:26 -07:00
dotnet-bot
8e88e45643 Merge in 'release/7.0.2xx' changes 2023-03-14 18:27:05 +00:00
Marc Paine
4ced9d90ae
Merging internal commits for release/6.0.3xx (#15791) 2023-03-14 11:18:51 -07:00
Marc Paine
d1fc6a8010
Merging internal commits for release/6.0.4xx (#15792) 2023-03-14 11:18:37 -07:00
Marc Paine
d8e8f7a055
Merging internal commits for release/7.0.2xx (#15794) 2023-03-14 11:18:26 -07:00
Marc Paine
446fafdc40
[7.0.2xx] Automate asp.net template updates into dotnet/installer (#15776) 2023-03-14 10:45:47 -07:00
Sean Reeser
b72a2d6071 Merge commit '6c74320bc3ea80d03493a069e4c424b19a5a1983' into internal-merge-7.0.2xx-2023-03-14-1018 2023-03-14 10:18:09 -07:00
Sean Reeser
7201dc8b2a Merge commit '5c12d17216f411669c0beb40956249ec48bcb818' into internal-merge-7.0.1xx-2023-03-14-1017 2023-03-14 10:17:58 -07:00
Sean Reeser
57bd78c21d Merge commit 'd8659ea151969e597785b032f243b7a537c620c1' into internal-merge-6.0.4xx-2023-03-14-1014 2023-03-14 10:14:19 -07:00
Sean Reeser
11ed90bade Merge commit '99a8aa0f90564eefc820dc45d1845fb6bd6dd282' into internal-merge-6.0.3xx-2023-03-14-1014 2023-03-14 10:14:10 -07:00
Sean Reeser
5db3cae3e2 Merge commit '1d8c2d93c0415677f39802a8d47c8aae7c2215a3' into internal-merge-6.0.1xx-2023-03-14-1013 2023-03-14 10:13:59 -07:00
Tom Deseyn
b672d91789
DotNetHelper: fix IsMonoRuntime being initialized before extracting the sdk. (#15646) 2023-03-14 08:03:24 -05:00
wtgodbe
0618b2c20d Automate asp.net template updates into dotnet/installer 2023-03-13 14:02:57 -07:00
Marc Paine
223e47f52f
[7.0.1xx] Automate Asp.net template updates in dotnet/installer (#15737) 2023-03-13 13:57:44 -07:00
DotNet Bot
62ccd21f94 Merged PR 29935: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230309.19
- **Date Produced**: March 9, 2023 10:02:00 PM UTC
- **Commit**: 0e787bcc8c233f3fdcac7156d1f103fabee3c5b4
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.203 to 7.0.203][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.203-servicing.23157.34 to 7.0.203-servicing.23159.19][1]
  - **Microsoft.NET.Sdk**: [from 7.0.203-servicing.23157.34 to 7.0.203-servicing.23159.19][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.203-servicing.23157.34 to 7.0.203-servicing.23159.19][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
2023-03-12 04:51:27 +00:00
Marc Paine
dabcbacd84
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15757) 2023-03-10 14:14:30 -08:00
wtgodbe
06070d10f6 Fixup 2023-03-10 10:18:12 -08:00
wtgodbe
6a0adcbcc0 Generalize 2023-03-10 10:12:51 -08:00
Jason Zhai
f8496d511c Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-09 21:49:55 -08:00
DotNet-Bot
e059a7607c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230309.19
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.203 -> To Version 7.0.203
2023-03-09 22:21:56 +00:00
Marc Paine
7ca349a7d4
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15731) 2023-03-09 13:18:15 -08:00
Marc Paine
e4695f8df2
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15724) 2023-03-09 13:18:05 -08:00
Marc Paine
90b6aec8ee
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15730) 2023-03-09 13:17:57 -08:00
Marc Paine
b16f378013
[release/7.0.2xx] Update dependencies from dotnet/arcade (#15610) 2023-03-09 13:17:19 -08:00
DotNet Bot
fa6a368a53 Merged PR 29885: [internal/release/7.0.2xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230307.34
- **Date Produced**: March 8, 2023 3:34:32 AM UTC
- **Commit**: 3760d8678b4a386b91b4018163f9e3e9e522f325
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.203][2]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23128.1 to 7.0.203-servicing.23157.34][2]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23127.3 to 4.5.2-3.23152.4][3]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC288f106&targetVersion=GC3760d86&_a=files
[3]: e2bc27d...019bee6

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)

[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.Compilers.Toolset**: from 4.5.0-6.23127.3 to 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)
2023-03-09 00:01:51 +00:00
William Godbe
17883b783a
More spelling 2023-03-08 09:57:18 -08:00
William Godbe
8a5d24ef41
Spelling 2023-03-08 09:56:52 -08:00
William Godbe
88c6d20576
Fixup 2023-03-08 09:54:51 -08:00
William Godbe
24e2e68b4a
Automate Asp.net template updates in dotnet/installer 2023-03-08 09:52:38 -08:00
DotNet-Bot
2a60f19fdd Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.34
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.202 -> To Version 7.0.203

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.5.0-6.23127.3 -> To Version 4.5.2-3.23152.4 (parent: Microsoft.NET.Sdk
2023-03-08 03:55:30 +00:00
Jason Zhai
5b6fe1117a Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-03-07 18:51:58 -08:00
Jason Zhai
6eee81f109 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2023-03-07 18:42:11 -08:00
Jason Zhai
7514796e54 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2023-03-07 18:38:58 -08:00
DotNet-Bot
c3fd1936b5 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.25
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.202 -> To Version 7.0.203
2023-03-08 02:14:40 +00:00
dotnet-bot
2d37618759 Merge in 'release/7.0.2xx' changes 2023-03-08 01:03:40 +00:00
Marc Paine
e47e22aac6
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15576) 2023-03-07 16:54:54 -08:00
Marc Paine
58c897f829
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15583) 2023-03-07 16:54:10 -08:00
Marc Paine
3a17ee2e6f
Update branding to 7.0.105 (#15721) 2023-03-07 16:53:18 -08:00
Marc Paine
411806520e
Update branding to 6.0.116 (#15718) 2023-03-07 16:52:48 -08:00
dotnet-bot
686291d48f Merge in 'release/7.0.2xx' changes 2023-03-07 19:54:22 +00:00
Marc Paine
34c43ac42d
Update branding to 7.0.203 (#15722) 2023-03-07 11:45:02 -08:00
Marc Paine
7fe0262040
Update branding to 6.0.408 (#15720) 2023-03-07 11:42:57 -08:00
Marc Paine
77f9b7a7bd
Update branding to 6.0.311 (#15719) 2023-03-07 11:42:19 -08:00
William Godbe
bb91038a82
Update branding to 7.0.203 2023-03-07 10:22:58 -08:00
Will Godbe
4714d8cdf6 Update branding to 7.0.105 2023-03-07 10:11:46 -08:00
Will Godbe
333c78c32a Update branding to 6.0.408 2023-03-07 10:11:39 -08:00
Will Godbe
7f856954d3 Update branding to 6.0.311 2023-03-07 10:11:35 -08:00
Will Godbe
07a37c4b79 Update branding to 6.0.116 2023-03-07 10:11:29 -08:00