dotnet-bot
263ad8e7bb
Merge in 'release/7.0.1xx' changes
2023-03-20 22:10:11 +00:00
Marc Paine
f7e7f6e66b
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' ( #15871 )
2023-03-20 15:00:24 -07:00
Chris Rummel
c3ca49df5b
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx
2023-03-20 14:46:28 -05:00
dotnet-maestro[bot]
bed753ff47
[release/6.0.4xx] Update dependencies from dotnet/arcade ( #15836 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-03-20 10:53:19 -07:00
v-wuzhai
39f5a6a3c0
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' ( #15826 )
2023-03-16 18:57:18 -07:00
Matt Mitchell (.NET)
605d164a24
Merged PR 30046: [internal/release/7.0.1xx] Merge from public
...
Merge from public release/7.0.1xx to internal/release/7.0.1xx and resolve conflicts if necessary
2023-03-16 16:41:28 +00:00
Jason Zhai
6f79e0b9da
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2023-03-15 19:46:46 -07:00
Chris Rummel
f7fbfe43cd
Source-build 7.0.104 March 2023 updates. ( #15800 )
2023-03-15 18:33:01 -05:00
Marc Paine
5b0900b026
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' ( #15821 )
2023-03-15 14:58:35 -07:00
Marc Paine
251dc81c5e
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx
2023-03-15 12:58:21 -07:00
dotnet-maestro[bot]
cb88897531
[release/7.0.1xx] Update dependencies from dotnet/arcade ( #15822 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-03-15 17:35:50 +00:00
Chris Rummel
89cf0a81c7
Source-build 6.0.115 March 2023 updates. ( #15799 )
2023-03-15 11:03:37 -05:00
dotnet-bot
cbf8e1759f
Merge in 'release/7.0.1xx' changes
2023-03-15 10:18:44 +00:00
v-wuzhai
fffcaa16a4
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' ( #15805 )
2023-03-15 03:11:55 -07:00
v-wuzhai
353bf7b909
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' ( #15802 )
2023-03-15 03:11:14 -07: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
Jason Zhai
83eb1aca7e
Merge branch 'release/6.0.3xx' into release/6.0.4xx
2023-03-15 00:04:23 -07:00
Jason Zhai
7c8984f406
Merge branch 'release/6.0.1xx' into release/6.0.3xx
2023-03-15 00:01:29 -07:00
dotnet-bot
5252e68142
Merge in 'release/7.0.1xx' changes
2023-03-14 20:01:24 +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
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
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
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