Commit graph

27415 commits

Author SHA1 Message Date
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
Chris Rummel
a4ecf7bfc0
Update poison usage baseline. (#15688) 2023-03-03 08:55:03 -06:00
Nikola Milosavljevic
8b853a54c1
[release/6.0.1xx] SDK diff exclusions - backport (#15676) 2023-03-02 09:04:12 -06:00
Nikola Milosavljevic
c964d85026
[release/7.0.1xx] SDK diff exclusions - backport (#15670) 2023-03-01 11:05:57 -06:00
DotNet Bot
6c74320bc3 Merged PR 29823: [internal/release/7.0.2xx] 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.Net.Compilers.Toolset**: from 4.5.0-6.23123.11 to 4.5.0-6.23127.3 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230228.1
- **Date Produced**: February 28, 2023 10:36:52 AM UTC
- **Commit**: 288f1065b0d882689bdbee4a91ceb34617fc9f96
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.202 to 7.0.202][6]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.NET.Sdk**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.202-servicing.23127.10 to 7.0.202-servicing.23128.1][6]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23123.11 to 4.5.0-6.23127.3][7]
  - **Microsoft.Build**: [from 17.5.0 to 17.5.0][8]

[6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC19d897b&targetVersion=GC288f106&_a=files
[7]: 271ccd7...e2bc27d
[8]: 8ce3029...6f08c67

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
2023-02-28 15:54:28 +00:00
DotNet Bot
8a516d2a80 Merged PR 29817: [internal/release/7.0.2xx] 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.Net.Compilers.Toolset**: from 4.5.0-6.23109.5 to 4.5.0-6.23123.11 (parent: Microsoft.NET.Sdk)
  - **Microsoft.Build**: from 17.5.0 to 17.5.0 (parent: Microsoft.NET.Sdk)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:2dd28bf7-20bb-4672-1875-08daed76fd91)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 2dd28bf7-20bb-4672-1875-08daed76fd91
- **Build**: 20230227.10
- **Date Produced**: February 27, 2023 7:35:58 PM UTC
- **Commit**: 19d897be95902ca23a704f58d2fa7adf5b13106c
- **Branch**: refs/heads/internal/release/7.0.2xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.201 to 7.0.202][3]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.NET.Sdk**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.201-rtm.23120.7 to 7.0.202-servicing.23127.10][3]
  - **Microsoft.Net.Compilers.Toolset**: [from 4.5.0-6.23109.5 to 4.5.0-6.23123.11][4]
  - **Microsoft.Build**: [from 17.5.0 to 17.5.0][5]

[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1ce1f1e&targetVersion=GC19d897b&_a=files
[4]: 6a5a63b...271ccd7
[5]: 81ac935...8ce3029

[DependencyUpdate]: <> (End)

[marker]: <> (End:2dd28bf7-20bb-4672-1875-08daed76fd91)
2023-02-27 22:25:05 +00:00
DotNet Bot
5c12d17216 Merged PR 29822: [internal/release/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk
This pull request updates the following dependencies

[marker]: <> (Begin:65272799-fe4d-4dbf-f0fe-08da7ef63651)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk
- **Subscription**: 65272799-fe4d-4dbf-f0fe-08da7ef63651
- **Build**: 20230227.12
- **Date Produced**: February 27, 2023 9:22:03 PM UTC
- **Commit**: 8c1421b52282681e7b46f3e38ea0fc005897b076
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.104 to 7.0.104][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.104-servicing.23121.9 to 7.0.104-servicing.23127.12][1]
  - **Microsoft.NET.Sdk**: [from 7.0.104-servicing.23121.9 to 7.0.104-servicing.23127.12][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.104-servicing.23121.9 to 7.0.104-servicing.23127.12][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2023-02-27 22:24:39 +00:00
dotnet-bot
b9926d6812 Merge in 'release/7.0.2xx' changes 2023-02-27 17:23:41 +00:00
Marc Paine
7d72c5a676
Increase branding version and downgrade implicit version to enable hotfix release (#15587) 2023-02-27 09:13:26 -08:00