Remove emsdk patch that has made it here

This commit is contained in:
Larry Ewing 2023-04-28 13:24:42 -05:00 committed by GitHub
parent dbb9050bf0
commit 5c4b3fea0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,39 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Nikola Milosavljevic <nikolam@microsoft.com>
Date: Mon, 24 Apr 2023 14:00:42 +0000
Subject: [PATCH] Move NoTargetFrameworkFiltering property
Backport: https://github.com/dotnet/source-build/issues/3417
---
Directory.Build.props | 5 +++++
eng/SourceBuild.props | 1 -
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/Directory.Build.props b/Directory.Build.props
index 69862d8..defa3f0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,6 +2,11 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
+ <PropertyGroup>
+ <!-- Emsdk doesn't support Arcade-driven target framework filtering. -->
+ <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
+ </PropertyGroup>
+
<PropertyGroup Condition="'$(StabilizePackageVersion)' == 'true'">
<StableVersion>$(VersionPrefix)</StableVersion>
</PropertyGroup>
diff --git a/eng/SourceBuild.props b/eng/SourceBuild.props
index 63164b2..c4009f3 100644
--- a/eng/SourceBuild.props
+++ b/eng/SourceBuild.props
@@ -3,7 +3,6 @@
<PropertyGroup>
<GitHubRepositoryName>emsdk</GitHubRepositoryName>
<SourceBuildManagedOnly>true</SourceBuildManagedOnly>
- <NoTargetFrameworkFiltering>true</NoTargetFrameworkFiltering>
</PropertyGroup>
</Project>