Commit graph

26538 commits

Author SHA1 Message Date
dotnet-bot
46766171dc Merge in 'release/6.0.3xx' changes 2022-10-12 23:54:53 +00:00
William Godbe
ab2fa01742
Update asp.net templates (#14688) 2022-10-12 23:48:00 +00:00
William Godbe
0de6184891
Update asp.net templates (#14687) 2022-10-12 23:43:50 +00:00
dotnet-bot
81f3e48d0c Merge in 'release/6.0.4xx' changes 2022-10-12 22:41:36 +00:00
Marc Paine
185c87b36c
Merge branch 'release/7.0.1xx' into merge/release/6.0.4xx-to-release/7.0.1xx 2022-10-12 15:32:32 -07: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
dotnet-bot
7895b716e0 Merge in 'release/7.0.1xx' changes 2022-10-12 21:44:16 +00: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-bot
24f86f2a44 Merge in 'release/6.0.3xx' changes 2022-10-12 21:25:39 +00: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-bot
db70a78dbb Merge in 'release/7.0.1xx' changes 2022-10-12 20:40:32 +00: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
dotnet-bot
32d6676c51 Merge in 'release/6.0.4xx' changes 2022-10-12 18:32:54 +00:00
Marc Paine
bc84fe8d35
Merge pull request #14721 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 11:19:28 -07:00
dotnet-bot
64e7d437f7 Merge in 'release/7.0.1xx' changes 2022-10-12 15:21:27 +00:00
Marc Paine
93dd7d6622
Stable branding (#14729) 2022-10-12 08:11:05 -07:00
Jason Zhai
0d31263c5b Merge branch 'release/6.0.3xx' into release/6.0.4xx 2022-10-12 00:13:19 -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
dotnet-bot
8a5b3afe6f Merge in 'release/7.0.1xx' changes 2022-10-12 00:57:50 +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
dotnet-bot
e51decb34a Merge in 'release/7.0.1xx' changes 2022-10-11 21:49:50 +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
dotnet-bot
8774471627 Merge in 'release/7.0.1xx' changes 2022-10-11 20:20:30 +00:00
dotnet-bot
6be4d652fd Merge in 'release/6.0.3xx' changes 2022-10-11 20:11:58 +00: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
dotnet-bot
661749c467 Merge in 'release/7.0.1xx' changes 2022-10-11 18:49:19 +00: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
dotnet-bot
536502a46c Merge in 'release/7.0.1xx' changes 2022-10-11 18:11:52 +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
dotnet-bot
bde372f45f Merge in 'release/7.0.1xx' changes 2022-10-11 17:45:26 +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
Sean Reeser
6d435f4d80 Merge commit '68624187969147694f78da1cc12444330b06fb1d' into internal-merge-6.0.4xx-2022-10-11-1011 2022-10-11 10:11:00 -07:00
Sean Reeser
7c180f0813 Merge commit 'de9a4b2f4b9f62cdf5b4a94cb66f9125e37b2a5c' into internal-merge-6.0.3xx-2022-10-11-1010 2022-10-11 10:10:52 -07:00
Sean Reeser
b263fe6a97 Merge commit 'ce0a42998a3d2a725f5bd08413b140d907f48177' into internal-merge-6.0.1xx-2022-10-11-1010 2022-10-11 10:10:43 -07:00
DotNet-Bot
534d512b43 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.34
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.306-servicing.22510.34
2022-10-11 06:15:30 +00:00
dotnet-bot
8cbd527db7 Merge in 'release/7.0.1xx' changes 2022-10-11 02:53:15 +00:00
v-wuzhai
574e6f90fc
Merge pull request #14701 from dotnet/darc-release/7.0.1xx-65fc3186-e01f-4c64-b4fe-a09ca1a9296d
[release/7.0.1xx] Update dependencies from dotnet/sdk
2022-10-10 19:42:18 -07:00
DotNet-Bot
0fa6d987c6 Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20221010.22
Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk
 From Version 6.0.305-servicing.22476.47 -> To Version 6.0.305-servicing.22510.22
2022-10-11 01:07:10 +00:00
dotnet-maestro[bot]
ffedce380b Update dependencies from https://github.com/dotnet/sdk build 20221010.16
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.16

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk
2022-10-10 23:29:44 +00:00
dotnet-maestro[bot]
5449eb59d3 Update dependencies from https://github.com/dotnet/sdk build 20221010.10
Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22507.25 -> To Version 7.0.100-rtm.22510.10

Dependency coherency updates

Microsoft.Net.Compilers.Toolset
 From Version 4.4.0-3.22505.18 -> To Version 4.4.0-3.22507.1 (parent: Microsoft.NET.Sdk
2022-10-10 21:01:47 +00:00
dotnet-bot
846770d1d9 Merge in 'release/7.0.1xx' changes 2022-10-10 20:13:15 +00: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
dotnet-bot
57c054d43e Merge in 'release/7.0.1xx' changes 2022-10-10 18:57:39 +00: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