From ca74abfe8fa546fd46d099daa07e087bf417ecd7 Mon Sep 17 00:00:00 2001 From: soninaren Date: Wed, 8 May 2024 16:24:41 -0700 Subject: [PATCH 1/3] reverting the multi TFM update --- ...crosoft.NET.Sdk.Functions.Generator.csproj | 2 +- .../Microsoft.NET.Sdk.Functions.csproj | 31 ++----------------- 2 files changed, 4 insertions(+), 29 deletions(-) diff --git a/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj b/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj index db6b0d9..bd76aaf 100644 --- a/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj +++ b/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj @@ -4,7 +4,7 @@ Exe - net6.0;net8.0 + net6.0 true Debug diff --git a/src/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj b/src/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj index 3cddbae..9654f10 100644 --- a/src/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj +++ b/src/Microsoft.NET.Sdk.Functions/Microsoft.NET.Sdk.Functions.csproj @@ -4,7 +4,7 @@ - net6.0;net8.0 + net6.0 Microsoft.NET.Sdk.Functions Microsoft https://github.com/Azure/azure-functions-vs-build-sdk @@ -36,13 +36,8 @@ tools\net6.0\ false - - true - tools\net8.0\ - false - - - + + true tools\net6.0\ @@ -63,26 +58,6 @@ tools\net6.0\ false - - true - tools\net8.0\ - false - - - true - tools\net8.0\ - false - - - true - tools\net8.0\ - false - - - true - tools\net8.0\ - false - From 94b80bf5207824e0bd04208d323324128f0d45b8 Mon Sep 17 00:00:00 2001 From: soninaren Date: Wed, 8 May 2024 16:35:40 -0700 Subject: [PATCH 2/3] reverting target file changes --- .../Targets/Microsoft.NET.Sdk.Functions.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets b/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets index c98f3ee..89d984f 100644 --- a/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets +++ b/src/Microsoft.NET.Sdk.Functions.MSBuild/Targets/Microsoft.NET.Sdk.Functions.targets @@ -12,7 +12,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <_FunctionsTaskFramework>$(TargetFramework) + <_FunctionsTaskFramework>net6.0 <_FunctionsTasksDir Condition=" '$(_FunctionsTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\tools\$(_FunctionsTaskFramework)\ <_FunctionsTaskAssemblyFullPath Condition=" '$(_FunctionsTaskAssemblyFullPath)'=='' ">$(_FunctionsTasksDir)\Microsoft.NET.Sdk.Functions.MSBuild.dll true @@ -87,7 +87,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and - + - \ No newline at end of file + From 0b3bbe6726bfe9e5c6f5ae3e2b0393b1bebf443e Mon Sep 17 00:00:00 2001 From: soninaren Date: Wed, 8 May 2024 17:42:25 -0700 Subject: [PATCH 3/3] Adding roll forward behavior --- .../Microsoft.NET.Sdk.Functions.Generator.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj b/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj index bd76aaf..b1cab8e 100644 --- a/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj +++ b/src/Microsoft.NET.Sdk.Functions.Generator/Microsoft.NET.Sdk.Functions.Generator.csproj @@ -7,6 +7,7 @@ net6.0 true Debug + Major