|
| 1 | +From 365b26b09317a0ffa1438c7a6ffc0a436c07b9fd Mon Sep 17 00:00:00 2001 |
| 2 | +From: Nikola Milosavljevic < [email protected]> |
| 3 | +Date: Fri, 13 Sep 2019 16:56:21 +0000 |
| 4 | +Subject: [PATCH 2/2] Do not build NET Fx binaries in source build |
| 5 | + |
| 6 | +--- |
| 7 | + eng/Versions.props | 2 +- |
| 8 | + src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj | 5 +++-- |
| 9 | + 2 files changed, 4 insertions(+), 3 deletions(-) |
| 10 | + |
| 11 | +diff --git a/eng/Versions.props b/eng/Versions.props |
| 12 | +index 9117eba..b9883d5 100644 |
| 13 | +--- a/eng/Versions.props |
| 14 | ++++ b/eng/Versions.props |
| 15 | +@@ -3,7 +3,7 @@ |
| 16 | + <!-- Opt out of certain Arcade features --> |
| 17 | + <PropertyGroup> |
| 18 | + <UsingToolXliff>false</UsingToolXliff> |
| 19 | +- <UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies> |
| 20 | ++ <UsingToolNetFrameworkReferenceAssemblies Condition="'$(DotNetBuildFromSource)' != 'true'">true</UsingToolNetFrameworkReferenceAssemblies> |
| 21 | + </PropertyGroup> |
| 22 | + <PropertyGroup> |
| 23 | + <VersionPrefix>3.0.1</VersionPrefix> |
| 24 | +diff --git a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj |
| 25 | +index cf5e7a3..72103a0 100644 |
| 26 | +--- a/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj |
| 27 | ++++ b/src/Microsoft.Web.XmlTransform/Microsoft.Web.XmlTransform.csproj |
| 28 | +@@ -3,7 +3,8 @@ |
| 29 | + <Import Project="$(RepositoryEngineeringDir)\Package.props" /> |
| 30 | + |
| 31 | + <PropertyGroup> |
| 32 | +- <TargetFrameworks>netstandard2.0;net40</TargetFrameworks> |
| 33 | ++ <TargetFrameworks>netstandard2.0</TargetFrameworks> |
| 34 | ++ <TargetFrameworks Condition="'$(DotNetBuildFromSource)' != 'true'">$(TargetFrameworks);net40</TargetFrameworks> |
| 35 | + <PlatformTarget>AnyCPU</PlatformTarget> |
| 36 | + <IsPackable>true</IsPackable> |
| 37 | + <IsShipping>false</IsShipping> |
| 38 | +@@ -24,4 +25,4 @@ |
| 39 | + </EmbeddedResource> |
| 40 | + </ItemGroup> |
| 41 | + |
| 42 | +-</Project> |
| 43 | +\ No newline at end of file |
| 44 | ++</Project> |
| 45 | +-- |
| 46 | +1.8.3.1 |
| 47 | + |
0 commit comments