Commit graph

90 commits

Author SHA1 Message Date
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
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
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
c2aa7e513e Correcting source-build related merge issues 2021-10-01 17:26:40 +00: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
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
Michael Simons
3a134367fe
Update source-build prebuilts (#12085) 2021-09-23 08:49:58 -05: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
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
Michael Simons
2087c393f6
Resolve deployment-tools prebuilts (#11993) 2021-09-21 18:34:07 +00:00
Ulrich Weigand
68fdf224ab Fix overrides of runtime package versions
* Use $(outputRuntimePackageVersion) to determine the version of the
  runtime packages to be consumed by other packages built later
2021-09-18 01:31:33 +02:00
Ulrich Weigand
f1c05e42af Add support for s390x architecture
* Add linux-s390x RIDs for net6.0 to GenerateBundledVersions

* Add s390x platform in Directory.Build.props

* Disable crossgen2 for the s390x target
2021-09-17 22:47:29 +02:00
Omair Majid
448400e0a5
[ArPow] Run smoke tests for tarball CI (#11023)
* [ArPow] Run smoke tests for tarball CI

Fixes: dotnet/source-build#2298

* Update smoke-tests version reference

* comment out tests with missing templates and temporarily accommodate missing xml files

* Disable f# and blazorwasm tests

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <36081148+lbussell@users.noreply.github.com>
2021-09-16 14:57:20 -05:00
Michael Simons
95a9ca67b5
[ArPow] Update previous source-built (#11705)
* Update previous source-built

* Add patch for crossgen2 issue in runtime

This includes the fix suggested by hoyosjs on https://github.com/dotnet/sdk/issues/20543

* Fix error in patch

* Add recommended arcade patch

* Fix compiler error in patch

* Update previous source built

* Remove unnecessary patch

* Update previous source-built and add patches

* Runtime patches

* Patch fixup

* Fix bad patch

* Updates

* runtime patch update

* Refactor runtime patches

* Update 0003-Mark-System.Reflection.Metadata-with-PrivateAssets.patch

Co-authored-by: dseefeld <dseefeld@microsoft.com>
Co-authored-by: Dan Seefeldt <Dan.Seefeldt@microsoft.com>
2021-09-15 14:27:26 -05:00
Dan Seefeldt
668efded88
Exclude externals project in vstest when building from source (#11980) 2021-09-13 23:41:43 +00:00
Dan Seefeldt
6d264e0418
Exclude test projects from roslyn-analyzers in source-build (#11978) 2021-09-13 16:06:56 -05:00
Dan Seefeldt
1ee668a856
Port logic from 5.0 to clean binaries from tarball (#11955) 2021-09-10 22:21:07 +00:00
Michael Simons
09a29e5308
Ensure ci option is specified in tarball builds (#11956) 2021-09-10 07:54:47 -05:00
Michael Simons
5b535217cf
[ArPow] Update source-build commit shas (#11710) 2021-09-09 08:03:44 -05:00
Dan Seefeldt
290df5778e
[ArPow] Reduce the size of the tarball. (#11662)
* Copy instead of clone and remove .git/objects directories

* Add depth 1 to fetch command

* Add commit count to git-info for installer repo

* Update targets to fix dependency ordering

Some repos take a dependency on PrepareInnerSourceBuildRepoRoot,
assuming that the inner repo will be setup.  The condition for copy
instead of clone caused a conflict.
Keep PrepareInnerSourceBuildRepoRoot and make it depend on
either copy or clone completing.

* Don't copy artifacts dir

* Actually don't remove artifacts directory

* Update prebuilt version
2021-09-01 08:31:15 +00:00
Michael Simons
c61bcfc01f
[ArPow] Update prebuilts and pipeline build agents (#11779) 2021-09-01 04:20:55 +00:00
Logan Bussell
2ced035521
[ArPow] Add Microsoft.Deployment.DotNet.Releases to tarball (#11623)
* add deployment-tools to tarball (wip)

* point source build to official deployment tools repo

* update deployment tools commit hash

* add patch for arcade offline build issue

* increment prebuilts version

* move deployment-tools from arpow tier 2 to tier 4
2021-08-31 09:41:54 -05:00
Michael Simons
fe0187f55e
[ArPow] Misc changes to reduce tarball build size (#11683) 2021-08-26 16:30:50 +00:00
Chris Rummel
f3ea71b28f
[ArPow] Add NuGet.Client (#11489)
* [main] Update dependencies from dotnet/sdk (#11565)

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.AspNetCore.App.Ref: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 6.0.0-rc.1.21417.2 to 6.0.0-rc.1.21417.8 (parent: Microsoft.NET.Sdk)

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

[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.0.0-preview-20210817-01 to 17.0.0-preview-20210817-02 (parent: Microsoft.NET.Sdk)

* Update dependencies from https://github.com/dotnet/arcade build 20210817.1 (#11570)

[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21309-01 to 1.1.0-beta-21416-05 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21412.1 to 1.0.0-beta.21414.1 (parent: Microsoft.DotNet.Arcade.Sdk)

* [ArPow] Add runtime repo to tarball (#11506)

* Add runtime repo / update runtime project

* Update runtime-portable logs and properties

* Create runtime-portable git-info

* Fix unpack of IntermediatePackages

* Re-enable references to runtime

* Pass TargetRid and NonPortable to runtime build

* Only build allconfigurations in non-portable build

* Add SDK patch to disable new CA warning

* Increase built tarball timeout

* Update prebuilt version

* Remove 5.0.3xx and preview 7
Add rc1, 6.0 daily, and move main to 7.0

* Removing 7.0 for now as there aren't builds yet.

* Update dependencies from https://github.com/dotnet/arcade build 20210818.12 (#11594)

[main] Update dependencies from dotnet/arcade
- Coherency Updates:
  - Microsoft.SourceLink.GitHub: from 1.1.0-beta-21416-05 to 1.1.0-beta-21417-01 (parent: Microsoft.DotNet.Arcade.Sdk)
  - Microsoft.DotNet.XliffTasks: from 1.0.0-beta.21414.1 to 1.0.0-beta.21417.1 (parent: Microsoft.DotNet.Arcade.Sdk)

* [ArPow] Add installer repo to tarball (#11483)

* Fix the rc2 aka.ms links

* Add NuGet

* Make safe repo name safer.

* some more props filename stuff

* Patches to get the repo to build

* Use NuGet build script instead of manually calling msbuild.

* Add patch for source-build in build.sh in nuget.

* Use existing 5.0 nuget patch.

* Fixes for build scripts and .NET 6 SDK upgrade.

* Remove obsolete patch - this was caused by not using the correct source-build SDK.

* Address code review comment for source-build build script.

* Restore reference from installer to NuGet.

* Fix patch not applying.

* Don't try to pass Arcade build args to MSBuild.

* Fix script typo.

* Patch NuGet.Frameworks to produce netstandard2.0 for VSTest.

* Did this patch the wrong way around.

* Ignore  failure in no-network case

* UPdate prebuilts version.

Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Dan Seefeldt <dseefeld@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>
2021-08-24 20:01:06 +00:00
Michael Simons
7c4b93e5b7
[ArPow Tarball] Tier 3 - Add roslyn-analyzers repo to arpow tarball (#11114) 2021-08-24 15:33:44 +00:00
Chris Rummel
f932fe8d77
[ArPow] Merge new repos to release/6.0.1xx (#11620)
* [ArPow] Add runtime repo to tarball (#11506)

* Add runtime repo / update runtime project

* Update runtime-portable logs and properties

* Create runtime-portable git-info

* Fix unpack of IntermediatePackages

* Re-enable references to runtime

* Pass TargetRid and NonPortable to runtime build

* Only build allconfigurations in non-portable build

* Add SDK patch to disable new CA warning

* Increase built tarball timeout

* Update prebuilt version

* [ArPow] Add installer repo to tarball (#11483)

* Ignore  failure in no-network case

Co-authored-by: Dan Seefeldt <dseefeld@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Matt Galbraith <mattgal@microsoft.com>
2021-08-23 22:05:58 +00:00
Dan Seefeldt
381ea7f7ae
[ArPow Tarball] Uptake new version of SBRP (#11491)
* Uptake new version of SBRP

* Remove SBRP patch

* Remove unneeded runtime patch
2021-08-12 08:27:52 -05:00