[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
|
|
|
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
|
|
|
|
|
|
|
|
|
|
This patch can be removed once https://github.com/dotnet/msbuild/pull/7790 flows
|
|
|
|
|
into dotnet/sdk, at which point that repo will need this change.
|
|
|
|
|
---
|
|
|
|
|
.../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>
|