Commit graph

2 commits

Author SHA1 Message Date
dotnet-maestro-bot
55168121bb
[automated] Merge branch 'release/7.0.1xx' => 'release/7.0.2xx' (#14723)
* Adding ppc64le arch for source build (#14631)

* 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.

* [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

* 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.

* Update patch backport comments and remove obsolete patch (#14710)

* [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

* Add back source-build patch that is still required in this branch

Co-authored-by: Swapnali911 <Swapnali.Pawar1@ibm.com>
Co-authored-by: Chris Rummel <crummel@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
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>
2022-11-14 09:52:14 -06:00
dotnet-maestro[bot]
d9ad491ad0
[release/7.0.1xx] Update dependencies from dotnet/sdk (#14538)
* Update dependencies from https://github.com/dotnet/sdk build 20220916.5

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

Dependency coherency updates

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
 From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk

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

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

Dependency coherency updates

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.Build
 From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk

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

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

Dependency coherency updates

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.Build
 From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk

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

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

Dependency coherency updates

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.Build
 From Version 7.0.0-rc.2.22465.19 -> To Version 7.0.0-rc.2.22465.27 (parent: Microsoft.NET.Sdk

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

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

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.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22465.3 -> To Version 7.0.0-rtm.22466.6 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflict

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

Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli
 From Version 7.0.100-rtm.22465.64 -> To Version 7.0.100-rtm.22469.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,Microsoft.Build,NuGet.Build.Tasks,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0
 From Version 7.0.0-rtm.22465.3 -> To Version 7.0.0-rtm.22466.6 (parent: Microsoft.NET.Sdk

* Resolve source-build patch conflicts

* Look for msbuild net7.0 artifacts instead of net6.0

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: MichaelSimons <msimons@microsoft.com>
Co-authored-by: Logan Bussell <loganbussell@microsoft.com>
2022-09-20 16:35:43 -05:00