dotnet-bot
bf94d45865
Merge in 'release/7.0.2xx' changes
2023-03-21 05:52:04 +00:00
v-wuzhai
332c2bc249
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' ( #15874 )
2023-03-20 22:42:57 -07:00
Jason Zhai
b5ff817e03
Merge branch 'release/7.0.1xx' into release/7.0.2xx
2023-03-20 19:50:16 -07: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
Matt Mitchell (.NET)
f7de182f41
Merged PR 30048: [internal/release/7.0.2xx] Merge from public
...
Merge from public release/7.0.2xx to internal/release/7.0.2xx and resolve conflicts if necessary
2023-03-17 16:04:08 +00:00
v-wuzhai
ecacef4686
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' ( #15817 )
2023-03-16 18:58:12 -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
dotnet-maestro[bot]
4efc827510
[release/7.0.2xx] Update dependencies from dotnet/test-templates ( #15834 )
...
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-03-16 09:11:45 -07:00
Jason Zhai
fe9bb2191e
Merge branch 'release/7.0.1xx' into release/7.0.2xx
2023-03-15 19:52:12 -07: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
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
v-wuzhai
57c9144764
[release/7.0.2xx] Update dependencies from dotnet/arcade ( #15809 )
2023-03-14 18:58:09 -07:00
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