Commit graph

23514 commits

Author SHA1 Message Date
dotnet-maestro[bot]
9fefd90920 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220314.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22160.2 -> To Version 7.0.0-alpha.1.22164.1
2022-03-14 19:42:18 +00:00
v-wuzhai
570bb2f1c4
Merge pull request #13317 from dotnet-maestro-bot/merge/release/6.0.3xx-to-main
[automated] Merge branch 'release/6.0.3xx' => 'main'
2022-03-13 20:54:17 -07:00
Marc Paine
bfebed846a
Merge branch 'main' into merge/release/6.0.3xx-to-main 2022-03-11 15:57:47 -08:00
Michael Simons
69ea868ac1
Fix source-build graph in Version.Details.xml (#13384) 2022-03-11 15:53:22 -06:00
MichaelSimons
90153d2939 Remove aspnetcore patch that was backported 2022-03-11 15:02:26 +00:00
Jason Zhai
9fa0019355 Merge branch 'release/6.0.3xx' into main 2022-03-10 23:36:54 -08:00
Marc Paine
2cf433858f
Update the nuspec as well to remove the duplicates (#13393) 2022-03-10 20:07:24 -08:00
Marc Paine
44804cc6d7
Merge pull request #13383 from dotnet/darc-main-ef15b245-8e3d-456c-8700-947e11f0e5ad
[main] Update dependencies from dotnet/source-build-reference-packages
2022-03-10 14:00:34 -08:00
Marc Paine
5e34864f0c
Merge pull request #13389 from dotnet/darc-release/6.0.3xx-5bddc6b7-5903-42f1-87ff-f711d5ca2184
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-10 14:00:29 -08:00
Marc Paine
c10ad05ffb
Merge pull request #13385 from dotnet/marcpopMSFT-fixduplicatepackages
Fix duplicate packages
2022-03-10 13:59:49 -08:00
dotnet-maestro[bot]
b3788b0b4a Update dependencies from https://github.com/dotnet/sdk build 20220310.6
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22160.3 -> To Version 6.0.300-preview.22160.6

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22158.11 -> To Version 6.0.300-preview.22160.1 (parent: Microsoft.NET.Sdk
2022-03-10 21:06:40 +00:00
Jacques Eloff
faa618ce2d
Ensure finalizer.exe is always cached (#13388) 2022-03-10 12:23:35 -08:00
Marc Paine
211f57e0fb
Merge pull request #13387 from dotnet/darc-release/6.0.3xx-0360c6c3-c471-4e8e-aec9-ab5033bca539
[release/6.0.3xx] Update dependencies from dotnet/arcade
2022-03-10 11:30:43 -08:00
Doug Bunting
f29b6a1f4f
[main] Bump aspnetcore template versions (#13368)
* [main] Bump aspnetcore template versions
- we release a new targeting pack every time
- bump 3.1 through 6.0 `$(VersionFeatureXX)` values

* Update GenerateBundledVersions.targets

Co-authored-by: William Godbe <wigodbe@microsoft.com>
2022-03-10 11:06:30 -08:00
dotnet-maestro[bot]
bf283dc686 Update dependencies from https://github.com/dotnet/arcade build 20220309.8
Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22122.7 -> To Version 6.0.0-beta.22159.8
2022-03-10 18:38:02 +00:00
Marc Paine
18f1baa6e6
Fix duplicate packages 2022-03-10 09:08:26 -08:00
dotnet-maestro[bot]
a8d4b43e34
Update dependencies from https://github.com/dotnet/sdk build 20220310.3 (#13379)
[release/6.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.2.0-2.22158.15 to 4.2.0-2.22159.10 (parent: Microsoft.NET.Sdk)
2022-03-10 17:05:31 +00:00
Marc Paine
9e984b0ac8
Merge pull request #13381 from dotnet/darc-release/6.0.3xx-201c1eb8-4273-4b16-8d79-8d3088e7d5e8
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-10 09:03:11 -08:00
dotnet-maestro[bot]
e5aa9a1372 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 7.0.0-alpha.1.22154.4 -> To Version 7.0.0-alpha.1.22160.2
2022-03-10 16:34:49 +00:00
Michael Simons
9c6a93aa8e
Merge pull request #13369 from dotnet-maestro-bot/merge/release/6.0.2xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.2xx' => 'release/6.0.3xx'
2022-03-10 09:57:25 -06:00
dotnet-maestro[bot]
3cbe72d752 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220310.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22159.1 -> To Version 6.0.0-servicing.22160.1
2022-03-10 15:34:39 +00:00
Jason Zhai
85a7a87220 Merge branch 'release/6.0.2xx' into release/6.0.3xx 2022-03-09 22:10:08 -08:00
v-wuzhai
7a9cbfeb2a
Merge pull request #13358 from dotnet/darc-release/6.0.3xx-68594d04-5933-4f63-aa9a-c0831c99487e
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-09 17:59:42 -08:00
v-wuzhai
8b1d276843
Merge pull request #13373 from dotnet/darc-release/6.0.3xx-c0f6b24d-6c89-4ee7-90e6-bf32798819c6
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-09 17:57:19 -08:00
dotnet-maestro[bot]
d589d22fb7
Update dependencies from https://github.com/dotnet/sdk build 20220309.14 (#13375)
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.10 -> To Version 7.0.100-preview.3.22159.14

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-10 01:22:30 +00:00
dotnet-maestro[bot]
08f21810f5
Update dependencies from https://github.com/dotnet/sdk build 20220309.10 (#13372)
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.5 -> To Version 7.0.100-preview.3.22159.10

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-09 16:05:09 -08:00
dotnet-maestro[bot]
54a0c0322d Update dependencies from https://github.com/dotnet/sdk build 20220309.13
Microsoft.NET.Sdk , Microsoft.DotNet.MSBuildSdkResolver
 From Version 6.0.300-preview.22159.1 -> To Version 6.0.300-preview.22159.13

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.3-beta.22158.8 -> To Version 12.0.3-beta.22159.2 (parent: Microsoft.NET.Sdk
2022-03-09 23:41:33 +00:00
Marc Paine
41d9542307
Merge pull request #13325 from dotnet/marcpopMSFT-preview2
Update the table to preview 2
2022-03-09 14:43:48 -08:00
Marc Paine
282b722f63
Merge pull request #13356 from dotnet/darc-release/6.0.3xx-16372dbb-683c-4ec6-b71d-3bb24bbf0fd4
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-09 14:28:34 -08:00
Marc Paine
77b0e0529f
Merge pull request #13363 from dotnet/darc-main-4b613633-b315-4f73-84db-dfabd911b35b
[main] Update dependencies from dotnet/sdk
2022-03-09 14:26:53 -08:00
Doug Bunting
67bae3a688
[6.0.3xx] Bump aspnetcore template versions (#13367) 2022-03-09 12:21:10 -08:00
Doug Bunting
a8858e9369
[6.0.2xx] Bump aspnetcore template versions (#13366) 2022-03-09 12:21:02 -08:00
dotnet-maestro[bot]
06ec82d3d5 Update dependencies from https://github.com/dotnet/sdk build 20220309.5
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.3 -> To Version 7.0.100-preview.3.22159.5

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.NET.Test.Sdk
 From Version 7.0.100-preview.3.22158.10 -> To Version 7.0.100-preview.3.22159.1 (parent: Microsoft.NET.Sdk
2022-03-09 20:07:40 +00:00
dotnet-maestro[bot]
00d20ea59f Update dependencies from https://github.com/dotnet/sdk build 20220309.4
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22159.3 -> To Version 7.0.100-preview.3.22159.4

Dependency coherency updates

Microsoft.NET.Test.Sdk
 From Version 17.2.0-preview-20220307-04 -> To Version 17.2.0-preview-20220308-05 (parent: Microsoft.NET.Sdk
2022-03-09 18:58:02 +00:00
dotnet-maestro[bot]
c53b3badd5
[main] Update dependencies from dotnet/sdk (#13357)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-preview.3.22158.1 to 7.0.0-preview.3.22159.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-preview.3.22158.1 to 7.0.0-preview.3.22159.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-preview.3.22158.1 to 7.0.0-preview.3.22159.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-preview.3.22158.9 to 7.0.0-preview.3.22158.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-preview.3.22158.9 to 7.0.0-preview.3.22158.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-preview.3.22158.9 to 7.0.0-preview.3.22158.12 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-preview.3.22158.9 to 7.0.0-preview.3.22158.12 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-preview.3.22158.9 to 7.0.0-preview.3.22158.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-preview.3.22158.9 to 7.0.0-preview.3.22158.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.3.22158.1 to 7.0.0-preview.3.22159.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-preview.3.22157.2 to 7.0.0-preview.3.22158.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-preview.3.22158.1 to 7.0.0-preview.3.22159.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-preview.3.22158.1 to 7.0.0-preview.3.22159.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
2022-03-09 17:09:49 +00:00
Michael Simons
ad22b53f36
Disable source-build tarball build in CI (#13351) 2022-03-09 16:22:23 +00:00
dotnet-maestro[bot]
f79133d712 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220309.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22158.2 -> To Version 6.0.0-servicing.22159.1
2022-03-09 15:46:36 +00:00
dotnet-maestro[bot]
206a293584 Update dependencies from https://github.com/dotnet/sdk build 20220309.1
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22158.30 -> To Version 6.0.300-preview.22159.1

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.2.0-2.22153.7 -> To Version 4.2.0-2.22158.15 (parent: Microsoft.NET.Sdk
2022-03-09 12:01:18 +00:00
v-wuzhai
55c54fe5ba
Merge pull request #13355 from dotnet/darc-release/6.0.3xx-b7581b31-cead-4009-a859-323a0ed5ceae
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-09 01:25:44 -08:00
dotnet-maestro[bot]
e45c3f920c Update dependencies from https://github.com/dotnet/sdk build 20220308.30
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22158.21 -> To Version 6.0.300-preview.22158.30

Dependency coherency updates

Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp
 From Version 12.0.2-beta.22155.1 -> To Version 12.0.3-beta.22158.8 (parent: Microsoft.NET.Sdk
2022-03-09 08:01:45 +00:00
v-wuzhai
db23f98ef5
Merge pull request #13353 from dotnet/darc-release/6.0.3xx-b8300caa-44e4-46c2-ac3e-9f87fa11de48
[release/6.0.3xx] Update dependencies from dotnet/source-build-reference-packages
2022-03-08 22:20:45 -08:00
dotnet-maestro[bot]
ee3fc9f525
[main] Update dependencies from dotnet/sdk (#13352)
* Update dependencies from https://github.com/dotnet/sdk build 20220308.20

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22158.13 -> To Version 7.0.100-preview.3.22158.20

Dependency coherency updates

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-secrets
 From Version 7.0.0-preview.3.22157.8 -> To Version 7.0.0-preview.3.22158.9 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220308.26

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22158.13 -> To Version 7.0.100-preview.3.22158.26

Dependency coherency updates

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-secrets,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-preview.3.22157.8 -> To Version 7.0.0-preview.3.22158.9 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220308.27

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22158.13 -> To Version 7.0.100-preview.3.22158.27

Dependency coherency updates

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-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset
 From Version 7.0.0-preview.3.22157.8 -> To Version 7.0.0-preview.3.22158.9 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-08 21:23:09 -08:00
dotnet-maestro[bot]
7996169322 Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220308.2
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22154.3 -> To Version 6.0.0-servicing.22158.2
2022-03-09 04:39:14 +00:00
dotnet-maestro[bot]
a1c108daba Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20220308.1
Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 6.0.0-servicing.22154.3 -> To Version 6.0.0-servicing.22158.1
2022-03-09 03:53:24 +00:00
v-wuzhai
f8b4d3a84c
Merge pull request #13349 from dotnet/darc-release/6.0.3xx-7d4980ff-5b31-42c1-8ad9-47b132b31932
[release/6.0.3xx] Update dependencies from dotnet/sdk
2022-03-08 18:37:27 -08:00
dotnet-maestro[bot]
27af8051bc Update dependencies from https://github.com/dotnet/sdk build 20220308.21
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22157.14 -> To Version 6.0.300-preview.22158.21

Dependency coherency updates

Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0
 From Version 6.0.300-preview.22153.2 -> To Version 6.0.300-preview.22158.11 (parent: Microsoft.NET.Sdk
2022-03-09 01:27:31 +00:00
dotnet-maestro[bot]
6cd9dc17f6
[release/6.0.3xx] Update dependencies from dotnet/arcade (#13313)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-08 18:55:29 -06:00
dotnet-maestro[bot]
4d001c3b75
[release/6.0.2xx] Update dependencies from dotnet/arcade (#13314)
* Update dependencies from https://github.com/dotnet/arcade build 20220222.7

Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Arcade.Sdk
 From Version 6.0.0-beta.22107.2 -> To Version 6.0.0-beta.22122.7

* Remove source-build arcade patches that were backported

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-03-08 18:53:00 -06:00
dotnet-maestro[bot]
fead59003c
[main] Update dependencies from dotnet/sdk (#13343)
* Update dependencies from https://github.com/dotnet/sdk build 20220308.6

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22158.2 -> To Version 7.0.100-preview.3.22158.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.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-preview.3.22157.2 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220308.10

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22158.2 -> To Version 7.0.100-preview.3.22158.10

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-preview.3.22157.2 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20220308.13

Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 7.0.100-preview.3.22158.2 -> To Version 7.0.100-preview.3.22158.13

Dependency coherency updates

Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates
 From Version 7.0.0-preview.3.22157.2 -> To Version 7.0.0-preview.3.22158.1 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2022-03-08 16:37:19 -08:00
dotnet-maestro[bot]
c04f96501d Update dependencies from https://github.com/dotnet/sdk build 20220308.16
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.300-preview.22157.14 -> To Version 6.0.300-preview.22158.16
2022-03-08 22:55:53 +00:00