mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Resolve source-build patch conflicts

Browse source
This commit is contained in:
MichaelSimons 2022-09-21 13:25:35 +00:00
parent 6205df93c2
commit 66fc0e7963
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/SourceBuild/tarball/patches/sdk/0001-Disable-CA1420.patch
View file

@ -13,8 +13,8 @@ index 1353696a29..4e7463a453 100644
--- a/Directory.Build.props --- a/Directory.Build.props
+++ b/Directory.Build.props +++ b/Directory.Build.props
@@ -14,9 +14,11 @@ @@ -14,9 +14,11 @@
<SdkTargetFramework>net7.0</SdkTargetFramework> may target a lower version of .NET -->
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework> <ResolverTargetFramework>net6.0</ResolverTargetFramework>
- <!-- Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed for - <!-- Disable implict package target fallback, and disable warning for when we explicitly add it (currently needed for
- Microsoft.ApplicationInsights) --> - Microsoft.ApplicationInsights) -->

2
src/SourceBuild/tarball/patches/sdk/0002-Change-TargetFramework-to-net7.0.patch
View file

@ -97,7 +97,7 @@ index 03ea923734..3246138cf9 100644
+++ b/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 @@ @@ -22,7 +22,7 @@
<Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$(TargetFramework)' == '$(SdkTargetFramework)'"> <Target Name="VerifyMSBuildDependency" BeforeTargets="ResolveAssemblyReferences" Condition="'$([MSBuild]::GetTargetFrameworkIdentifier($(TargetFramework)))' == '.NETCoreApp'">
<PropertyGroup> <PropertyGroup>
- <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll</MSBuildPathInPackage> - <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net6.0\MSBuild.dll</MSBuildPathInPackage>
+ <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage> + <MSBuildPathInPackage>$(PkgMicrosoft_Build_Runtime)\contentFiles\any\net7.0\MSBuild.dll</MSBuildPathInPackage>