Commit graph

5161 commits

Author SHA1 Message Date
Přemek Vysoký
95f1456fb4
Update DarcLib, change VMR source mappings back to .json (#14788) 2022-10-20 15:26:12 +02:00
Michael Simons
5700aea798
Update source-build tarball CI to utilize faster build agents (#14795) 2022-10-20 08:18:44 -05:00
Mike Mulchrone
777228f46d #14522 adjusting width to avoid cropping. 2022-10-19 21:14:30 -04:00
Michael Simons
e6dd91c290
Update source-build tarball CI to utilize faster build agents (#14794) 2022-10-19 22:25:52 +00:00
Michael Simons
ae0f99a1b9
Update source-build tarball CI to utilize faster build agents (#14796) 2022-10-19 22:21:58 +00:00
ae56e0f10c
Add support for ARM platform (#14592) 2022-10-19 17:09:33 -05:00
dotnet-maestro[bot]
027bf25919
[main] Update dependencies from dotnet/sdk (#14787)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.22517.13 to 8.0.0-alpha.1.22519.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22511.1 to 8.0.0-alpha.1.22511.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22515.1 to 8.0.0-alpha.1.22516.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22511.2 to 8.0.0-alpha.1.22515.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221013-06 to 17.5.0-preview-20221018-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 7.0.100-1.22514.1 to 7.0.100-1.22518.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-22513-03 to 17.5.0-preview-22517-05 (parent: Microsoft.NET.Sdk)

 - remove backported SDK patch
2022-10-19 21:45:05 +00:00
Tom Deseyn
9ce6a457e1 Remove runtime-portable build. 2022-10-19 06:04:15 +02:00
Michael Simons
56e87c1005
Switch build.sh to use dotnet msbuild vs dotnet path/to/msbuild.dll (#14782) 2022-10-18 09:31:59 -05:00
MichaelSimons
a244096738 Remove backported source-build patch 2022-10-17 14:49:22 +00:00
dotnet-maestro[bot]
810bfe60b3
[release/7.0.1xx] Update dependencies from dotnet/arcade (#14768)
[release/7.0.1xx] Update dependencies from dotnet/arcade


 - Upgrade SourceBuild tasks to net7.
2022-10-14 21:45:52 +00:00
Chris Rummel
6b0a8bb0bc
Upgrade SourceBuild tasks to net7. 2022-10-14 15:09:49 -05:00
Marc Paine
2932e0cd7c
Merge branch 'release/6.0.1xx' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-14 10:06:10 -07:00
Matt Mitchell
c058f55a7c
Merge branch 'release/6.0.4xx' into internal-merge-6.0.4xx-2022-10-11-1011 2022-10-13 13:47:08 -07:00
MichaelSimons
5ba97740fe Remove backported source-build patch 2022-10-13 17:19:24 +00:00
Logan Bussell
d41bfecf50
[release/7.0.1xx] Port dotnet-watch smoke test fixes (#14738)
* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Re-enable dotnet-watch test
2022-10-13 08:05:35 -05:00
v-wuzhai
45484e72fb
Merge pull request #14730 from dotnet/darc-main-d3a19352-982f-485d-8dfd-744c97cfdbc7
[main] Update dependencies from dotnet/sdk
2022-10-12 22:56:06 -07:00
William Godbe
f71c1dddf1
Update asp.net templates (#14690)
* Update asp.net templates

* Update GenerateBundledVersions.targets
2022-10-13 00:12:29 +00:00
Marc Paine
216b75ce9c
Merge pull request #14742 from dotnet-maestro-bot/merge/release/6.0.3xx-to-release/6.0.4xx
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx'
2022-10-12 15:30:16 -07:00
Marc Paine
f982f388ce
Merge pull request #14718 from dotnet/nagilson-tempfix-7.0.1xx
[7.0.1xx] Use mktemp to correctly use temp files
2022-10-12 14:33:13 -07:00
dotnet-maestro-bot
0263b7b7da
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#14726)
* [release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)

* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch

* update global.json and Versions.props for .NET SDK 6.0.110 (#14717)

* [release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)

* Re-write dotnet-watch smoke test

* Revert async changes

* Disable source-build tarball validation for non 6.0.1xx legs

Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2022-10-12 16:14:53 -05:00
dotnet-maestro[bot]
9bb8d116b0
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14725)
[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.2 to 7.0.0-rtm.22511.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rtm.22504.29 to 7.0.0-rtm.22512.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 7.0.0-rtm.22506.1 to 7.0.0-rtm.22511.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 7.0.0-rtm.22507.2 to 7.0.0 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 7.0.0-rtm.22506.9 to 7.0.0-rtm.22511.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.0.5-beta.22507.6 to 12.0.5-beta.22510.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.0-beta.22507.6 to 7.0.0-beta.22510.6 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-3.22507.1 to 4.4.0-3.22511.14 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22507.1 to 7.0.0-rtm.22511.4 (parent: Microsoft.NET.Sdk)

 - Remove backported source-build patches

 - Merge branch 'release/7.0.1xx' of https://github.com/dotnet/installer into darc-release/7.0.1xx-629cfea0-7f3f-4b78-b783-1b6dc7af9224
2022-10-12 20:29:30 +00:00
Marc Paine
1b80461e45
Merge pull request #14722 from dotnet-maestro-bot/merge/release/7.0.2xx-to-main
[automated] Merge branch 'release/7.0.2xx' => 'main'
2022-10-12 11:19:50 -07:00
Marc Paine
db39ca2cab
Merge pull request #14727 from dotnet/marcpopMSFT-winformstemplates
Target 8.0 templates and fix errant versioning
2022-10-12 11:18:07 -07:00
Logan Bussell
ad98c2fc18
Remove backported patches 2022-10-12 10:43:58 -07:00
Logan Bussell
02d3359870
Remove backported dotnet-format patch 2022-10-12 10:23:47 -07:00
Logan Bussell
ce3f3ef55f
Remove backported format patch 2022-10-12 10:02:54 -07:00
Přemek Vysoký
e194eed952
Update VMR tooling to latest (#14734) 2022-10-12 16:52:02 +00:00
Přemek Vysoký
e2560aa778
Set up individual repository cloaking to match tarball (#14706) 2022-10-12 15:17:59 +02:00
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -07:00
Jason Zhai
e24a38a1a4 Merge branch 'release/7.0.2xx' 2022-10-12 00:11:08 -07:00
Logan Bussell
7aec869534
[release/6.0.1xx] Re-write dotnet-watch smoke test (#14367)
* Re-write dotnet-watch smoke test

* Revert async changes
2022-10-12 01:57:55 +00:00
Logan Bussell
f3606a0adb
[release/7.0.1xx] .NET Source-Build 7.0.100-rc.2 October 2022 Updates (#14728)
* Update source-build to 7.0 RC2

* Also update tarball global.json

* Don't touch root global.json in case it is managed by automation
2022-10-12 00:46:30 +00:00
NET Source-Build Bot
c12ac467c7
update global.json and Versions.props for .NET SDK 6.0.110 (#14717) 2022-10-11 23:42:38 +00:00
Marc Paine
72f4b79d65 Switch to the 8.0 template package for the msis 2022-10-11 15:06:10 -07:00
MichaelSimons
7452682aae Remove backported roslyn patch 2022-10-11 22:03:23 +00:00
Michael Simons
5633822a17
Update patch backport comments and remove obsolete patch (#14710) 2022-10-11 16:37:36 -05:00
Michael Simons
96efc2a855
[release/6.0.1xx] Enable online and offline source-build tarball build in all PRs (#14711)
* Enable online and offline source-build tarball build in all PRs (#14620)

* Fix source-build CI to not run tarball build when tarball creation fails (#14678)

* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch
2022-10-11 16:35:00 -05:00
Chris Rummel
c516635aef
Don't use the MSBuild server process for init-build.proj. (#14643)
* Don't use the MSBuild server process for init-build.proj.
This appears to fix an issue where our SdkResolver is not loaded because there are still lingering dotnet processes when we try to binplace the resolver DLL.

* Address code review feedback.
2022-10-11 15:08:43 -05:00
Marc Paine
2d21c668bb
Merge pull request #14716 from dotnet-maestro-bot/merge/release/6.0.1xx-to-release/6.0.3xx
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx'
2022-10-11 13:00:09 -07:00
Noah Gilson
12ce4c5732 use mktemp to correctly use temp files 2022-10-11 12:28:02 -07:00
Swapnali911
24b8743347
Adding ppc64le arch for source build (#14617) 2022-10-11 13:57:05 -05:00
Chris Rummel
b389d53439
Add support for using --with-packages with smoke-tests. (#14387) (#14587)
* Add support for using --with-packages with smoke-tests.

* Use a better variable name for custom packages directory.

* Swap conditions so we don't have to delete the archive directory.  Fixes https://github.com/dotnet/source-build/issues/2900.

* Update src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DotNetHelper.cs

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

* Address review feedback.

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

Co-authored-by: Michael Simons <msimons@microsoft.com>
2022-10-11 13:43:26 -05:00
dotnet-maestro[bot]
9e046a5203
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14705)
[release/7.0.1xx] Update dependencies from dotnet/sdk


 - Remove backported command-line-api patch
2022-10-11 18:37:57 +00:00
Chris Rummel
ad6737a1c5
Remove llvm-project from source-build as we have removed this dependency in runtime. (#14697)
* Remove llvm-project from source-build as we have removed this dependency in runtime.

* Add patch for the backport PR to get this to build for now.

* Remove unneeded copy of this patch.
2022-10-11 17:51:12 +00:00
Swapnali911
7536a025fa
Adding ppc64le arch for source build (#14631) 2022-10-11 12:31:15 -05:00
Marc Paine
f1161af25c
Merge pull request #14477 from ayakael/backports/pr-12516-to-release/6.0.1xx
[release/6.0.1xx] GetRuntimeInformation.targets: determine PortableProductMonikerRid based on OSName and Architecture. (backports #12516)
2022-10-11 10:24:07 -07:00
Jason Zhai
f104f65daa Merge branch 'release/7.0.1xx' into release/7.0.2xx 2022-10-10 22:35:15 -07:00
Nikola Milosavljevic
2016f37c65
Merge pull request #14698 from NikolaMilosavljevic/sl.1.latest
Enable source-link in SourceBuild
2022-10-10 13:01:27 -07:00
Michael Simons
18a6bff6a6
Fix source-build CI to not run tarball build when tarball creation fails (#14678)
* Fix source-build CI to not run tarball build when tarball creation failed

* Bad fix

* Revert test patch
2022-10-10 13:46:25 -05:00