Commit graph

23587 commits

Author SHA1 Message Date
Marc Paine
55859829cd
Actually update implicit version to 3.1.28 (#14187) 2022-07-21 10:56:34 -07:00
Marc Paine
7a5b36b4a4
Merge pull request #13851 from dotnet/darc-release/6.0.4xx-6a07086d-2076-46c3-8687-e9435a81260c
[release/6.0.4xx] Update dependencies from dotnet/source-build-reference-packages
2022-07-14 16:33:24 -07:00
Marc Paine
9b9fc6cf97
Merge pull request #14144 from dotnet/marcpopMSFT-stabilizebranding
Stabilize branding and implicit version
2022-07-14 14:25:07 -07:00
Marc Paine
6e22d938ef
Update to target 3.1.28 2022-07-14 11:13:38 -07:00
Marc Paine
5cb321b875
Update Versions.props 2022-07-14 11:12:45 -07:00
Marc Paine
5c9d59d43b
Merge pull request #14134 from dotnet/marcpopMSFT-fixzipinstallsformanifestbands
Install the manifests into their specific feature band rather than the current band
2022-07-14 10:47:37 -07:00
Grace Kulin
c48a826bfc
Merge pull request #14141 from dotnet/darc-release/6.0.4xx-4000ba6c-74ad-4be1-a376-980625e483d5
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-14 08:07:10 -07:00
dotnet-maestro[bot]
9cec012147 Update dependencies from https://github.com/dotnet/sdk build 20220714.3
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.52 -> To Version 6.0.400-preview.22364.3

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.3.0-3.22329.30 -> To Version 4.3.0-3.22363.19 (parent: Microsoft.NET.Sdk
2022-07-14 10:00:27 +00:00
v-wuzhai
5104cb81e0
Merge pull request #14139 from dotnet/darc-release/6.0.4xx-a3d99b10-a76d-441e-86d6-e1045916ceed
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-14 01:48:36 -07:00
dotnet-maestro[bot]
9ff3ee5fc9 Update dependencies from https://github.com/dotnet/sdk build 20220713.52
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.39 -> To Version 6.0.400-preview.22363.52

Dependency coherency updates

NuGet.Build.Tasks
 From Version 6.3.0-rc.123 -> To Version 6.3.0-rc.128 (parent: Microsoft.NET.Sdk
2022-07-14 05:33:51 +00:00
Marc Paine
07fcef1e98
Merge pull request #14137 from dotnet/darc-release/6.0.4xx-8a7de223-1448-43cf-bb69-9dca8e8931ea
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-13 19:30:38 -07:00
dotnet-maestro[bot]
559f1a1e4d Update dependencies from https://github.com/dotnet/sdk build 20220713.39
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22363.31 -> To Version 6.0.400-preview.22363.39
2022-07-14 01:08:57 +00:00
Marc Paine
da4c6c0b23 Fix logic for putting the manifests in the right location. 2022-07-13 17:15:27 -07:00
Marc Paine
932c17e5f3
Merge pull request #14136 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-07-13 16:59:13 -07:00
Marc Paine
fa0b68898d
Merge pull request #14135 from dotnet/darc-release/6.0.4xx-9559e784-c2cb-4158-98b5-5646b97b00e3
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-13 16:55:51 -07:00
Marc Paine
490bf62bdb
Merge pull request #14130 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-07-13 15:44:12 -07:00
dotnet-maestro[bot]
3b240faef4 Update dependencies from https://github.com/dotnet/sdk build 20220713.31
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22362.24 -> To Version 6.0.400-preview.22363.31

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.4-beta.22330.3 -> To Version 12.0.4-beta.22363.4 (parent: Microsoft.NET.Sdk
2022-07-13 22:28:52 +00:00
Marc Paine
6b9fa18ad7
Install the manifests into their specific feature band rather than the current band 2022-07-13 13:43:25 -07:00
Marc Paine
356e832251
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-13 11:45:16 -07:00
Marc Paine
2c9908fc80
Merge pull request #14117 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-07-13 11:44:27 -07:00
NET Source-Build Bot
3c4e56a00a
update global.json and Versions.props for .NET SDK 6.0.107 (#14121) 2022-07-13 09:23:43 -07:00
dotnet-maestro[bot]
a3290bfa2d Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220713.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22363.1
2022-07-13 15:07:24 +00:00
v-wuzhai
33470cd285
Merge pull request #14120 from dotnet/darc-release/6.0.4xx-02a68627-b868-4779-be23-36a8f540bb55
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-12 19:08:41 -07:00
v-wuzhai
f75111bc4c
Merge pull request #14118 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-07-12 19:07:11 -07:00
dotnet-maestro[bot]
ffa6a7bb74 Update dependencies from https://github.com/dotnet/sdk build 20220712.24
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.24

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.2 (parent: Microsoft.NET.Sdk
2022-07-13 00:54:57 +00:00
dotnet-maestro[bot]
13a3901c10 Update dependencies from https://github.com/dotnet/sdk build 20220712.18
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.18

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,NuGet.Build.Tasks
 From Version 6.0.400-preview.22330.1 -> To Version 6.0.400-preview.22358.2 (parent: Microsoft.NET.Sdk
2022-07-12 23:04:27 +00:00
Marc Paine
96fd3f4e9d
Merge branch 'release/6.0.4xx' into merge/release/6.0.3xx-to-release/6.0.4xx 2022-07-12 15:55:24 -07:00
Marc Paine
667bae46a4
Merge branch 'release/6.0.3xx' into merge/release/6.0.1xx-to-release/6.0.3xx 2022-07-12 15:53:48 -07:00
dotnet-maestro[bot]
50bd0f6567 Update dependencies from https://github.com/dotnet/sdk build 20220712.14
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.12 -> To Version 6.0.400-preview.22362.14
2022-07-12 21:49:35 +00:00
William Godbe
b5fa5e2caf
Update asp.net template version (#14110) 2022-07-12 12:14:03 -07:00
William Godbe
853275fdcb
Update Asp.Net template (#14111) 2022-07-12 12:13:55 -07:00
William Godbe
e22344fc38
Update asp.net template version (#14112) 2022-07-12 12:13:47 -07:00
Marc Paine
310d3c954f
Merge pull request #14114 from wtgodbe/internal-merge-6.0.3xx-2022-07-12-1057
Merging internal commits for release/6.0.3xx
2022-07-12 12:10:30 -07:00
Marc Paine
7bc522bbb6
Merge pull request #14115 from wtgodbe/internal-merge-6.0.1xx-2022-07-12-1057
Merging internal commits for release/6.0.1xx
2022-07-12 12:10:27 -07:00
Will Godbe
23a55e8341 Merge commit 'f6ec7508e3b20ad6fbc4ffa8ea4ed8818ffccc1d' into internal-merge-6.0.1xx-2022-07-12-1057 2022-07-12 10:57:21 -07:00
Will Godbe
4d81493240 Merge commit 'c857713418e715e1ca1a5c9fa5c360aaf71d2231' into internal-merge-6.0.3xx-2022-07-12-1057 2022-07-12 10:57:14 -07:00
Marc Paine
fcac10b492
Merge pull request #14082 from mmitche/branding-6.0.303-2022-07-05-1230
Update branding to 6.0.303
2022-07-12 09:17:07 -07:00
v-wuzhai
dd1baed893
Merge pull request #14105 from dotnet/darc-release/6.0.4xx-cbcfeb9b-5f60-40bd-9b18-50ae67fa66f9
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 19:20:41 -07:00
dotnet-maestro[bot]
6a9c07da4d Update dependencies from https://github.com/dotnet/sdk build 20220711.12
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22361.7 -> To Version 6.0.400-preview.22361.12
2022-07-11 23:21:37 +00:00
Grace Kulin
d8947e4fe2
Merge pull request #14104 from dotnet/darc-release/6.0.4xx-625886fc-478d-4959-9e60-accd4b88bc0e
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-11 14:58:24 -07:00
dotnet-maestro[bot]
ef25719e7c Update dependencies from https://github.com/dotnet/sdk build 20220711.7
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22356.20 -> To Version 6.0.400-preview.22361.7

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.3.0-release-20220627-03 -> To Version 17.3.0-release-20220708-01 (parent: Microsoft.NET.Sdk
2022-07-11 17:11:21 +00:00
v-wuzhai
49f92edbb1
Merge pull request #14097 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-07-10 18:19:54 -07:00
MichaelSimons
d8580fbd61 Remove unneccessary source-build patch 2022-07-08 15:01:48 +00:00
Jason Zhai
46ac9ba248 Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-07-07 19:22:36 -07:00
Marc Paine
5892113c0e
Merge pull request #14017 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-07-07 14:09:43 -07:00
dotnet-maestro[bot]
5eb8a241c8 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220707.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22262.1 -> To Version 6.0.0-servicing.22357.1
2022-07-07 14:58:40 +00:00
v-wuzhai
c671341ee8
Merge pull request #14091 from dotnet/darc-release/6.0.4xx-8fbeedc3-67ca-409f-a41c-9e3cbef13571
[release/6.0.4xx] Update dependencies from dotnet/sdk
2022-07-06 19:07:41 -07:00
Marc Paine
af4b8739b3 run update dependencies. This may conflict when it tries to merge internally though 2022-07-06 16:49:00 -07:00
dotnet-maestro[bot]
b27b4ecf9f Update dependencies from https://github.com/dotnet/sdk build 20220706.20
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.400-preview.22355.11 -> To Version 6.0.400-preview.22356.20
2022-07-06 22:38:20 +00:00
Marc Paine
2e0a0276d8
Merge pull request #14075 from dotnet/Jason/UpdateAlpine313
Update alpine.3.13 to the new one
2022-07-06 14:47:43 -07:00