Commit graph

23314 commits

Author SHA1 Message Date
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
Manodasan Wignarajah
87fc91672a Add support for targeting Windows version 22621 and update Windows SDK projections. 2022-06-14 01:23:16 -07:00
Marc Paine
a8b81e9095
Merge pull request #13949 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-10 21:20:11 -07:00
Marc Paine
0ed33a50e3
Merge pull request #13941 from dotnet/darc-release/6.0.4xx-2bf079f6-3b9c-4109-9804-0c72eca720f3
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-10 13:59:58 -07:00
Marc Paine
28948923ce
Update format of multiple /p parameters 2022-06-10 13:22:26 -07:00
Marc Paine
862f52c85c
Merge pull request #13946 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-10 12:31:47 -07:00
Marc Paine
df9d0b48b1
Update .vsts-ci.yml 2022-06-10 12:28:33 -07:00
dotnet-maestro[bot]
1d99eb666f Update dependencies from https://github.com/dotnet/sdk build 20220610.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22310.5

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 6.0.400-preview.22306.2 -> To Version 6.0.400-preview.22309.5 (parent: Microsoft.NET.Sdk
2022-06-10 19:10:20 +00:00
dotnet-maestro[bot]
0ccc85fe51 Update dependencies from https://github.com/dotnet/sdk build 20220609.23
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.23

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 6.0.400-preview.22306.2 -> To Version 6.0.400-preview.22309.5 (parent: Microsoft.NET.Sdk
2022-06-10 06:56:34 +00:00
v-wuzhai
09abb090ac
Merge pull request #13947 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-09 23:24:36 -07:00
Jason Zhai
7a7252f19c Merge branch 'release/6.0.1xx' into release/6.0.3xx 2022-06-09 22:38:19 -07:00
dotnet-maestro[bot]
131e6ed24b Update dependencies from https://github.com/dotnet/sdk build 20220609.17
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.17

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks
 From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.7 (parent: Microsoft.NET.Sdk
2022-06-10 04:09:51 +00:00
Jason Zhai
be2059a26b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-06-09 20:11:25 -07:00
v-wuzhai
ab5c14e9a6
Merge pull request #13945 from dotnet/darc-release/6.0.1xx-0eefc296-43fb-47af-9e31-a8871911972a
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-09 19:49:51 -07:00
Chris Rummel
17c1d67be5
[release/6.0.3xx] Handle NuGet package source mapping in source-build tasks. (#13733) 2022-06-09 12:57:38 -05:00
dotnet-maestro[bot]
9069c44814 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220609.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22302.1 -> To Version 6.0.0-servicing.22309.1
2022-06-09 15:03:25 +00:00
dotnet-maestro[bot]
0a0ec693cf Update dependencies from https://github.com/dotnet/sdk build 20220609.2
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22309.2

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.7 (parent: Microsoft.NET.Sdk
2022-06-09 11:49:55 +00:00
Jakub Jareš
57b0eb4406
Merge pull request #13942 from nohwnd/fix-dump-minitool-net6 2022-06-09 10:09:19 +02:00
Jakub Jareš
0c7c5381b9 Fix cross-gen for DumpMinitool 2022-06-09 08:06:36 +02:00
dotnet-maestro[bot]
c872893e63 Update dependencies from https://github.com/dotnet/sdk build 20220608.10
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22308.10

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset
 From Version 12.0.4-beta.22305.1 -> To Version 12.0.4-beta.22308.2 (parent: Microsoft.NET.Sdk
2022-06-08 22:25:43 +00:00
Marc Paine
138d21e534
Merge pull request #13863 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build by getting debuild first
2022-06-08 13:05:45 -07:00
Marc Paine
fd0c042c55
Merge pull request #13864 from dotnet/marcpopMSFT-fixdebbuild
Fix the deb build
2022-06-08 13:05:42 -07:00
Marc Paine
92f9b7b00d
Merge pull request #13908 from dotnet/marcpopMSFT-fixdebbuild
Remove the external docker files and fix the debbuild
2022-06-08 13:05:34 -07:00
dotnet-maestro[bot]
b970c4b70e Update dependencies from https://github.com/dotnet/sdk build 20220608.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22307.22 -> To Version 6.0.400-preview.22308.4

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22305.4 -> To Version 4.3.0-2.22307.7 (parent: Microsoft.NET.Sdk
2022-06-08 18:54:35 +00:00
v-wuzhai
2fbf048152
Merge pull request #13937 from dotnet/darc-release/6.0.4xx-4facdbb3-4621-4ad1-bda9-4be1e0a22a11
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-08 02:41:24 -07:00
dotnet-maestro[bot]
36b92cafe5 Update dependencies from https://github.com/dotnet/sdk build 20220607.22
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22306.13 -> To Version 6.0.400-preview.22307.22
2022-06-08 03:03:28 +00:00
v-wuzhai
6eb484a785
Merge pull request #13934 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-07 18:59:53 -07:00
v-wuzhai
9bb91df157
Merge pull request #13935 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-07 18:57:11 -07:00
Marc Paine
e7c0f1e3b0
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-06-07 13:40:20 -07:00
Marc Paine
87bee21ceb
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-06-07 13:40:05 -07:00
Marc Paine
2f68ca3164
Merge pull request #13870 from dotnet/mmitche-patch-2
[release/6.0.3xx] Update pre-release label to servicing
2022-06-07 11:53:02 -07:00
Marc Paine
fd1be0cbdf
Merge pull request #13930 from vseanreesermsft/branding-6.0.107-2022-06-07-1000
Update branding to 6.0.107
2022-06-07 11:48:05 -07:00
Marc Paine
0dd3622172
Merge pull request #13931 from vseanreesermsft/branding-6.0.302-2022-06-07-1000
Update branding to 6.0.302
2022-06-07 11:47:41 -07:00
Sean Reeser
9988564da9 Update branding to 6.0.302 2022-06-07 10:00:18 -07:00
Sean Reeser
5fcd191cd0 Update branding to 6.0.107 2022-06-07 10:00:12 -07:00
v-wuzhai
60a1e77ceb
Merge pull request #13925 from dotnet/darc-release/6.0.4xx-1dd38747-567c-48bc-8bdd-f3735c156bd5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-06 18:57:27 -07:00
dotnet-maestro[bot]
ae8b05a2dd Update dependencies from https://github.com/dotnet/sdk build 20220606.13
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22306.1 -> To Version 6.0.400-preview.22306.13

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 6.0.400-preview.22276.4 -> To Version 6.0.400-preview.22306.2 (parent: Microsoft.NET.Sdk
2022-06-07 00:11:37 +00:00
v-wuzhai
a6fed140e4
Merge pull request #13918 from dotnet/darc-release/6.0.4xx-c08e1dbe-926c-45e9-a805-ce139af813d5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-06 02:57:48 -07:00
dotnet-maestro[bot]
d9b148b612 Update dependencies from https://github.com/dotnet/sdk build 20220606.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22303.15 -> To Version 6.0.400-preview.22306.1

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22303.4 -> To Version 12.0.4-beta.22305.1 (parent: Microsoft.NET.Sdk
2022-06-06 07:59:53 +00:00
dotnet-maestro[bot]
b6641f0bff
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#13852)
[release/6.0.1xx] Update dependencies from dotnet/source-build-reference-packages
2022-06-06 01:58:08 +00:00
v-wuzhai
b720331c8d
Merge pull request #13912 from dotnet/darc-release/6.0.4xx-eea28904-e3a2-4603-96f8-a849065faf19
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-05 18:54:57 -07:00
dotnet-maestro[bot]
11ff603a9c Update dependencies from https://github.com/dotnet/sdk build 20220603.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22303.4 -> To Version 6.0.400-preview.22303.15

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22303.1 -> To Version 12.0.4-beta.22303.4 (parent: Microsoft.NET.Sdk
2022-06-03 23:13:32 +00:00
Marc Paine
8b16a6268f
Only run the deb build on specific legs 2022-06-03 09:12:24 -07:00
Grace Kulin
de06ade9a9
Merge pull request #13906 from dotnet/darc-release/6.0.4xx-9976b61d-077f-4c24-9229-dffff6645f0d
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-03 08:56:59 -07:00
dotnet-maestro[bot]
9eab439e8f Update dependencies from https://github.com/dotnet/sdk build 20220603.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22302.15 -> To Version 6.0.400-preview.22303.4

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build
 From Version 12.0.4-beta.22281.4 -> To Version 12.0.4-beta.22303.1 (parent: Microsoft.NET.Sdk
2022-06-03 15:01:43 +00:00
Grace Kulin
0babb02e27
Merge pull request #13901 from dotnet/darc-release/6.0.4xx-36cbb775-a98d-484b-9cd0-5e1375922227
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-06-03 06:54:47 -07:00
dotnet-maestro[bot]
c7593262dc Update dependencies from https://github.com/dotnet/sdk build 20220602.15
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22301.26 -> To Version 6.0.400-preview.22302.15

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22301.10 -> To Version 4.3.0-3.22301.12 (parent: Microsoft.NET.Sdk
2022-06-02 22:34:18 +00:00