Commit graph

26070 commits

Author SHA1 Message Date
dotnet-bot
9c299bcc8d Merge in 'release/6.0.3xx' changes 2022-06-15 07:02:30 +00:00
v-wuzhai
90d3263120
Merge pull request #13979 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-06-14 23:48:44 -07:00
v-wuzhai
2168013872
Merge pull request #13980 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-06-14 23:44:44 -07:00
NET Source-Build Bot
564757c6a5
.NET Source-Build 6.0.106 June 2022 Updates (#13978)
* update global.json and Versions.props for .NET SDK 6.0.106

* Fix Versions.props

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-06-15 06:07:50 +00:00
Jason Zhai
29c5569f14 Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-14 23:04:22 -07:00
Jason Zhai
b007dc974b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-06-14 22:58:53 -07:00
v-wuzhai
ef4c352c92
Merge pull request #13982 from dotnet/darc-release/6.0.1xx-e7e2a401-5a42-485b-927a-257e3456d809
[release/6.0.1xx] Update dependencies from dotnet/arcade
2022-06-14 22:40:33 -07:00
v-wuzhai
b2b27d6041
Merge pull request #13983 from dotnet/darc-release/6.0.4xx-1ee5e6cc-743d-4fa0-8da8-860c89867398
[release/6.0.4xx] Update dependencies from dotnet/arcade
2022-06-14 22:39:57 -07:00
v-wuzhai
61febc0ff7
Merge pull request #13984 from dotnet/darc-release/6.0.1xx-2d70cfad-1cbf-4ad7-9851-d1d3fcf05278
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-14 22:39:14 -07:00
v-wuzhai
acb851980d
Merge pull request #13956 from dotnet/darc-release/6.0.4xx-3d1323cf-ba28-4b83-b434-4887ab5fef9d
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-14 22:18:46 -07:00
dotnet-maestro[bot]
3b7c25c763 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:08 +00:00
dotnet-maestro[bot]
e3cd1424a0 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220614.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22309.1 -> To Version 6.0.0-servicing.22314.1
2022-06-15 02:20:02 +00:00
dotnet-maestro[bot]
57d6928a19 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:59:12 +00:00
dotnet-maestro[bot]
353bef46e2 Update dependencies from https://github.com/dotnet/arcade build 20220614.7
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk
 From Version 6.0.0-beta.22261.7 -> To Version 6.0.0-beta.22314.7
2022-06-14 23:48:03 +00:00
dotnet-bot
17ac46f848 Merge in 'release/6.0.3xx' changes 2022-06-14 23:46:23 +00:00
Manodasan Wignarajah
aac14e609b
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13976) 2022-06-14 16:34:46 -07:00
Manodasan Wignarajah
616cfe956e
Add support for targeting Windows version 22621 and update Windows SDK projections. (#13975) 2022-06-14 16:34:39 -07:00
Daniel Plaisted
34ba3a68bb
Merge pull request #13974 from manodasanW/master
[main] Add support for targeting Windows version 22621 and update Windows SDK projections
2022-06-14 16:22:37 -07:00
William Godbe
985a087175
Update asp.net templates (#13967) 2022-06-14 16:06:11 -07:00
Daniel Plaisted
2b6b35eb59
Merge pull request #13977 from manodasanW/release/6.0.4xx
[release/6.0.4xx] Add support for targeting Windows version 22621 and update Windows SDK projections
2022-06-14 16:02:40 -07:00
dotnet-maestro-bot
46ba3d49a8
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#13962)
* Update format of multiple /p parameters

* [release/6.0.3xx] Add razor-compiler to Source Build (#13652)

* Remove NuGet.Client source-build patches

Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-06-14 14:58:21 -07:00
Michael Simons
46f03f644c
Remove source-build nuget.client patch that was backported (#13972) 2022-06-14 20:41:51 +00:00
dotnet-bot
88bffe07a9 Merge in 'release/6.0.3xx' changes 2022-06-14 19:26:16 +00:00
William Godbe
c6cc5179c7
Update Asp.Net template (#13964) 2022-06-14 12:09:13 -07:00
William Godbe
9a4017803e
Update asp.net template (#13965) 2022-06-14 12:09:07 -07:00
William Godbe
2dc51c984e
Update Asp.Net templates (#13966)
* Update Asp.Net templates

* Update GenerateBundledVersions.targets
2022-06-14 12:09:01 -07:00
dotnet-maestro[bot]
c26eab078e Update dependencies from https://github.com/dotnet/sdk build 20220614.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22314.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 18:32:05 +00:00
Sean Reeser
dc1bc88432 Merge commit '43f9b184817e4f48ba091d068a4d517c86daafd3' into internal-merge-6.0.3xx-2022-06-14-1031 2022-06-14 10:31:06 -07:00
Sean Reeser
caa27c6ae0 Merge commit 'e83a22f55807cbb06f22f80426ed4997c9e82822' into internal-merge-6.0.1xx-2022-06-14-1030 2022-06-14 10:30:57 -07:00
Manodasan Wignarajah
87fc91672a Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:23:16 -07:00
Manodasan Wignarajah
9270a6638c Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:10:25 -07:00
dotnet-maestro[bot]
003993b07f Update dependencies from https://github.com/dotnet/sdk build 20220613.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.15

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 07:49:07 +00:00
dotnet-maestro[bot]
afa31ba60b Update dependencies from https://github.com/dotnet/sdk build 20220613.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 06:28:07 +00:00
dotnet-maestro[bot]
d34b4bc9cb Update dependencies from https://github.com/dotnet/sdk build 20220613.11
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.11

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.5 (parent: Microsoft.NET.Sdk
2022-06-14 05:16:12 +00:00
Michael Simons
693b8eb2cc
Update previous source built (#13876)
* --no-edit

* Enable Tarball Build CI

* Add runtime patch for System.Text.Json version

* Add sdk patch

* Update missing XML doc baseline

Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-06-14 01:10:02 +00:00
dotnet-maestro[bot]
4a38b3c148 Update dependencies from https://github.com/dotnet/sdk build 20220613.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22313.5

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22313.3 (parent: Microsoft.NET.Sdk
2022-06-13 22:49:44 +00:00
dotnet-bot
0b772a389e Merge in 'release/6.0.3xx' changes 2022-06-13 22:36:59 +00:00
Logan Bussell
85086602ad
[release/6.0.3xx] Add razor-compiler to Source Build (#13652) 2022-06-13 22:26:28 +00:00
dotnet-maestro[bot]
d3ce508e97
[main] Update dependencies from dotnet/sdk (#13959)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-preview.6.22310.4 to 7.0.100-preview.6.22313.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-preview.6.22310.4 to 7.0.100-preview.6.22313.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22308.1 to 7.0.100-1.22310.2 (parent: Microsoft.NET.Sdk)
2022-06-13 16:02:51 +00:00
dotnet-maestro[bot]
71a9dd2eb8
Update dependencies from https://github.com/dotnet/arcade build 20220613.1 (#13960)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.22309.1 to 1.0.0-beta.22311.1 (parent: Microsoft.DotNet.Arcade.Sdk)
2022-06-13 16:00:20 +00:00
v-wuzhai
fee710f649
Merge pull request #13957 from dotnet/darc-main-a5ce6039-ab8d-4ebe-be33-eee21df3774c
[main] Update dependencies from dotnet/sdk
2022-06-13 01:51:48 -07:00
dotnet-maestro[bot]
99cddd4305 Update dependencies from https://github.com/dotnet/sdk build 20220612.9
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22312.7 -> To Version 7.0.100-preview.6.22312.9

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli
 From Version 7.0.100-preview.6.22309.2 -> To Version 7.0.100-preview.6.22310.4 (parent: Microsoft.NET.Sdk
2022-06-13 06:39:07 +00:00
dotnet-maestro[bot]
e585cf9284 Update dependencies from https://github.com/dotnet/sdk build 20220612.8
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22310.5 -> To Version 6.0.400-preview.22312.8

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22309.4 -> To Version 12.0.4-beta.22311.3 (parent: Microsoft.NET.Sdk
2022-06-13 03:18:55 +00:00
v-wuzhai
45ac3a663b
Merge pull request #13952 from dotnet-maestro-bot/merge/release/6.0.4xx-to-main
[automated] Merge branch 'release/6.0.4xx' => 'main'
2022-06-12 19:04:49 -07:00
v-wuzhai
bc47249ff5
Merge pull request #13954 from dotnet/darc-main-2466c71a-d3f7-4c19-9576-24875ee1e632
[main] Update dependencies from dotnet/sdk
2022-06-12 19:03:47 -07:00
v-wuzhai
0dab1e19a6
Merge pull request #13955 from dotnet/darc-main-1d2cfbe0-6704-4e01-8b0d-306c7a19ee34
[main] Update dependencies from dotnet/arcade
2022-06-12 19:03:25 -07:00
dotnet-maestro[bot]
8a3d042b21 Update dependencies from https://github.com/dotnet/sdk build 20220612.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22310.13 -> To Version 7.0.100-preview.6.22312.7

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.6.22309.5 -> To Version 7.0.0-preview.6.22311.2 (parent: Microsoft.NET.Sdk
2022-06-12 22:54:06 +00:00
dotnet-maestro[bot]
cf2c6908b2 Update dependencies from https://github.com/dotnet/sdk build 20220612.6
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22310.13 -> To Version 7.0.100-preview.6.22312.6

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.6.22309.5 -> To Version 7.0.0-preview.6.22311.2 (parent: Microsoft.NET.Sdk
2022-06-12 21:45:12 +00:00
dotnet-maestro[bot]
d4bee3fd66 Update dependencies from https://github.com/dotnet/sdk build 20220612.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22310.13 -> To Version 7.0.100-preview.6.22312.3

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.6.22309.5 -> To Version 7.0.0-preview.6.22311.2 (parent: Microsoft.NET.Sdk
2022-06-12 18:13:10 +00:00
dotnet-maestro[bot]
c5a4b83ad2 Update dependencies from https://github.com/dotnet/sdk build 20220612.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.6.22310.13 -> To Version 7.0.100-preview.6.22312.2

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.Test.Sdk,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-preview.6.22309.5 -> To Version 7.0.0-preview.6.22311.2 (parent: Microsoft.NET.Sdk
2022-06-12 15:59:12 +00:00