Commit graph

26911 commits

Author SHA1 Message Date
dotnet-bot
cbf8e1759f Merge in 'release/7.0.1xx' changes 2023-03-15 10:18:44 +00:00
v-wuzhai
9f7fb0a5f3
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15801) 2023-03-15 03:10:31 -07:00
Jason Zhai
745d896a35 Merge branch 'release/6.0.4xx' into release/7.0.1xx 2023-03-15 00:11:11 -07:00
dotnet-bot
5252e68142 Merge in 'release/7.0.1xx' changes 2023-03-14 20:01:24 +00:00
Marc Paine
5b75cc65bc
Merging internal commits for release/7.0.1xx (#15793) 2023-03-14 12:53:26 -07:00
Marc Paine
d1fc6a8010
Merging internal commits for release/6.0.4xx (#15792) 2023-03-14 11:18:37 -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
dotnet-bot
5b93966a6d Merge in 'release/7.0.1xx' changes 2023-03-14 13:11:17 +00:00
Tom Deseyn
b672d91789
DotNetHelper: fix IsMonoRuntime being initialized before extracting the sdk. (#15646) 2023-03-14 08:03:24 -05:00
dotnet-bot
7714d84fac Merge in 'release/7.0.1xx' changes 2023-03-13 21:05:49 +00:00
Marc Paine
223e47f52f
[7.0.1xx] Automate Asp.net template updates in dotnet/installer (#15737) 2023-03-13 13:57:44 -07: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
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
DotNet Bot
ffb3c7feb9 Merged PR 29913: [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**: 20230308.30
- **Date Produced**: March 9, 2023 12:06:17 AM UTC
- **Commit**: 78047cb201260b732a61cf3e61c892b0121b548f
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.105 to 7.0.105][1]
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.105-servicing.23158.2 to 7.0.105-servicing.23158.30][1]
  - **Microsoft.NET.Sdk**: [from 7.0.105-servicing.23158.2 to 7.0.105-servicing.23158.30][1]
  - **Microsoft.TemplateEngine.Cli**: [from 7.0.105-servicing.23158.2 to 7.0.105-servicing.23158.30][1]

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2023-03-09 20:49:38 +00:00
DotNet-Bot
1b379f93e0 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230308.30
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.105 -> To Version 7.0.105
2023-03-09 00:31:12 +00:00
DotNet Bot
9aede91d56 Merged PR 29877: [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**: 20230308.2
- **Date Produced**: March 8, 2023 11:08:34 AM UTC
- **Commit**: e9f13a063d51da1c707fdcf843216b814522d1f2
- **Branch**: refs/heads/internal/release/7.0.1xx

[DependencyUpdate]: <> (Begin)

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

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

[DependencyUpdate]: <> (End)

[marker]: <> (End:65272799-fe4d-4dbf-f0fe-08da7ef63651)
2023-03-09 00:01:54 +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
35165c5cb1 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230308.2
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.104 -> To Version 7.0.105
2023-03-08 11:29:37 +00: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
c7d7a56dd0 Merge in 'release/7.0.1xx' changes 2023-03-08 01:02:30 +00: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
1abfb6882f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230307.13
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.104 -> To Version 7.0.105
2023-03-07 22:39:52 +00: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
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
dotnet-bot
2a98eddda9 Merge in 'release/7.0.1xx' changes 2023-03-03 15:03:16 +00: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
dotnet-bot
24cc4d9618 Merge in 'release/7.0.1xx' changes 2023-03-01 17:19:50 +00:00
Nikola Milosavljevic
c964d85026
[release/7.0.1xx] SDK diff exclusions - backport (#15670) 2023-03-01 11:05:57 -06: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
d8659ea151 Merged PR 29808: [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.AspNetCore.App.Ref**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk)
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.15 to 6.0.15 (parent: Microsoft.NET.Sdk)
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-dev-certs**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk)
  - **dotnet-user-secrets**: from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4 (parent: Microsoft.NET.Sdk)

[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**: 20230226.3
- **Date Produced**: February 26, 2023 10:02:39 PM UTC
- **Commit**: 6f7588fcd6922febeacca723a71b403edb9f4bdf
- **Branch**: refs/heads/internal/release/6.0.4xx

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.407-servicing.23120.11 to 6.0.407-servicing.23126.3][1]
  - **Microsoft.NET.Sdk**: [from 6.0.407-servicing.23120.11 to 6.0.407-servicing.23126.3][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 6.0.15 to 6.0.15][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.15 to 6.0.15][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2]
  - **dotnet-dev-certs**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2]
  - **dotnet-user-secrets**: [from 6.0.15-servicing.23120.7 to 6.0.15-servicing.23124.4][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC91af9ad&targetVersion=GC6f7588f&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCb51b398&targetVersion=GC6a6d775&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31)
2023-02-27 00:45:10 +00:00
dotnet-bot
fba52821d3 Merge in 'release/7.0.1xx' changes 2023-02-22 19:03:37 +00:00
Omair Majid
df0fc12896
Add Alpine CI for source-build (#14417)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-22 12:51:32 -06:00
dotnet-bot
53967e0e54 Merge in 'release/7.0.1xx' changes 2023-02-22 16:04:11 +00:00
Tom Deseyn
9a9449b598
tests: ExecuteRunWeb: update expected SIGTERM exit code on mono. (#15341)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-22 09:52:28 -06:00