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

Remove source-build patch that was backported

Browse source
This commit is contained in:
Michael Simons 2023-06-07 15:11:08 +00:00
parent 47db2c6e7d
commit a88e51da75
1 changed files with 0 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/SourceBuild/patches/razor/0001-During-source-build-target-net8.0-only.patch
View file

@ -1,39 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Michael Simons <msimons@microsoft.com>
Date: Tue, 30 May 2023 21:33:38 +0000
Subject: [PATCH] During source build, target net8.0 only
Backport: https://github.com/dotnet/razor/pull/8779
---
eng/SourceBuildPrebuiltBaseline.xml | 6 ------
eng/Versions.props | 1 +
2 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml
index 90c84d161..347c42641 100644
--- a/eng/SourceBuildPrebuiltBaseline.xml
+++ b/eng/SourceBuildPrebuiltBaseline.xml
@@ -1,11 +1,5 @@
<UsageData>
<IgnorePatterns>
<UsagePattern IdentityGlob="Microsoft.SourceBuild.Intermediate.*/*" />
-
- <!-- Ignoring the following prebuilts. net7.0 targeting is still needed
- due to https://github.com/dotnet/razor/issues/8293#issuecomment-1454042002
- net7.0 targeting removal is tracked in https://github.com/dotnet/razor/issues/8531 -->
- <UsagePattern IdentityGlob="Microsoft.AspNetCore.App.Ref/7.0.2" />
- <UsagePattern IdentityGlob="Microsoft.NETCore.App.Ref/7.0.2" />
</IgnorePatterns>
</UsageData>
diff --git a/eng/Versions.props b/eng/Versions.props
index 9d8d748ec..96d62879c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -27,6 +27,7 @@
<DefaultNetFxTargetFramework>net472</DefaultNetFxTargetFramework>
<DefaultNetCoreTargetFramework>net8.0</DefaultNetCoreTargetFramework>
<DefaultNetCoreTargetFrameworks>$(DefaultNetCoreTargetFramework);net7.0</DefaultNetCoreTargetFrameworks>
+ <DefaultNetCoreTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(DefaultNetCoreTargetFramework)</DefaultNetCoreTargetFrameworks>
<DefaultNetCoreWindowsTargetFrameworks>net8.0-windows;net7.0-windows</DefaultNetCoreWindowsTargetFrameworks>
</PropertyGroup>
<!--