Commit graph

817 commits

Author SHA1 Message Date
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
Matt Mitchell
a06d3130f3
Remove unused legacy PB_ properties (#15265) 2023-01-12 10:50:59 -08:00
Jo Shields
bd4f8683bc
Force /p:PortableBuild=true, for cases where we overrode the RID. (#15163) 2023-01-12 11:02:26 -06:00
Michael Simons
2957a95ee6 Add SB linker patch 2023-01-12 03:09:48 +00:00
Michael Simons
e71036b05e Correct NuGet path 2023-01-11 23:07:18 +00:00
Michael Simons
e9d9647919 Update linker's SB project to include new NuGet.config 2023-01-11 22:51:47 +00:00
Matt Mitchell
c8d103ed3c
Remove source-build ref package workaround (#15252) 2023-01-11 07:25:02 -08:00
Matt Mitchell
2099d0fd30
Remove legacy source replacement (#15234) 2023-01-10 17:07:21 -08:00
William Godbe
6f74c3e646
Update global.json 2023-01-10 16:32:06 -08:00
Matt Mitchell
625f6c6ab4
Remove unused tasks and targets (#15233) 2023-01-10 09:50:50 -08:00
Milena Hristova
d26477031e
Update src/SourceBuild/content/CONTRIBUTING.md
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
2023-01-10 17:32:55 +01:00
Michael Simons
c5ebd18478
Remove tarball verbiage from source-build infrastructure (#15217) 2023-01-10 08:50:31 -06:00
MilenaHristova
084e6f9bcd add a CONTRIBUTING.md that links to runtimes file 2023-01-10 11:43:02 +01:00
Michael Simons
f7a7fed049
Update the src/SourceBuild readme (#15214)
Co-authored-by: Přemek Vysoký <premek.vysoky@microsoft.com>
2023-01-09 15:52:10 +00:00
Michael Simons
1ac8200101
Remove aspnetcore source-build patch (#15213) 2023-01-06 15:25:41 -06:00
Michael Simons
522a23492d
Re-enable all source-build scenario tests (#15203) 2023-01-06 13:03:39 -06:00
dotnet-maestro[bot]
0a97afd970
[release/7.0.2xx] Update dependencies from dotnet/sdk (#15198)
[release/7.0.2xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23054.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-23054-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk)

 - Add nowarns for aspnetcore issues from building w/latest toolset
2023-01-05 16:21:01 +00:00
v-wuzhai
a3f65fa667
[automated] Merge branch 'release/7.0.2xx' => 'main' (#15145) 2023-01-04 21:55:57 -08:00
dotnet-maestro[bot]
c125386cae
[main] Update dependencies from dotnet/sdk (#15151)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 8.0.0-alpha.1.22605.1 to 8.0.0-alpha.1.23053.7 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.22615.1 to 8.0.0-alpha.1.23053.19 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-alpha.1.22602.3 to 8.0.0-alpha.1.22628.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22614.1 to 8.0.0-alpha.1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-alpha.1.22603.1 to 8.0.0-alpha.1.22631.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64)
  - Microsoft.FSharp.Compiler: from 12.5.0-beta.22612.4 to 12.5.0-beta.23053.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.1-beta.22612.4 to 7.0.1-beta.23053.5 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221214-01 to 17.6.0-preview-20230103-01 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22612.2 to 8.0.100-1.23053.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.5.0-2.22613.14 to 4.5.0-3.23053.22 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-22615-01 to 17.5.0-preview-23054-02 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.5.0-preview.3.130 to 6.5.0-preview.3.136 (parent: Microsoft.NET.Sdk)

 - Update ProjectBuildTests.cs

 - Don't crossgen ILLink which is no longer bundled

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Merge remote-tracking branch 'upstream/darc-main-e0248016-a57a-4ad2-aa0c-03ad8d093d6b' into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Add SuppressTfmSupportBuildWarnings=true in source-build

 - Merge branch 'darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8' of https://github.com/dotnet/installer into darc-main-66d586e3-f52b-4957-867f-75cf448ba8b8

 - Update GenerateLayout logic to use DotNetBuildFromSourceFlavor vs DotNetBuildOffline

 - Add CA nowarn workaround

 - --amend
2023-01-04 23:26:05 +00:00
MichaelSimons
2d3bcb80fe re-disable dotnet-watch tests 2023-01-04 22:15:36 +00:00
Přemek Vysoký
db1564e21d
Add Codespaces container definitions for the VMR (#15172)
Resolves https://github.com/dotnet/arcade/issues/11902
2023-01-04 10:22:06 +00:00
MichaelSimons
e15e12056b Updates to account for source-build directory changes 2023-01-03 22:48:19 +00:00
MichaelSimons
35b016aa82 Merge branch 'main' of https://github.com/dotnet/installer into merge/release/7.0.2xx-to-main 2023-01-03 22:46:59 +00:00
Jo Shields
70205ded0c
When overriding RID for non-Linux, use $(Platform) not x64 (#15153) 2023-01-03 16:34:39 -06:00
Přemek Vysoký
688c0c534f
Re-enable VMR build in installer's PRs (#15170) 2022-12-22 12:22:57 +00:00
Jason Zhai
0fb227f5d7 Merge branch 'release/7.0.2xx' 2022-12-22 02:30:36 -08:00
Přemek Vysoký
5aac0db522
Move src/SourceBuild/tarball/* up one folder (#15166) 2022-12-21 21:47:54 +01:00
Jo Shields
8750a90545
Apply RID override behaviour from runtime to aspnetcore/installer (#15143) 2022-12-19 08:43:54 -05:00
Michael Simons
cb62aeefe3
re-enable dotnet-watch tests (#15148) 2022-12-16 17:33:58 -06:00
Michael Simons
47a747f226
Update source-build previous source-built artifacts (#15146) 2022-12-16 16:23:50 -06:00
Michael Simons
54d14d24d9
Remove backported source-build razor patch (#15147) 2022-12-16 14:07:10 -06:00
Michael Simons
a92c61849e
Move top-level packages dir into prereqs (#15140) 2022-12-16 17:52:21 +00:00
Michael Simons
88fc74fe81
Replace razor-compiler with razor (#15105) 2022-12-16 11:27:13 -06:00
dotnet-maestro[bot]
8167dbf055
[main] Update dependencies from dotnet/sdk (#15139)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-12-16 11:03:13 -06:00
dotnet-maestro[bot]
eed7e45af2
[release/7.0.2xx] Update dependencies from dotnet/sdk (#15122)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-12-16 08:49:43 -06:00
Jo Shields
82cb3b7800 Apply RID override behaviour from runtime to aspnetcore/installer 2022-12-16 08:09:23 -05:00
Michael Simons
6b37d32420
Refactor source-build archives infra (#15135) 2022-12-15 16:21:48 -06:00
Michael Simons
c7081c2b5a
Move git-info dir into prereqs (#15134)
* Move git-info dir into prereqs

* Bump DarcLib

* Add back import condition for non-repo projects

Co-authored-by: Premek Vysoky <premek.vysoky@microsoft.com>
2022-12-15 18:38:34 +00:00
Přemek Vysoký
ce1921c17d
Run VMR's pipelines from the VMR directly (#15124) 2022-12-15 09:33:09 +01:00
Michael Simons
a3093b4d35
Cleanup top level source-build directories (#15126)
* Rename repos dir to repo-projects

* Move keys dir into prereqs

* Refactor Tools and tools-local dirs

* Refactor ArcadeOverrides dir

* Update .gitignore
2022-12-14 10:59:05 -06:00
dotnet-maestro[bot]
e9e0a769c7
[main] Update dependencies from dotnet/sdk (#15118)
[main] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 8.0.0-alpha.1.22608.6 to 8.0.0-alpha.1.22612.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-alpha.1.22607.2 to 8.0.0-alpha.1.22609.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.Test.Sdk: from 17.5.0-preview-20221209-01 to 17.5.0-preview-20221209-03 (parent: Microsoft.NET.Sdk)
  - Microsoft.NET.ILLink.Tasks: from 8.0.100-1.22609.1 to 8.0.100-1.22612.1 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.5.0-preview-22608-02 to 17.5.0-preview-22612-01 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.5.0-preview.2.108 to 6.5.0-preview.3.126 (parent: Microsoft.NET.Sdk)

 - Merge branch 'main' of https://github.com/dotnet/installer into darc-main-f64e2f71-8a38-4252-ad60-74b7e6f08ef1

 - Resolve source-build patch conflicts

 - --amend

 - --amend
2022-12-13 18:00:50 +00:00