Commit graph

1027 commits

Author SHA1 Message Date
MichaelSimons
0cec6c187e Handle workload manifests as text-only packages in source-build 2021-10-08 19:39:22 +00:00
Michael Simons
c88205fd7e
Merge pull request #12245 from MichaelSimons/enable-tarball-ci
[ArPow] Re-enable source-build tarball PR validation
2021-10-08 09:22:24 -05:00
dotnet-maestro[bot]
bca0813ad9
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12263)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21507.1 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21505.4 to 6.0.0-rtm.21507.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21505.6 to 6.0.0-rtm.21507.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21505.8 to 6.0.0-rtm.21507.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Build: from 17.0.0-preview-21501-01 to 17.0.0-preview-21507-06 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21506.22 to 6.0.0-rtm.21507.16 (parent: Microsoft.NET.Sdk)

 - Resolve source-build patch conflicts

 - Merge branch 'darc-release/6.0.1xx-f658da10-b150-4bd3-8c2e-cb6d2453006b' of https://github.com/dotnet/installer into darc-release/6.0.1xx-f658da10-b150-4bd3-8c2e-cb6d2453006b

 - Resolve source-build patch conflicts
2021-10-08 13:14:16 +00:00
MichaelSimons
39c6c2cb89 Disable offline and smoke-tests in CI 2021-10-08 12:17:17 +00:00
Chris Rummel
ae70ef3cf5
Temporarily disable package validation to prevent two tasks clashing and causing a file-in-use error. 2021-10-07 18:09:24 -05:00
Michael Simons
9ad6c2612e
Merge pull request #12255 from crummel/smokeTestPrereqs
[ArPow] Add smoke-test-prereqs to NuGet.config
2021-10-07 14:53:55 -05:00
Michael Simons
6e3ae6f5d6
Merge pull request #12256 from MichaelSimons/runtime-prereqs
Add runtime patch to enable host.pkg subset to eliminate prebuilts
2021-10-07 13:11:35 -05:00
dotnet-maestro[bot]
17811054ad
[release/6.0.1xx] Update dependencies from dotnet/sdk (#12260)
[release/6.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rtm.21501.15 to 6.0.0-rtm.21507.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ItemTemplates: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.TemplateEngine.Cli: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.100-rtm.21504.1 to 6.0.100-rtm.21504.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.0-rtm.21501.5 to 6.0.0-rtm.21505.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.0-rtm.21501.4 to 6.0.0-rtm.21505.8 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.Net.Compilers.Toolset: from 4.0.0-5.21501.19 to 4.0.0-5.21505.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.0-rtm.21504.6 to 6.0.0-rtm.21506.22 (parent: Microsoft.NET.Sdk)

 - Resolve source-build patch conflicts
2021-10-07 15:51:06 +00:00
MichaelSimons
c53f76dc26 Add runtime patch to enable host.pkg subset to eliminate prebuilts 2021-10-06 16:00:13 +00:00
Chris Rummel
620b231b83 Add smoke-test-prereqs to NuGet.config. 2021-10-05 20:58:17 -05:00
Jon Fortescue
c63a9f5490 Merge branch 'main' into 1esPoolsMain 2021-10-05 09:38:50 -07:00
MichaelSimons
fce1e1b787 Re-enable tarball PR validation 2021-10-05 15:59:33 +00:00
MichaelSimons
8c6b87a808 Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into rc2-to-ga 2021-10-05 13:46:37 +00:00
Chris Rummel
d19c0ef387
[SourceBuild] Add omnisharp fix patch (#12227)
* Add omnisharp fix path

* Address review comments.
2021-10-04 15:55:41 -05:00
MichaelSimons
3ebd16481b Resolve source-build patch conflicts 2021-10-04 20:41:51 +00:00
MichaelSimons
b36ba0e039 Resolve source-build patch conflicts 2021-10-04 19:54:45 +00:00
Jon Fortescue
43a44557cb oops 2021-10-04 11:54:42 -07:00
Jon Fortescue
f5c955d584 Switch to 1ES R&D pools on main 2021-10-04 11:11:05 -07:00
Dan Seefeldt
7a78f60c47
[ArPow] Add option to bootstrap previously source-built packages (#12222)
* Add option to bootstrap previously source-built packages

This option modifies the previously source-built archive
to include portable packages that are downloaded from
a microsoft official feed rather than source-built.

* Remove working directory

* Add newlines

* Add additional comment about feeds

* Update source-build prebuilts

* Remove original archive rather than backup

Co-authored-by: MichaelSimons <msimons@microsoft.com>
2021-10-02 01:37:05 +00:00
Michael Simons
b05fc9c997
[ArPow] Add runtime patch to enable doc generation (#12221) 2021-10-01 23:13:54 +00:00
Michael Simons
6bcf16be37
[ArPow] Add runtime patch to produce symbol archives (#12220) 2021-10-01 21:57:11 +00:00
Michael Simons
c5d2414c0f
Update source-build prebuilts (#12225) 2021-10-01 19:36:06 +00:00
MichaelSimons
ad7094b0db Fix source-build merge conflicts 2021-10-01 19:21:21 +00:00
MichaelSimons
2f7c1a94d6 Disable offline source-build tarball CI 2021-10-01 18:36:48 +00:00
MichaelSimons
1af6f563f1 Correcting source-build related merge issues 2021-10-01 18:35:43 +00:00
MichaelSimons
7094f386a9 Disable offline source-build tarball CI 2021-10-01 18:21:43 +00:00
MichaelSimons
c2aa7e513e Correcting source-build related merge issues 2021-10-01 17:26:40 +00:00
Sarah Oslund
cef94cb9e0 Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into HEAD 2021-10-01 09:18:12 -07:00
Sarah Oslund
62b386e76b Merge remote-tracking branch 'upstream/release/6.0.1xx-rc2' into MergeRc2ToGa 2021-10-01 09:11:25 -07:00
Marc Paine
7b637144b6
Merge pull request #12190 from uweigand/s390x-part2-rc2
Add support for s390x architecture, part 2
2021-09-29 14:38:07 -07:00
Michael Simons
0e1b32b8ee
[ArPow] Add support to build source-build from specific installer commit (#12186)
* Add support to build source-build from specific installer commit

* Fix nuget.client repo name
2021-09-29 20:48:16 +00:00
Ulrich Weigand
9ab241ff4c Add support for s390x architecture, part 2
* Add linux-s390x RID for aspnetcore net6.0 to GenerateBundledVersions

* Add s390x build architecture in ArPow smoke-test.sh
2021-09-29 18:15:59 +02:00
Michael Simons
2779433e56
Move roslyn-analyzer patches (#12183) 2021-09-29 16:06:42 +00:00
Michael Simons
a3e91ed179
Cleanup disabled ExtractLinkerPackageToCache linker target (#12164) 2021-09-29 09:00:40 -05:00
Michael Simons
1c32c5f845
[ArPow] Update source-build commit shas (#12161) 2021-09-28 19:26:00 -05:00
Michael Simons
e4c6be0dbf
Eliminate Microsoft.Deployment.DotNet.Releases prebuilt (#12162) 2021-09-28 13:47:41 -05:00
Łukasz Patalas
3435ea263c
[release/6.0.1xx-rc2] Migrate to 1ES hosted pools (#12056) 2021-09-28 07:40:29 -05:00
Michael Simons
e68cea7f97
Apply source-build patches during tarball creation (#12133) 2021-09-28 07:39:40 -05:00
Dan Seefeldt
37556cb644
Add patches to resolve roslyn-analyzers prebuilts (#12129) 2021-09-24 22:16:30 +00:00
Michael Simons
28be3e9a00
Remove ProdCon v1 version properties which cause incorrect versioning (#12123) 2021-09-24 16:49:31 +00:00
Michael Simons
3694b8b984
[ArPow] Run smoke tests for tarball CI (#11023) (#12055) 2021-09-23 19:02:27 -05:00
Chris Rummel
5e326e600e
Merge pull request #11873 from uweigand/runtime-version
[ArPow] Fix overrides of runtime package versions
2021-09-23 11:51:21 -05:00
Michael Simons
3a134367fe
Update source-build prebuilts (#12085) 2021-09-23 08:49:58 -05:00
Matt Mitchell
87c927be27
Add source build tarball setup nuget feeds and remove unused group (#12081) 2021-09-22 22:05:24 +00:00
Dan Seefeldt
f731167886
Change BuildInParallel to "false" to solve race condition (#12076) 2021-09-22 15:56:07 -05:00
Chris Rummel
ba3c02f1d8
Merge pull request #12020 from uweigand/runtime-version-rc2
Fix overrides of runtime package versions
2021-09-22 14:50:40 -05:00
Michael Simons
d26f9a313a
[ArPow] Update prebuilts and enable offline CI (#12072)
* Update prebuilts and enable offline CI

* Update previous source-built and add offline source-link patch
2021-09-22 14:19:05 -05:00
Matt Mitchell
1e9ab7323f
Add source build tarball setup nuget feeds and remove unused group (#12079) 2021-09-22 12:15:31 -07:00
Michael Simons
4a23a7ed10
Update commit shas for source build (#12066) 2021-09-22 10:22:47 -05:00
Logan Bussell
3d8501fba2
[ArPow] Add text-only packages to tarball (#11967)
* add text-only packages to tarball

* add BuildTextOnlyPackages target to tarball build targets

* fix typo

* add content to text only package nuspec files

* Change reference to single nuspec file

* Update based on PR review

* prevent inner buildlog from being overwritten

* condition SourceBuildIntermediate.proj copy and build on the file not existing

* condition entire copy target on SourceBuildIntermediateProjTarget file existing

* Revert "condition entire copy target on SourceBuildIntermediateProjTarget file existing"

This reverts commit 995e106c81751b7d9597abf0c120963c2ab5374b.

* Revert "condition SourceBuildIntermediate.proj copy and build on the file not existing"

This reverts commit 3fbaa11bdb34cf9bb8f006f4c27bbd16783cac09.

* Revert "prevent inner buildlog from being overwritten"

This reverts commit f994e885fd7e0938dcc80150f3a0a8aad215f014.

Co-authored-by: dseefeld <dseefeld@microsoft.com>
2021-09-21 21:06:41 -05:00