Commit graph

5228 commits

Author SHA1 Message Date
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
Matt Mitchell
ccb46ae93a
Enable package version props flow for roslyn-analyzers (#15350) 2023-01-25 14:52:15 -08:00
Nikola Milosavljevic
1648da6165 Addressing review comments 2023-01-25 22:29:07 +00:00
Nikola Milosavljevic
a506f64358 Update runtime patch and move it to correct location 2023-01-25 20:24:59 +00:00
Nikola Milosavljevic
8d07426e10 Poison work - reordering and non-shipping packages 2023-01-25 20:06:53 +00:00
Nikola Milosavljevic
1c38575cf1 Add arcade overrides from baseline - 3600aa80a01e90f38a7b86b9d7c1264e091aa5a8 2023-01-25 20:06:53 +00:00
Matt Thalman
03938aec01
Include RID in SB artifact file names (#15320) 2023-01-24 20:15:03 -06:00
Marc Paine
534ad63614
Enable the loc build for installer (#15334) 2023-01-24 16:33:57 -08:00
Matt Mitchell
c9bfab9a6f
Prebuilt report fix (#15329) 2023-01-24 13:57:16 -06:00
Michael Simons
db9d5a33c9
Enable dotnet-watch test and remove prep.sh workaround (#15319) 2023-01-23 13:58:59 -08:00
Marc Paine
3d60ffefdb Merge branch 'marcpopMSFT-enablelocbuild' into marcpopMSFT-enablelocbuildmain 2023-01-20 16:43:32 -08:00
Michael Simons
4ff5179103
Get source-build working in main (#15315) 2023-01-20 10:42:16 -06:00
Přemek Vysoký
876a9f7e59
Do not depend on the Tag'n'Scan stage in the VMR CI (#15316) 2023-01-20 11:09:11 +00:00
Nikola Milosavljevic
2c3a2aeea4
Remove Mono.Cecil dependency from poison infra (#15311) 2023-01-19 21:51:49 -08:00
Marc Paine
5bf5f3bbbc
Suppress noisy RAR messages to see if that cleans up the logs some (#15253) 2023-01-19 14:58:17 -08:00
Nikola Milosavljevic
c251a4de72 Addressing PR comments 2023-01-19 22:27:46 +00:00
Nikola Milosavljevic
1e590773be Remove Mono.Cecil dependency from poison infra 2023-01-19 19:57:35 +00:00
Přemek Vysoký
767cf4398a
Tag the official VMR build with installer SHA (#15308) 2023-01-19 16:35:43 +00:00
Přemek Vysoký
49a3f70c29
Scan the VMR for binaries and cloaked files (#15299) 2023-01-19 15:41:51 +01:00
Přemek Vysoký
f71904833c
Add Codespaces for source build investigations (#15285) 2023-01-19 09:57:51 +01:00
dotnet-maestro[bot]
8db7870976
[main] Update dependencies from dotnet/arcade (#15130)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
Co-authored-by: Matt Mitchell <mmitche@microsoft.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
Co-authored-by: Jacques Eloff <joeloff@users.noreply.github.com>
2023-01-18 11:18:03 +01:00
v-wuzhai
8b8b5d2a65
[automated] Merge branch 'release/7.0.2xx' => 'main' (#15278) 2023-01-18 00:06:44 -08:00
Michael Simons
94a38989db Merge branch 'main' of https://github.com/dotnet/installer into darc-main-b1c66f9b-859b-483e-9778-5c662888fb9a 2023-01-17 18:23:25 +00:00
Matt Mitchell
987040517a
PVP flow support (#15267)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-01-17 09:45:40 -08:00
Jason Zhai
4a0be52e74 Merge branch 'release/7.0.2xx' 2023-01-15 22:49:16 -08:00
Michael Simons
269f3acab7 Remove obsolete source-build format patch 2023-01-13 15:14:29 +00:00
Přemek Vysoký
2e488c8320
Add a script for exporting VMR as a source archive (#15226)
Co-authored-by: Michael Simons <msimons@microsoft.com>
2023-01-13 08:55:44 -06:00
Milena Hristova
e0284b3f3c
Mirror CONTRIBUTING.md from runtime into the VMR root (#15223) 2023-01-13 12:26:30 +01:00
Viktor Hofer
ce6ece1323
Update global.json 2023-01-13 10:48:10 +01:00
Viktor Hofer
e585f75c08
Delete 0001-Unpin-Microsoft.CodeAnalysis.NetAnalyzers-version.patch 2023-01-13 09:54:22 +01:00
Jason Zhai
9250030044 Merge branch 'release/7.0.1xx' into release/7.0.2xx 2023-01-12 22:15:06 -08:00
Drew Scoggins
0f4680522b Fix typo 2023-01-12 16:35:40 -08:00
Drew Scoggins
7ce6060eaa PR feedback 2023-01-12 15:45:00 -08:00
Drew Scoggins
376d01e55a Move NetCore.App package to the last step to avoid clobbering by other packages 2023-01-12 15:11:07 -08:00
Marc Paine
05d4c64b7b
Update Asp.Net templates (#15249) 2023-01-12 13:30:00 -08:00