Commit graph

22744 commits

Author SHA1 Message Date
Daniel Plaisted
e40fc0b12e
Merge pull request #12743 from dotnet-maestro-bot/merge/release/6.0.2xx-to-main
[automated] Merge branch 'release/6.0.2xx' => 'main'
2021-12-03 10:28:26 -08:00
MichaelSimons
1d34af8940 Resolve runtime source-build patch conflict 2021-12-03 15:31:25 +00:00
Daniel Plaisted
84fd6c272a Don't try to validate signing for workload manifests that will be signed as part of post-build signing 2021-12-02 16:46:53 -08:00
Daniel Plaisted
45d2498679 Update workload manifest versions 2021-12-02 15:40:04 -08:00
Daniel Plaisted
0d73a71a5a Merge changes from release/6.0.2xx 2021-12-02 15:38:30 -08:00
Daniel Plaisted
34239c96e5
Merge pull request #12741 from dsplaisted/merge-6.0.1xx-to-6.0.2xx
Merge 6.0.1xx to 6.0.2xx
2021-12-02 09:16:15 -08:00
Jason Zhai
c53c76678f Merge branch 'release/6.0.2xx' into main 2021-12-01 22:21:45 -08:00
Daniel Plaisted
669c89e00e Switch another leg to Ubuntu 18 2021-12-01 22:18:39 -08:00
Daniel Plaisted
564a442b9f Also update source build queues to Ubuntu 18 2021-12-01 21:03:35 -08:00
Daniel Plaisted
53a6a2025c Switch to Ubuntu 18 2021-12-01 17:01:59 -08:00
Marc Paine
66f6491592
Merge pull request #12702 from dsplaisted/AddExcludedRuntimeIdentifiers
Exclude ASP.NET  runtime packs from Android
2021-12-01 14:27:04 -08:00
Daniel Plaisted
b28ca80d75 Merge remote-tracking branch 'upstream/release/6.0.1xx' into merge-6.0.1xx-to-6.0.2xx 2021-12-01 10:31:37 -08:00
dotnet-maestro-bot
4de9a98981
[automated] Merge branch 'release/6.0.2xx' => 'main' (#12734)
* Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724)

[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726)

[release/6.0.2xx] Update dependencies from dotnet/sdk

* source-build patches needed to get 6.0.2xx building (#12718)

* source-build patches needed to get 6.0.2xx building

* Patch to address msbuild prebuilts

* Remove conflicting backported patch

* Additional patches

* Additional vstest patch

* Workaround dev-cert issue in smoke-tests

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2021-11-30 13:33:41 -06:00
Daniel Plaisted
33c0854bda
Merge pull request #12736 from dotnet/remove-ulimit
Remove-ulimit
2021-11-30 10:44:32 -08:00
Daniel Plaisted
f8e115fadf Don't set ulimit
1ES pools should now have ulimit set already now
2021-11-29 20:19:30 -08:00
dotnet-maestro[bot]
6865fa71e4
Update dependencies from https://github.com/dotnet/test-templates build 20211129.1 (#12735)
[main] Update dependencies from dotnet/test-templates
2021-11-29 16:40:14 +00:00
Michael Simons
2ee0e6d76e
source-build patches needed to get 6.0.2xx building (#12718)
* source-build patches needed to get 6.0.2xx building

* Patch to address msbuild prebuilts

* Remove conflicting backported patch

* Additional patches

* Additional vstest patch

* Workaround dev-cert issue in smoke-tests
2021-11-29 08:43:14 -06:00
dotnet-maestro[bot]
7cd8903303
Update dependencies from https://github.com/dotnet/arcade build 20211126.4 (#12733)
[main] Update dependencies from dotnet/arcade
2021-11-27 14:22:43 +00:00
dotnet-maestro[bot]
33a8b886da
Update dependencies from https://github.com/dotnet/arcade build 20211126.2 (#12732)
[main] Update dependencies from dotnet/arcade
2021-11-26 14:15:30 +00:00
dotnet-maestro[bot]
6d8b7083a9
Update dependencies from https://github.com/dotnet/arcade build 20211124.3 (#12729)
[main] Update dependencies from dotnet/arcade
2021-11-25 15:00:13 +00:00
dotnet-maestro[bot]
22c7274ec7
Update dependencies from https://github.com/dotnet/arcade build 20211123.3 (#12728)
[main] Update dependencies from dotnet/arcade
2021-11-24 14:15:59 +00:00
dotnet-maestro[bot]
a2bb0dde82
Update dependencies from https://github.com/dotnet/sdk build 20211123.4 (#12726)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-11-23 17:57:30 +00:00
dotnet-maestro[bot]
79f2c91284
Update dependencies from https://github.com/dotnet/sdk build 20211123.2 (#12724)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211119-03 to 17.1.0-preview-20211122-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-21567-01 to 17.1.0-preview-21572-15 (parent: Microsoft.NET.Sdk)
2021-11-23 12:56:03 +00:00
dotnet-maestro[bot]
0b0e761068
Update dependencies from https://github.com/dotnet/sdk build 20211123.1 (#12723)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.FSharp.Compiler: from 12.0.1-beta.21565.6 to 12.0.1-beta.21572.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 6.0.2-beta.21565.6 to 6.0.2-beta.21572.8 (parent: Microsoft.NET.Sdk)
2021-11-23 12:05:13 +00:00
v-wuzhai
fbc5bbe6ea
Merge pull request #12706 from dotnet-maestro-bot/merge/release/6.0.2xx-to-main
[automated] Merge branch 'release/6.0.2xx' => 'main'
2021-11-22 20:13:06 -08:00
MichaelSimons
cf0d1025ac Resolve source-build patch conflict 2021-11-22 23:58:17 +00:00
Marc Paine
9d1187e909
Merge pull request #12675 from dotnet/marcpopMSFT-WDarm64targeting50main
Enable targeting 5.0 for arm64
2021-11-22 13:58:33 -08:00
Marc Paine
1d075c8fec Fix typo 2021-11-22 13:05:25 -08:00
dotnet-maestro[bot]
93918d953f
Update dependencies from https://github.com/dotnet/sdk build 20211122.10 (#12721)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.200-alpha.1.21568.2 to 6.0.200-alpha.1.21572.3 (parent: Microsoft.NET.Sdk)
2021-11-22 20:07:54 +00:00
Djuradj Kurepa
16c20efa9c
Merge pull request #12604 from dkurepa/ResolveComponentGovernance
Resolve Component Governance alerts
2021-11-22 08:22:03 -08:00
dotnet-maestro[bot]
0f7cff6396
Update dependencies from https://github.com/dotnet/sdk build 20211121.3 (#12720)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21523.2 to 6.0.200-alpha.1.21568.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211119-03 (parent: Microsoft.NET.Sdk)
2021-11-22 07:14:44 +00:00
dotnet-maestro[bot]
53515c68e7
Update dependencies from https://github.com/dotnet/arcade build 20211119.2 (#12719)
[main] Update dependencies from dotnet/arcade
2021-11-20 14:20:12 +00:00
Marc Paine
08f2244ae0 Update the test to target current and 5.0 2021-11-19 13:34:59 -08:00
dotnet-maestro[bot]
369971d171
Update dependencies from https://github.com/dotnet/arcade build 20211118.2 (#12717)
[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.1-beta-21565-01 to 1.1.1-beta-21566-01 (parent: Microsoft.DotNet.Arcade.Sdk)
2021-11-19 14:20:33 +00:00
dotnet-maestro[bot]
636ee9cff9
Update dependencies from https://github.com/dotnet/sdk build 20211118.19 (#12715)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211116-03 to 17.1.0-preview-20211117-01 (parent: Microsoft.NET.Sdk)
2021-11-19 03:38:17 +00:00
Jason Zhai
464d8128d7 Merge branch 'release/6.0.2xx' into main 2021-11-18 19:11:54 -08:00
dotnet-maestro[bot]
bbc6079a4c
Update dependencies from https://github.com/dotnet/sdk build 20211118.17 (#12714)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-11-19 01:46:35 +00:00
dotnet-maestro[bot]
18f6daa460
Update dependencies from https://github.com/dotnet/sdk build 20211118.15 (#12713)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.0.1-1.21561.4 to 4.0.1-1.21568.1 (parent: Microsoft.NET.Sdk)
2021-11-19 01:14:17 +00:00
dotnet-maestro[bot]
c3572a50e2
Update dependencies from https://github.com/dotnet/sdk build 20211118.12 (#12712)
[release/6.0.2xx] Update dependencies from dotnet/sdk
2021-11-19 00:13:35 +00:00
dotnet-maestro[bot]
5ca6fe56ab
Update dependencies from https://github.com/dotnet/sdk build 20211118.9 (#12710)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21567.15 to 7.0.0-alpha.1.21568.1 (parent: Microsoft.NET.Sdk)
2021-11-18 23:42:56 +00:00
dotnet-maestro[bot]
fee5226d8f
Update dependencies from https://github.com/dotnet/sdk build 20211118.8 (#12709)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211117-01 to 17.1.0-preview-20211118-03 (parent: Microsoft.NET.Sdk)
2021-11-18 22:31:00 +00:00
Dan Seefeldt
6d87160a67
Remove 2.1 templates from dynamic templates (#12511) 2021-11-18 19:57:14 +00:00
dotnet-maestro[bot]
9a5396ecf6
Update dependencies from https://github.com/dotnet/sdk build 20211118.4 (#12707)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21568.3 to 7.0.100-alpha.1.21568.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21568.3 to 7.0.100-alpha.1.21568.4 (parent: Microsoft.NET.Sdk)
2021-11-18 19:30:44 +00:00
Daniel Plaisted
54a264fcde
Merge pull request #12699 from manodasanW/patch-4
Update Windows SDK projection
2021-11-18 10:28:15 -08:00
dotnet-maestro[bot]
0be3213624
[main] Update dependencies from dotnet/sdk (#12705)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.DotNet.Common.ItemTemplates: from 7.0.100-alpha.1.21566.1 to 7.0.100-alpha.1.21568.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 7.0.100-alpha.1.21566.1 to 7.0.100-alpha.1.21568.3 (parent: Microsoft.NET.Sdk)
2021-11-18 14:13:16 +00:00
dotnet-maestro[bot]
99379b2c64
Update dependencies from https://github.com/dotnet/sdk build 20211118.1 (#12704)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21567.12 to 7.0.0-alpha.1.21567.15 (parent: Microsoft.NET.Sdk)
2021-11-18 11:11:16 +00:00
dotnet-maestro[bot]
5e97c0ec15
Update dependencies from https://github.com/dotnet/sdk build 20211117.24 (#12703)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-alpha.1.21566.6 to 7.0.0-alpha.1.21567.12 (parent: Microsoft.NET.Sdk)
2021-11-18 04:53:18 +00:00
Daniel Plaisted
8760771077
Merge pull request #12698 from manodasanW/patch-3
Update Windows SDK projection
2021-11-17 20:45:13 -08:00
Michael Simons
5466891cbb
Update dotnet toolset used in source-build (#12701) 2021-11-17 22:12:40 -06:00
dotnet-maestro[bot]
f968a146a2
[release/6.0.2xx] Update dependencies from dotnet/sdk (#12689)
[release/6.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.1.0-preview-20211115-01 to 17.1.0-preview-20211116-03 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.1.0-preview-21565-02 to 17.1.0-preview-21567-01 (parent: Microsoft.NET.Sdk)
2021-11-18 03:48:49 +00:00