Commit graph

5883 commits

Author SHA1 Message Date
dotnet-maestro-bot
8b9ae41652
[automated] Merge branch 'release/6.0.3xx' => 'release/6.0.4xx' (#15473)
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Daniel Plaisted <daplaist@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-02-08 14:21:49 -08:00
Chris Rummel
99911716db
Remove source-build manipulation of stable version. (#15467) 2023-02-08 17:13:17 +00:00
Michael Simons
188271d179
Update prebuilts tarball (#15479) 2023-02-08 15:52:27 +00:00
MilenaHristova
608d979a03 move files 2023-02-08 13:23:13 +01:00
Jason Zhai
13dae8f6ee Merge branch 'release/7.0.2xx' into release/7.0.3xx 2023-02-08 00:38:38 -08:00
dotnet-maestro-bot
f0a9fa30d3
[automated] Merge branch 'release/6.0.1xx' => 'release/6.0.3xx' (#15458)
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-07 23:53:26 +00:00
dotnet-maestro-bot
f1da127703
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#15322)
Co-authored-by: Michael Simons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
2023-02-07 15:16:13 -08:00
dotnet-maestro-bot
535d6f657c
[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' (#15279)
Co-authored-by: dotnet-bot <dotnet-bot@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: DotNet-Bot <dn-bot@microsoft.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Sean Reeser <v-seanreeser@microsoft.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: William Godbe <wigodbe@microsoft.com>
Co-authored-by: Jason Zhai <v-wuzhai@microsoft.com>
Co-authored-by: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com>
Co-authored-by: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com>
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
2023-02-07 15:15:41 -08:00
Michael Simons
67154bad64
Remove backported arcade overrides (#15453) 2023-02-07 21:39:53 +00:00
Matt Thalman
4e601e7fc6
Clean up unused MSBuild tasks in SB (#15450) 2023-02-07 13:42:50 -06:00
Chris Rummel
65e657b063 Enable bootstrap in tarball build.
We now expect all builds using the Microsoft-built SDK to also use bootstrap.  Mixed RIDness between the bootstrap SDK and previously-source-built packages is not supported.
2023-02-07 13:18:11 -06:00
Chris Rummel
5533b337bb Disable secure supply chain check.
These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved.
2023-02-07 13:18:11 -06:00
dotnet-maestro[bot]
63fbbf3711
[main] Update dependencies from dotnet/sdk (#15389)
Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-07 11:12:22 -06:00
Michael Simons
593bfe8532
Update source-build artifacts to be coherent (#15372)
Co-authored-by: Matt Thalman <mthalman@microsoft.com>
2023-02-07 17:07:22 +00:00
Matt Thalman
918b40ce86
Remove obsolete security-partners-dotnet pipeline (#15447) 2023-02-07 11:03:18 -06:00
Matt Mitchell
b12473af7b
Update checksum generation order (#15397)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-07 09:01:26 -08:00
Matt Mitchell
2df59d748a
Fix annotated prebuilt report again (#15436)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-02-07 08:03:21 -08:00
Matt Thalman
b4ccbf404f
Remove PreviouslySourceBuiltPackageVersions cleanup workaround (#15434) 2023-02-06 15:28:34 +00:00
dotnet bot
8537219bc2
Localized file check-in by OneLocBuild Task: Build definition ID 1224: Build ID 2104089 (#15354)
Co-authored-by: Marc Paine <marcpop@microsoft.com>
2023-02-03 22:47:26 +00:00
Chris Rummel
51ba61a4f9
Replace RID-specific versions with App.Ref versions.
These are expected to be the same version number and cause fewer problems for people who are building on RIDs that do not match our PSB RID.
2023-02-03 16:06:52 -06:00
dotnet-maestro[bot]
6390db54bd
[release/7.0.3xx] Update dependencies from dotnet/sdk (#15402)
[release/7.0.3xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230201-01 to 17.6.0-preview-20230202-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.6.0-1.23081.20 to 4.6.0-1.23101.17 (parent: Microsoft.NET.Sdk)

 - Remove backported source-build razor patch
2023-02-03 20:52:48 +00:00
Chris Rummel
0f737ee974
We do need these but they should be set to the version of the runtime we got, not the one we feed in. 2023-02-03 08:50:44 -06:00
Chris Rummel
64974afa67
Remove source-build manipulation of stable version. 2023-02-03 07:09:26 -06:00
Chris Rummel
41a85aa01d
Disable secure supply chain check.
These issues are checked for in the individual repos - by the time source-build is building the tarball they have already been processed and approved.
2023-02-02 13:06:10 -06:00
Matt Thalman
a6f0171cbc
Include .version file in SB artifacts tarball (#15353) 2023-02-02 11:14:58 -06:00
Jo Shields
55e6e581c5 Fix emsdk build when RID is autodetected as linux-x64
It seems I made a copy-paste error in this earlier, so it only worked on Mac/Windows, specific detected Linux systems with non-portable RIDs, or any case where the RID is explicitly overridden from the default.
2023-02-01 16:14:31 -05:00
Jo Shields
173d7b5a34
Merge branch 'main' into add-emsdk-manifest-to-sb 2023-02-01 08:25:03 -05:00
Matt Thalman
31a14bea38
Bootstrap by default in prep script (#15378) 2023-02-01 07:24:03 -06:00
Larry Ewing
10adb57ebf
Merge branch 'main' into add-emsdk-manifest-to-sb 2023-01-31 22:21:05 -06:00
Larry Ewing
e92432d688 Bump emsdk to preview1
Update workload featureband logic
2023-01-31 19:09:42 -06:00
Michael Simons
2176e66fae
Pull in razor fix to address prebuilts (#15369) 2023-01-31 17:14:17 -06:00
Jo Shields
23fd3c04ac Steal changes from https://github.com/dotnet/installer/pull/15381 to try and fix 2023-01-31 15:37:04 -05:00
Larry Ewing
711b595a27 Work around the feature band breakage for now 2023-01-31 14:02:50 -06:00
Jo Shields
aee7ed43b0 Add an installer dep on emsdk 2023-01-31 12:33:55 -05:00
Premek Vysoky
aa94dc4102 Merge remote-tracking branch 'origin/main' into add-emsdk-manifest-to-sb
Conflicts:
	eng/Version.Details.xml
2023-01-31 12:47:18 +01:00
Larry Ewing
6caeedd097
[main] Fix MonoToolchain.Current naming and Update dependencies from dotnet/emsdk and dotnet/sdk (#15366)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Marc Paine <marcpop@microsoft.com>
Co-authored-by: Noah Gilson <noahgilson@microsoft.com>
2023-01-31 02:53:16 +00:00
Drew Scoggins
59530fd164
Add selective unzipping to avoid ASP.NET clobbering NetCore.App (#15272) 2023-01-30 14:54:38 -08:00
Jo Shields
1f624c19a0 Add emsdk Manifest-only build to VMR
We want to be sure that VMR builds include our baseline manifests - for WASM support, that means brining in the emsdk repo and building the manifest nupkgs from there (but not the "full" build, which right now isn't truly from source anyway)
2023-01-30 16:21:59 -05:00
Drew Scoggins
c48f6b9ef7 Addres pr feedback 2023-01-30 11:29:00 -08:00
Drew Scoggins
27521220b6 Address feedback 2023-01-30 11:04:13 -08:00
Drew Scoggins
5c969ccd3f Move NetCore.App item back to previous location 2023-01-30 10:55:02 -08:00
Djuradj Kurepa
64d4a1a74b
Add a baseline for VMR binary scan (#15359)
Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-01-30 18:19:05 +00:00
Sven Boemer
eee3d28220
Update illink versions (#15364) 2023-01-30 09:18:53 -08:00
Larry Ewing
0c1e55de6e Restore manifest order 2023-01-27 16:43:39 -06:00
Michael Simons
21e8b2515a
Remove unused ExtraPackageVersionPropsPackageInfo (#15362) 2023-01-27 21:45:17 +00:00
Michael Simons
9dbedcde23
Update source-build artifacts (#15324) 2023-01-27 13:35:35 -06:00
dotnet-maestro[bot]
05a1cd2fc7
[main] Update dependencies from dotnet/sdk (#15346)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.23074.4 to 8.0.0-alpha.1.23076.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.23075.1 to 8.0.0-alpha.1.23076.8 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.23067.2 to 8.0.0-alpha.1.23075.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.23074.1 to 8.0.0-alpha.1.23076.3 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.23068.4 to 8.0.0-alpha.1.23076.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230123-01 to 17.6.0-preview-20230126-02 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-3.23070.7 to 4.5.0-3.23075.2 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.6.0-preview-23074-01 to 17.6.0-preview-23076-08 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.5.0-preview.3.136 to 6.5.0-rc.149 (parent: Microsoft.NET.Sdk)

 - Fix MSI manifest resolution

 - Clean up old code

 - Condition manifest MSI nupkgs for Windows

 - Move MSI calculation into targets

 - Remove razor patch.

 - Update dependencies from https://github.com/dotnet/emsdk build 202301… (#15361)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
2023-01-27 19:33:45 +00:00
Michael Simons
98c4930255
Pull in command-line-api fix to eliminate source-build prebuilts (#15360) 2023-01-27 16:12:09 +00:00
Drew Scoggins
c1a4771218 Change approach to only extract files that match criteria 2023-01-26 16:04:14 -08:00
Nikola Milosavljevic
b389ab61bd
Poison work - reordering and exclusion of non-shipping packages (#15347) 2023-01-25 22:19:45 -08:00