Commit graph

25815 commits

Author SHA1 Message Date
v-wuzhai
6b1b8a424a
Merge pull request #14299 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-08-10 22:37:00 -07:00
Jason Zhai
405e6c93c1 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-08-10 19:37:59 -07:00
Jason Zhai
638ffb7d83 Merge branch 'release/6.0.4xx' 2022-08-10 19:31:52 -07:00
Marc Paine
e4ca5fbef5
Merge pull request #14286 from vseanreesermsft/internal-merge-6.0.4xx-2022-08-09-1110
Merging internal commits for release/6.0.4xx
2022-08-10 11:28:57 -07:00
Marc Paine
ce1faab52f
Merge pull request #14285 from vseanreesermsft/internal-merge-6.0.3xx-2022-08-09-1110
Merging internal commits for release/6.0.3xx
2022-08-10 10:19:13 -07:00
Marc Paine
b3e1a28fb3
Merge pull request #14297 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-08-10 10:18:46 -07:00
Marc Paine
dd19808458
Merge pull request #14267 from dotnet/marcpopMSFT-fixknownapphostmain
Stop downloading app hosts for android
2022-08-10 10:18:11 -07:00
Jan Krivanek
492d7e17d1 Remove superfluous RepoName element 2022-08-10 15:43:35 +02:00
Jan Krivanek
7904e73af5 update item templates 2022-08-10 15:43:35 +02:00
Jan Krivanek
f662854857 Reflect move of templating dependencies to sdk repo 2022-08-10 15:43:35 +02:00
v-wuzhai
70e189db5c
Merge pull request #14296 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-08-09 23:36:50 -07:00
v-wuzhai
e2d1611b9b
Merge pull request #14293 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-09 23:01:49 -07:00
Jason Zhai
4045c96779 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-08-09 19:17:12 -07:00
Marc Paine
716bd17882
Merge pull request #14288 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-08-09 16:49:30 -07:00
NET Source-Build Bot
f2498acf16
update global.json and Versions.props for .NET SDK 6.0.108 (#14291) 2022-08-09 23:05:31 +00:00
Marc Paine
90bb556af4
Removing code that was removed from main 2022-08-09 16:02:29 -07:00
dotnet-maestro[bot]
224ee88c56
Update dependencies from https://github.com/dotnet/source-build-externals build 20220809.1 (#14292)
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.22408.1 -> To Version 7.0.0-alpha.1.22409.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-08-09 21:20:23 +00:00
Marc Paine
5276384f94
Merge pull request #14290 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-08-09 14:06:44 -07:00
Marc Paine
1fa0da7fc4
Merge pull request #14289 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-08-09 14:06:31 -07:00
Marc Paine
eeb9ec1382
Merge branch 'main' into merge/release/6.0.4xx-to-main 2022-08-09 14:04:34 -07:00
Marc Paine
feab66b98e
Merge pull request #14284 from vseanreesermsft/internal-merge-6.0.1xx-2022-08-09-1110
Merging internal commits for release/6.0.1xx
2022-08-09 14:03:14 -07:00
Marc Paine
eaaf3b3160
Merge pull request #14276 from dotnet/marcpopMSFT-addbuildtoversion
Add the full nuget version into the .version file
2022-08-09 14:02:46 -07:00
Doug Bunting
4834b574a7
[main] Update template versions from dotnet/aspnetcore (#14246) 2022-08-09 19:48:35 +00:00
Doug Bunting
7268b5cff3
[6.0.3xx] Update template versions from dotnet/aspnetcore (#14244) 2022-08-09 19:27:54 +00:00
Doug Bunting
c4fc9114a7
[6.0.1xx] Update template versions from dotnet/aspnetcore (#14243) 2022-08-09 19:27:40 +00:00
Doug Bunting
d2d8560f0e
[6.0.4xx] Update template versions from dotnet/aspnetcore (#14245) 2022-08-09 19:22:46 +00:00
Marc Paine
b33d35cbe4
Merge pull request #14266 from dotnet/marcpopMSFT-fixapphostdownload
Stop app host downloads for android
2022-08-09 11:48:32 -07:00
Sean Reeser
f5fae21d12 Merge commit '7771abd614f31fa87deb013fdde3e590495a0c56' into internal-merge-6.0.4xx-2022-08-09-1110 2022-08-09 11:10:29 -07:00
Sean Reeser
ee223bf3b9 Merge commit '7494fee64a69205fea68f86f541db829c3b82384' into internal-merge-6.0.3xx-2022-08-09-1110 2022-08-09 11:10:21 -07:00
Sean Reeser
9927e69501 Merge commit '4e3a463d2b2ad382a04bdf570e9154c8ec7fe37e' into internal-merge-6.0.1xx-2022-08-09-1110 2022-08-09 11:10:12 -07:00
Marc Paine
d31a68bffd
Merge pull request #14283 from dotnet/darc-main-a058601c-8487-4e97-8bac-b2c395e495ac
[main] Update dependencies from dotnet/source-build-externals
2022-08-09 09:54:44 -07:00
Marc Paine
f756f47891
Merge pull request #14282 from dotnet/darc-main-5e934c62-5bf5-47bd-813e-694989484c2d
[main] Update dependencies from dotnet/arcade
2022-08-09 09:54:20 -07:00
dotnet-maestro[bot]
357c1e52c5 Update dependencies from https://github.com/dotnet/source-build-externals build 20220808.1
Microsoft.SourceBuild.Intermediate.source-build-externals
 From Version 7.0.0-alpha.1.22405.1 -> To Version 7.0.0-alpha.1.22408.1
2022-08-09 13:18:25 +00:00
dotnet-maestro[bot]
fd2c50f7c6 Update dependencies from https://github.com/dotnet/arcade build 20220808.3
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22405.6 -> To Version 7.0.0-beta.22408.3

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22404-01 -> To Version 1.2.0-beta-22407-01 (parent: Microsoft.DotNet.Arcade.Sdk
2022-08-09 12:41:05 +00:00
dotnet-maestro[bot]
aa8dc2429d Update dependencies from https://github.com/dotnet/test-templates build 20220809.1
Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22406.1 -> To Version 1.0.2-beta4.22409.1
2022-08-09 09:26:51 +00:00
v-wuzhai
54f388406f
Merge pull request #14278 from dotnet/darc-main-b1354830-255e-4135-922c-1c81ffa39e3a
[main] Update dependencies from dotnet/source-build-reference-packages
2022-08-08 19:02:15 -07:00
Michael Simons
c85583bd81
Update source-build toolset and artifacts (#14242) 2022-08-08 18:46:33 -05:00
dotnet-maestro[bot]
f57960f5ff Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220808.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22405.2 -> To Version 7.0.0-alpha.1.22408.1
2022-08-08 23:22:46 +00:00
Marc Paine
063d79ea3e
Merge pull request #14270 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-08-08 15:51:27 -07:00
Marc Paine
c2621e823d
Merge pull request #14275 from dotnet/marcpopMSFT-includereleasesintemplatelocator
Add the releases binary to the template locator transport package
2022-08-08 15:51:11 -07:00
Marc Paine
16df0cb2b2
Merge pull request #14182 from dotnet/darc-release/6.0.4xx-aad6e795-4562-4ce8-b1b6-b44b2ab82baf
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-08-08 15:49:43 -07:00
Marc Paine
e2a0da3d8f Add the full nuget version into the .version file 2022-08-08 14:21:30 -07:00
Marc Paine
b7ea03ca79 Add releases to the list of files to copy to the templatelocator output 2022-08-08 13:50:10 -07:00
Michael Simons
85c5e8b46e
Add razor-compiler and runtime patches to unblock prebuilt elimination (#14269) 2022-08-08 08:41:00 -05:00
v-wuzhai
8f639696e6
Merge pull request #14271 from dotnet/darc-main-4d3cfc1e-88fc-4040-90be-61b392956a8b
[main] Update dependencies from dotnet/source-build-reference-packages
2022-08-07 19:06:03 -07:00
v-wuzhai
b63471b30e
Merge pull request #14272 from dotnet/darc-main-0ffc0bb7-60a4-4b7a-91eb-409f89e6b83f
[main] Update dependencies from dotnet/arcade
2022-08-07 19:05:34 -07:00
v-wuzhai
3d15d88fb5
Merge pull request #14273 from dotnet/darc-main-b044a4ed-503e-4ddd-8313-d437241fa847
[main] Update dependencies from dotnet/source-build-externals
2022-08-07 19:05:03 -07:00
v-wuzhai
5cedfb52bc
Merge pull request #14274 from dotnet/darc-main-7aba8f17-2955-4a43-8589-fe080fd69dae
[main] Update dependencies from dotnet/test-templates
2022-08-07 19:04:40 -07:00
dotnet-maestro[bot]
06293a7436 Update dependencies from https://github.com/dotnet/arcade build 20220805.6
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 7.0.0-beta.22403.1 -> To Version 7.0.0-beta.22405.6

Dependency coherency updates

Microsoft.SourceLink.GitHub,Microsoft.DotNet.XliffTasks
 From Version 1.2.0-beta-22402-01 -> To Version 1.2.0-beta-22404-01 (parent: Microsoft.DotNet.Arcade.Sdk
2022-08-07 12:35:01 +00:00
dotnet-maestro[bot]
278314c36d Update dependencies from https://github.com/dotnet/test-templates build 20220806.1
Microsoft.DotNet.Test.ProjectTemplates.2.1 , Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0
 From Version 1.0.2-beta4.22378.1 -> To Version 1.0.2-beta4.22406.1
2022-08-06 15:30:32 +00:00