55168121bb
* 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>
23 lines
1.3 KiB
Diff
23 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Logan Bussell <loganbussell@microsoft.com>
|
|
Date: Tue, 20 Sep 2022 10:10:29 -0700
|
|
Subject: [PATCH] Look for msbuild net7.0 artifacts
|
|
|
|
Backport: https://github.com/dotnet/sdk/pull/28425
|
|
---
|
|
.../Microsoft.DotNet.Cli.Utils.csproj | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
|
index 03ea923734..3246138cf9 100644
|
|
--- a/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
|
+++ b/src/Cli/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj
|
|
@@ -22,7 +22,7 @@
|
|
|
|
<Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp'">
|
|
<PropertyGroup>
|
|
- <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll</MSBuildPathInPackage>
|
|
+ <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>
|
|
</PropertyGroup>
|
|
<Error Condition="!Exists('$(MSBuildPathInPackage)')" Text="Something moved around in Microsoft.Build.Runtime, adjust code here accordingly." />
|
|
<ItemGroup>
|