Skip to content

Commit af563de

Browse files
authored
Fix tasks not loading on .NET Framework (#8952)
* Fix tasks not loading on .NET Framework ... due to inconsistent TFMs. See #8864 (comment) for more details * Fix TFMs and set NetFrameworkMinimum to net472 * Build NetCurrent in source-only builds
1 parent 3b63c69 commit af563de

File tree

15 files changed

+21
-14
lines changed

15 files changed

+21
-14
lines changed

Directory.Build.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434

3535
<!-- Enable reproducible build per binskim -->
3636
<Deterministic>true</Deterministic>
37+
38+
<!-- The minimum .NET Framework version supported by templating packages. -->
39+
<NetFrameworkMinimum>net472</NetFrameworkMinimum>
40+
41+
<!-- Only build the latest .NETCoreApp TFM when building source-only. -->
42+
<NetMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetMinimum>
3743
</PropertyGroup>
3844

3945
<ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">

src/Microsoft.TemplateEngine.Abstractions/Microsoft.TemplateEngine.Abstractions.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Contracts for extending Template Engine</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

src/Microsoft.TemplateEngine.Core.Contracts/Microsoft.TemplateEngine.Core.Contracts.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Contracts for extending Microsoft.TemplateEngine.Core</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

src/Microsoft.TemplateEngine.Core/Microsoft.TemplateEngine.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Common operations for instantiating templates using forward-only input stream operations</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

src/Microsoft.TemplateEngine.Edge/Microsoft.TemplateEngine.Edge.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Helper package for adding Template Engine to consuming applications</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

src/Microsoft.TemplateEngine.IDE/Microsoft.TemplateEngine.IDE.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Helper package for adding Template Engine to IDEs</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/Microsoft.TemplateEngine.Orchestrator.RunnableProjects.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>An extension for Template Engine that allows projects that still run to be used as templates</Description>
66
<IsPackable>true</IsPackable>
77
<GenerateDocumentationFile>true</GenerateDocumentationFile>

src/Microsoft.TemplateEngine.Utils/Microsoft.TemplateEngine.Utils.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);netstandard2.0;$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);netstandard2.0;$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Components used by all Template Engine extensions and consumers</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

src/Microsoft.TemplateSearch.Common/Microsoft.TemplateSearch.Common.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(NetCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
55
<Description>Components used by the template discovery tool, and also used for related functionality in the CLI.</Description>
66
<IsPackable>true</IsPackable>
77
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

test/Microsoft.TemplateEngine.TestHelper/Microsoft.TemplateEngine.TestHelper.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<!-- Don't set IsTestUtilityProject=true because this project is referenced by tools and would otherwise be filtered out. -->
44
<PropertyGroup>
5-
<TargetFrameworks>$(NetCurrent);$(NetFrameworkCurrent)</TargetFrameworks>
5+
<TargetFrameworks>$(NetMinimum);$(NetFrameworkMinimum)</TargetFrameworks>
66
<IsPackable>true</IsPackable>
77
<IsShipping>false</IsShipping>
88
<EnablePublicApiAnalyzer>true</EnablePublicApiAnalyzer>

0 commit comments

Comments
 (0)