Commit graph

5883 commits

Author SHA1 Message Date
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
Michael Simons
dc021278a8
Remove questionable license cleanup logic (#14681) 2022-10-10 11:20:50 -05:00
Nikola Milosavljevic
837b3a1361 Remove redundant arguments - these properties are set by repos based on value of DisableSourceLink property 2022-10-10 15:39:33 +00:00
Nikola Milosavljevic
24a0212753 Condition sourcelink generation 2022-10-10 15:39:33 +00:00
MichaelSimons
d0cd36443f Remove backported source-build patch 2022-10-10 14:15:02 +00:00
Marc Paine
8a75a2626f
Merge pull request #14691 from dotnet-maestro-bot/merge/release/7.0.1xx-to-release/7.0.2xx
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'
2022-10-07 13:35:19 -07:00
Marc Paine
0ae47cef61 Merge remote-tracking branch 'origin/main' into merge/release/7.0.2xx-to-main 2022-10-07 09:55:28 -07:00
dotnet-maestro[bot]
e6580e2e0e
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14670)
* Update dependencies from https://github.com/dotnet/sdk build 20221005.9

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22505.9

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22504.4 (parent: Microsoft.NET.Sdk

* Remove backported runtime source-build patch

* Update dependencies from https://github.com/dotnet/sdk build 20221006.12

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.12

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20221006.16

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.16

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20221006.18

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.18

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk

* Update dependencies from https://github.com/dotnet/sdk build 20221006.21

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22504.34 -> To Version 7.0.100-rtm.22506.21

Dependency coherency updates

Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.Net.Compilers.Toolset,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22480.10 -> To Version 7.0.0-rtm.22505.15 (parent: Microsoft.NET.Sdk

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
2022-10-07 08:08:00 -05:00
Marc Paine
7d4240d5de
Merge pull request #14669 from dotnet-maestro-bot/merge/release/7.0.1xx-to-release/7.0.2xx
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx'
2022-10-06 14:28:55 -07:00
Marc Paine
80ff259cd5
Merge pull request #14652 from dotnet-maestro-bot/merge/release/7.0.1xx-to-main
[automated] Merge branch 'release/7.0.1xx' => 'main'
2022-10-05 14:16:49 -07:00
dotnet-maestro[bot]
3624d8be32
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14632)
[release/7.0.1xx] Update dependencies from dotnet/sdk
- Coherency Updates:
  - Microsoft.NETCore.App.Runtime.win-x64: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Ref: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.TargetingPack.x64.7.0: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.App.Host.win-x64: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.DotNetHostResolver: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.NETCore.Platforms: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Ref.Internal: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.AspNetCore.App.Runtime.win-x64: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - dotnet-dev-certs: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-jwts: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - dotnet-user-secrets: from 7.0.0-rtm.22479.3 to 7.0.0-rtm.22503.15 (parent: Microsoft.NET.Sdk)
  - Microsoft.Net.Compilers.Toolset: from 4.4.0-3.22478.13 to 4.4.0-3.22480.9 (parent: Microsoft.NET.Sdk)
  - Microsoft.Build: from 17.4.0-preview-22479-03 to 17.4.0-preview-22480-04 (parent: Microsoft.NET.Sdk)
  - NuGet.Build.Tasks: from 6.4.0-preview.3.100 to 6.4.0-preview.3.107 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)
  - VS.Redist.Common.NetCore.SharedFramework.x64.7.0: from 7.0.0-rtm.22478.9 to 7.0.0-rtm.22480.10 (parent: Microsoft.NET.Sdk)

 - Remove backported msbuild patch

 - Add runtime PR 76471 as patch

 - Clean up overlapping patches in runtime
2022-10-05 20:27:29 +00:00
MichaelSimons
7f2e601b1f Update source-build logic for PR validation 2022-10-05 15:00:05 +00:00
Michelle McDaniel
d552037815
Use latest docker containers (#14645)
* Use latest docker containers

This change moves all of the docker images to the latest tag as part of https://github.com/dotnet/arcade/issues/10377.

* Change source build tarball leg to fedora-36 container
2022-10-04 15:07:04 -07:00
Marc Paine
c8a33190e6
Merge branch 'main' into merge/release/7.0.1xx-to-main 2022-10-04 14:02:24 -07:00
Tom Deseyn
faa8ecb8a6 BundledVersions: update portable rid logic.
Defaults the portable rid to match the rid.
This works for portable builds.

For non-portable builds, the portable rid can be
controlled using PortableOSName.

For source-build, we set PortableOSName based
on the bootstrap SDK's portable rid.
2022-10-04 09:38:23 +02:00
Marc Paine
92b0352978 7.0.2xx Branding and downgrade the bundled version target to the October release version. 2022-10-03 14:15:13 -07:00
Michael Simons
1ef043bd97
Enable online and offline source-build tarball build in all PRs (#14620) 2022-09-30 15:20:56 -05:00
Michael Simons
7f881d991e
Merge pull request #14622 from MichaelSimons/cleanup-sdk-patch
Remove unnecessary sdk patch
2022-09-30 15:20:25 -05:00
Michael Simons
7b7a5b929f
Merge pull request #14581 from NikolaMilosavljevic/roslyn.new
Remove roslyn Microsoft.CodeAnalysis.Common patch
2022-09-30 14:55:07 -05:00
Marc Paine
9124f826e9
Merge pull request #14597 from dotnet/marcpopMSFT-implicitversionforGA
Update the 3.1 and 6.0 implicit versions for GA
2022-09-30 10:41:27 -07:00
Nikola Milosavljevic
04c49844d3 Do not set property already set by Roslyn 2022-09-30 16:23:36 +00:00
MichaelSimons
cc5946844d Resolve patch conflict 2022-09-30 13:38:07 +00:00
Jason Zhai
398aecba2a Merge branch 'release/7.0.1xx' 2022-09-29 19:04:48 -07:00
MichaelSimons
a47b8bec11 Add patch to address build issue in msbuild 2022-09-29 19:10:40 +00:00
MichaelSimons
301660c512 Remove unnecessary sdk patch 2022-09-29 18:59:32 +00:00
Matt Mitchell
99ef257051
Merge pull request #14614 from dotnet-maestro-bot/merge/release/7.0.1xx-to-main
[automated] Merge branch 'release/7.0.1xx' => 'main'
2022-09-29 09:02:00 -07:00
Logan Bussell
a5705a7422 Update compiler version in runtime 2022-09-29 15:33:03 +00:00
MichaelSimons
7db152d556 Remove backported source-build patches 2022-09-29 14:19:35 +00:00
Marc Paine
fcdc2702c6
Merge pull request #14600 from dotnet/darc-main-967c0bb8-0167-4974-933a-bdb6ebae97db
[main] Update dependencies from dotnet/sdk
2022-09-28 21:54:00 -07:00
Jason Zhai
15bbb4c088 Merge branch 'release/7.0.1xx' 2022-09-28 19:50:17 -07:00