Commit graph

25 commits

Author SHA1 Message Date
Michael Simons
0595aeb403
Exclude intermediate and rid specific packages from artifacts tarball (#14224) 2022-08-05 15:40:11 -05:00
Logan Bussell
c571d5ea85
[main] Add patch that retargets arcade projects to net7.0 (#13874)
* Add patch that retargets arcade projects to net7.0

* add patches to bootstrap arcade net7.0 tfm version

* Replace net6.0 references with 7.0 in source build
2022-05-26 20:20:44 +00:00
Chris Rummel
b648ad31b1
[main] Handle NuGet package source mapping in source-build tasks. (#13788) 2022-05-13 14:52:42 -05:00
Jason Zhai
ed70dff20b Merge branch 'release/6.0.4xx' into main 2022-04-27 01:29:14 -07:00
Michael Simons
2a412d3454
Remove CheckSourceBuiltNupkgConflictUsages target (#13668) 2022-04-19 17:23:25 -05:00
Bo Anderson
e44e5907d6
Fix compatibility with BSD df (#13653) 2022-04-19 08:44:59 -05:00
Michael Simons
083549c2e2
Add source-build nowarn for NU1603 (#13289) 2022-02-28 19:38:51 -06:00
Michael Simons
1b7269474c
Update build logic to handle checked in project.assets.json file in NuGet repo (#12810) 2021-12-14 19:23:41 -06:00
Michael Simons
e68cea7f97
Apply source-build patches during tarball creation (#12133) 2021-09-28 07:39:40 -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
Michael Simons
09a29e5308
Ensure ci option is specified in tarball builds (#11956) 2021-09-10 07:54:47 -05: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
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
Michael Simons
e7cd00d5bf
[ArPow Tarball] Tier 2 - Add runtime-portable repo to arpow tarball (#11078)
* [ArPow Tarball] Tier 2 - Add runtime-portable repo to arpow tarball

* Update TemporaryBootstrapPackageVersions.props

* Revert too aggressive of version updates in TemporaryBootstrapPackageVersions.props

* Remove allconfigurations flag since some are not valid in source-build

* Don't copy tools anymore after Package

This target is no longer needed as it was meant to copy ilasm/ildasm to
a known directory to be picked up by SBRP.  SBRP now uses the nupkg.

* Update binlog param to ensure we get inner binlog

* Don't build stable versions for preview

* Update DirectoryBuild.props in src if root one isn't found

* Add dotnet6 feed to NuGet.Configs

* Remove unneeded properties in runtime.common.props

* Increase timeout on create tarball job

* Update portable build cleanup

* Remove timeout on Create Tarball job

* Only add source when building online

* Update prebuilts version

Co-authored-by: dseefeld <dseefeld@microsoft.com>
2021-08-06 18:53:24 -05:00
Logan Bussell
f2fb118bdd
Rename the PackageVersions.props files used in source-build (#11407)
* rename PackageVersions.props files used for source-build
2021-08-06 10:07:54 -07:00
Dan Seefeldt
33c0d0250d
[ArPow Tarball] Clean up src directories when building (#11421)
* Clean up src directories when building

* Updates based on PR review comments
2021-08-06 09:12:04 -05:00
Michael Simons
0b62347ded
[ArPow Tarball] Tier 4 - Add aspnetcore repo to arpow tarball (#11113) 2021-08-03 20:11:34 -05:00
Logan Bussell
98b681d564
[ArPow] Check in the empty src/Directory.Build.props and targets instead of generating them (#11350)
* check in directory.build.props and targets instead of generating them
* make empty build props and targets comments more reader friendly
2021-07-30 11:59:59 -07:00
Dan Seefeldt
69fcba5df7
[ArPow] Update tarball build to build with current version of previously source-built packages (#11293)
* Collect prebuilt packages

* WIP offline build

* Update ReplaceTextInFile(s) to honor line endings

* Build changes required to build with current Roslyn

* Look for 6.0 version of logger

* Add patch for SBRP to get eng/common updated.

* Update previously source-built version

* Add additional comments on patches

* Add comment on TemporaryBootstrap file

* Updates based on PR comments
2021-07-27 10:27:40 -05:00
Chris Rummel
91afacfc09
[ArPow] Temporary fix for reference packages with broken extension methods (#11092)
* Add some needed prebuilt packages to override temporarily bad ref packages.

* Remove bad ref packages.

* Also don't copy new versions of the bad SBRP packages after the SBRP build.

* Account for missing intermediate packages and different paths.

* Address code review comment.
2021-07-09 22:43:30 +00:00
Dan Seefeldt
5048e0f143
[Arpow Tarball] Add flag to build with online sources (#11091)
* Add SBRP packages to prev source-built

* Don't delete SBRP packages

* Add BuildWithOnlineSources flag

* Build tarball in CI with online sources

* Remove OfflineBuild / add BuildWithOnlineSources

* Add --online option to tarball build.sh

* Additional cleanup for tarball build

* Rename baseline file

* Update baseline

* Remove acquire-darc.proj

* Default DotNetBuildOffline to true

* Fix line endings in RemoveInternetSources

* Update src/SourceBuild/Arcade/eng/common/templates/steps/source-build-run-tarball-build.yml

Co-authored-by: Michael Simons <msimons@microsoft.com>

Co-authored-by: Michael Simons <msimons@microsoft.com>
2021-07-09 21:42:42 +00:00
Michael Simons
40235466e9
Fix source-build ci and build infra (#11088) 2021-07-08 20:09:54 -05:00
Dan Seefeldt
31b6510fd5
[ArPow] Reconcile prebuilt checks between inner and outer builds (#11021)
* Setup inner build prebuilt checks to use global package caches

* Update previously source-built version to include version built from tarball build

* Update NuGet.config and global.json for SBRP

* Copy restored packages from inner build

* Update src/SourceBuild/tarball/content/repos/source-build-reference-packages.proj

Co-authored-by: Michael Simons <msimons@microsoft.com>

Co-authored-by: Michael Simons <msimons@microsoft.com>
2021-06-30 21:17:54 -05:00
Dan Seefeldt
00cd0d1ac2
Propagate DotNetBuildOffline and DotNetPackageVersionPropsPath to inner source-build tarball repo builds (#10986)
* Allow overriding of arcade targets for quicker dev flow

* Add StandardArpowBuildArgs

* Update naming based on PR review comment
2021-06-28 14:24:48 -05:00
Dan Seefeldt
832010fdf6
Initial checkin of source-build tarball build infrastructure (#10961)
* Initial checkin of source-build tarball build infra

* Add a couple more comments

* Update eng/SourceBuild.Version.Details.xml based on PR review

Co-authored-by: Chris Rummel <crummel@microsoft.com>

* Updates based on PR review comments

Co-authored-by: Chris Rummel <crummel@microsoft.com>
2021-06-24 16:36:04 -05:00