Commit graph

23744 commits

Author SHA1 Message Date
Jason Zhai
405e6c93c1 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-08-10 19:37:59 -07:00
DotNet-Bot
d2a4b82011 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220810.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22410.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-10 22:21:51 +00:00
dotnet-bot
5ec5eb0dc5 Merge in 'release/6.0.4xx' changes 2022-08-10 18:39:45 +00: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
DotNet-Bot
7525ef84ba Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.41
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.41

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-10 07:18:28 +00: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
DotNet-Bot
c5d3d51a99 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.25
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.25

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-10 00:01:10 +00: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
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
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
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
DotNet-Bot
4e8eb1efc2 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220809.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22409.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-09 17:37:40 +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
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
DotNet-Bot
b40e5505b3 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220807.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22407.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-08 03:02:14 +00:00
Marc Paine
372935eab6
Merge pull request #14268 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-05 15:48:17 -07:00
DotNet-Bot
44ef08cb3d Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220805.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22405.9

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-05 20:19:28 +00:00
Michael Simons
e759aafdd0
Update delete files with questionable licenses logic (#14265) 2022-08-05 14:26:50 -05:00
Marc Paine
005dd2364d
Stop app host downloads for android 2022-08-05 12:04:17 -07:00
dotnet-maestro[bot]
4514a2a032 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220805.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22405.1
2022-08-05 14:28:27 +00:00
DotNet-Bot
3e8243f20c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220804.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22404.9

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-04 19:12:34 +00:00
dotnet-maestro[bot]
807fbf16c4 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220804.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22363.1 -> To Version 6.0.0-servicing.22404.1
2022-08-04 15:01:09 +00:00
DotNet-Bot
c0d8768abc Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220803.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22403.20

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-03 22:48:21 +00:00
DotNet-Bot
a90a7195fa Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220803.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22403.3

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-03 09:08:08 +00:00
dotnet-bot
036d7308d1 Merge in 'release/6.0.4xx' changes 2022-08-03 01:40:18 +00:00
Marc Paine
a55a0d2fba
Merge pull request #14247 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-02 18:29:20 -07:00
DotNet-Bot
1dc565363f Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220802.31
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22402.31

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-03 00:17:33 +00:00
Marc Paine
9d5facb590
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-08-02 17:11:45 -07:00
DotNet-Bot
a64bc66e6c Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20220802.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-rtm.22368.21 -> To Version 6.0.401-servicing.22402.24

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22363.4 -> To Version 12.0.4-beta.22372.2 (parent: Microsoft.NET.Sdk
2022-08-02 23:04:03 +00:00
dotnet-bot
bec44b7f50 Merge in 'release/6.0.4xx' changes 2022-08-02 22:47:08 +00:00
Marc Paine
8dcf8232d7
Merge pull request #14236 from vseanreesermsft/branding-6.0.401-2022-08-02-0918
Update branding to 6.0.401
2022-08-02 15:33:45 -07:00
Marc Paine
4113612ee8
Merge pull request #14241 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-02 14:56:31 -07:00
Marc Paine
91727aeb14
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-08-02 12:55:16 -07:00
Marc Paine
8c3b1d2045
Revert branding 2022-08-02 12:54:22 -07:00
Marc Paine
7132adc319
Merge pull request #14152 from dotnet/marcpopMSFT-updatemacosimage
Update MacOS image
2022-08-02 12:50:20 -07:00
Marc Paine
9438d7ec6f
Merge pull request #14214 from dotnet/marcpopMSFT-fix50templateversion
Fix the 5.0 wpf/winforms template versions
2022-08-02 12:47:45 -07:00
Marc Paine
b873af05ec
Merge pull request #14234 from vseanreesermsft/branding-6.0.109-2022-08-02-0918
Update branding to 6.0.109
2022-08-02 12:46:55 -07:00
Marc Paine
7046244198
Servicing label 2022-08-02 12:45:21 -07:00