Include user specified MSBuild parameters when evaluating MSBuild properties (#352)

normj · web-flow · commit 5c1e25806cdd · 2024-12-16T09:29:17.000-08:00
diff --git a/.autover/changes/79b678d7-6533-4e17-ae69-100730e43027.json b/.autover/changes/79b678d7-6533-4e17-ae69-100730e43027.json
@@ -0,0 +1,11 @@
+{
+  "Projects": [
+    {
+      "Name": "Amazon.Lambda.Tools",
+      "Type": "Patch",
+      "ChangelogMessages": [
+        "Include user specified MSBuild parameters when evaluating MSBuild properties"
+      ]
+    }
+  ]
+}
diff --git a/src/Amazon.Common.DotNetCli.Tools/Utilities.cs b/src/Amazon.Common.DotNetCli.Tools/Utilities.cs
@@ -211,9 +211,10 @@ public static string DeterminePublishLocation(string workingDirectory, string pr
         /// Looks up specified properties from a project.
         /// </summary>
         /// <param name="projectLocation">The location of the project file.</param>
+        /// <param name="msBuildParameters">Additional MSBuild parameters passed by the user from the commandline</param>
         /// <param name="propertyNames">The names of the properties to look up.</param>
         /// <returns>A dictionary of property names and their values.</returns>        
-        public static Dictionary<string, string> LookupProjectProperties(string projectLocation, params string[] propertyNames)
+        public static Dictionary<string, string> LookupProjectProperties(string projectLocation, string msBuildParameters, params string[] propertyNames)
         {
             var projectFile = FindProjectFileInDirectory(projectLocation);
             var properties = new Dictionary<string, string>();
@@ -225,6 +226,11 @@ public static Dictionary<string, string> LookupProjectProperties(string projectL
                 $"--getProperty:{string.Join(',', propertyNames)}"
             };
 
+            if (!string.IsNullOrEmpty(msBuildParameters))
+            {
+                arguments.Add(msBuildParameters);
+            }
+
             var process = new Process
             {
                 StartInfo = new ProcessStartInfo
@@ -302,16 +308,17 @@ private static Dictionary<string, string> LookupProjectPropertiesFromXml(string
             {
             }
             return properties;
-        }                                   
+        }
 
         /// <summary>
         /// Looks up the target framework from a project file.
         /// </summary>
         /// <param name="projectLocation">The location of the project file.</param>
+        /// <param name="msBuildParameters">Additonal MSBuild paramteres passed by the user from the commandline</param>
         /// <returns>The target framework of the project.</returns>
-        public static string LookupTargetFrameworkFromProjectFile(string projectLocation)
+        public static string LookupTargetFrameworkFromProjectFile(string projectLocation, string msBuildParameters)
         {
-            var properties = LookupProjectProperties(projectLocation, "TargetFramework", "TargetFrameworks");
+            var properties = LookupProjectProperties(projectLocation, msBuildParameters, "TargetFramework", "TargetFrameworks");
             if (properties.TryGetValue("TargetFramework", out var targetFramework) && !string.IsNullOrEmpty(targetFramework))
             {
                 return targetFramework;
@@ -331,10 +338,11 @@ public static string LookupTargetFrameworkFromProjectFile(string projectLocation
         /// Retrieve the `OutputType` property of a given project
         /// </summary>
         /// <param name="projectLocation">Path of the project</param>
+        /// <param name="msBuildParameters">Additonal MSBuild paramteres passed by the user from the commandline</param>
         /// <returns>The value of the `OutputType` property</returns>
-        public static string LookupOutputTypeFromProjectFile(string projectLocation)
+        public static string LookupOutputTypeFromProjectFile(string projectLocation, string msBuildParameters)
         {
-            var properties = LookupProjectProperties(projectLocation, "OutputType");
+            var properties = LookupProjectProperties(projectLocation, msBuildParameters, "OutputType");
             return properties.TryGetValue("OutputType", out var outputType) ? outputType.Trim() : null;
         }
 
@@ -353,7 +361,7 @@ public static bool LookPublishAotFlag(string projectLocation, string msBuildPara
                 }
             }
 
-            var properties = LookupProjectProperties(projectLocation, "PublishAot");
+            var properties = LookupProjectProperties(projectLocation, msBuildParameters, "PublishAot");
             if (properties.TryGetValue("PublishAot", out var publishAot))
             {
                 return bool.TryParse(publishAot, out var result) && result;
@@ -369,7 +377,7 @@ public static bool HasExplicitSelfContainedFlag(string projectLocation, string m
                 return true;
             }
 
-            var properties = LookupProjectProperties(projectLocation, "SelfContained");
+            var properties = LookupProjectProperties(projectLocation, msBuildParameters, "SelfContained");
             if (properties.TryGetValue("SelfContained", out var selfContained))
             {
                 return bool.TryParse(selfContained, out var isSelfContained) && isSelfContained;
diff --git a/src/Amazon.ElasticBeanstalk.Tools/Commands/DeployEnvironmentCommand.cs b/src/Amazon.ElasticBeanstalk.Tools/Commands/DeployEnvironmentCommand.cs
@@ -138,7 +138,7 @@ protected override async Task<bool> PerformActionAsync()
 
                 if (string.IsNullOrEmpty(targetFramework))
                 {
-                    targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);
+                    targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, null);
                     if (string.IsNullOrEmpty(targetFramework))
                     {
                         targetFramework = this.GetStringValueOrDefault(this.DeployEnvironmentOptions.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, true);
diff --git a/src/Amazon.ElasticBeanstalk.Tools/Commands/PackageCommand.cs b/src/Amazon.ElasticBeanstalk.Tools/Commands/PackageCommand.cs
@@ -64,7 +64,7 @@ protected override Task<bool> PerformActionAsync()
 
             if (string.IsNullOrEmpty(targetFramework))
             {
-                targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);
+                targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, null);
                 if (string.IsNullOrEmpty(targetFramework))
                 {
                     targetFramework = this.GetStringValueOrDefault(this.DeployEnvironmentOptions.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, true);
diff --git a/src/Amazon.Lambda.Tools/Commands/DeployFunctionCommand.cs b/src/Amazon.Lambda.Tools/Commands/DeployFunctionCommand.cs
@@ -227,10 +227,11 @@ protected override async Task<bool> PerformActionAsync()
                     // Release will be the default configuration if nothing set.
                     string configuration = this.GetStringValueOrDefault(this.Configuration, CommonDefinedCommandOptions.ARGUMENT_CONFIGURATION, false);
 
+                    string msbuildParameters = this.GetStringValueOrDefault(this.MSBuildParameters, CommonDefinedCommandOptions.ARGUMENT_MSBUILD_PARAMETERS, false);
                     var targetFramework = this.GetStringValueOrDefault(this.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, false);
                     if (string.IsNullOrEmpty(targetFramework))
                     {
-                        targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);
+                        targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, msbuildParameters);
 
                         // If we still don't know what the target framework is ask the user what targetframework to use.
                         // This is common when a project is using multi targeting.
@@ -239,7 +240,6 @@ protected override async Task<bool> PerformActionAsync()
                             targetFramework = this.GetStringValueOrDefault(this.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, true);
                         }
                     }
-                    string msbuildParameters = this.GetStringValueOrDefault(this.MSBuildParameters, CommonDefinedCommandOptions.ARGUMENT_MSBUILD_PARAMETERS, false);
 
                     bool isNativeAot = Utilities.LookPublishAotFlag(projectLocation, this.MSBuildParameters);
 
diff --git a/src/Amazon.Lambda.Tools/Commands/PackageCommand.cs b/src/Amazon.Lambda.Tools/Commands/PackageCommand.cs
@@ -206,10 +206,11 @@ protected override async Task<bool> PerformActionAsync()
                 // Release will be the default configuration if nothing set.
                 var configuration = this.GetStringValueOrDefault(this.Configuration, CommonDefinedCommandOptions.ARGUMENT_CONFIGURATION, false);
 
+                var msbuildParameters = this.GetStringValueOrDefault(this.MSBuildParameters, CommonDefinedCommandOptions.ARGUMENT_MSBUILD_PARAMETERS, false);
                 var targetFramework = this.GetStringValueOrDefault(this.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, false);
                 if (string.IsNullOrEmpty(targetFramework))
                 {
-                    targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);
+                    targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, msbuildParameters);
 
                     // If we still don't know what the target framework is ask the user what targetframework to use.
                     // This is common when a project is using multi targeting.
@@ -221,7 +222,6 @@ protected override async Task<bool> PerformActionAsync()
 
                 bool isNativeAot = Utilities.LookPublishAotFlag(projectLocation, this.MSBuildParameters);
 
-                var msbuildParameters = this.GetStringValueOrDefault(this.MSBuildParameters, CommonDefinedCommandOptions.ARGUMENT_MSBUILD_PARAMETERS, false);
                 var architecture = this.GetStringValueOrDefault(this.Architecture, LambdaDefinedCommandOptions.ARGUMENT_FUNCTION_ARCHITECTURE, false);
                 var disableVersionCheck = this.GetBoolValueOrDefault(this.DisableVersionCheck, LambdaDefinedCommandOptions.ARGUMENT_DISABLE_VERSION_CHECK, false).GetValueOrDefault();
 
diff --git a/src/Amazon.Lambda.Tools/LambdaPackager.cs b/src/Amazon.Lambda.Tools/LambdaPackager.cs
@@ -114,7 +114,7 @@ public static bool CreateApplicationBundle(LambdaToolsDefaults defaults, IToolLo
             bool? useContainerForBuild, string containerImageForBuild, string codeMountDirectory,
             out string publishLocation, ref string zipArchivePath)
         {
-            LambdaUtilities.ValidateTargetFramework(projectLocation, targetFramework, isNativeAot);
+            LambdaUtilities.ValidateTargetFramework(projectLocation, msbuildParameters, targetFramework, isNativeAot);
 
             LambdaUtilities.ValidateNativeAotArchitecture(architecture, isNativeAot);
 
diff --git a/src/Amazon.Lambda.Tools/LambdaUtilities.cs b/src/Amazon.Lambda.Tools/LambdaUtilities.cs
@@ -64,13 +64,13 @@ public static class LambdaUtilities
             {Amazon.Lambda.Runtime.Dotnetcore10.Value, TargetFrameworkMonikers.netcoreapp10}
         };
 
-        public static string DetermineTargetFrameworkFromLambdaRuntime(string lambdaRuntime, string projectLocation)
+        public static string DetermineTargetFrameworkFromLambdaRuntime(string lambdaRuntime, string projectLocation, string msbuildParameters)
         {
             string framework;
             if (_lambdaRuntimeToDotnetFramework.TryGetValue(lambdaRuntime, out framework))
                 return framework;
 
-            framework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);
+            framework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, msbuildParameters);
             return framework;
         }
 
@@ -83,9 +83,9 @@ public static string DetermineLambdaRuntimeFromTargetFramework(string targetFram
             return kvp.Key;
         }
 
-        public static void ValidateTargetFramework(string projectLocation, string targetFramework, bool isNativeAot)
+        public static void ValidateTargetFramework(string projectLocation, string msbuildParameters, string targetFramework, bool isNativeAot)
         {
-            var outputType = Utilities.LookupOutputTypeFromProjectFile(projectLocation);
+            var outputType = Utilities.LookupOutputTypeFromProjectFile(projectLocation, msbuildParameters);
             var ouputTypeIsExe = outputType != null && outputType.ToLower().Equals("exe");
 
             if (isNativeAot && !ouputTypeIsExe)
diff --git a/src/Amazon.Lambda.Tools/TemplateProcessor/TemplateProcessorManager.cs b/src/Amazon.Lambda.Tools/TemplateProcessor/TemplateProcessorManager.cs
@@ -251,7 +251,7 @@ private async Task<UpdateResourceResults> PackageDotnetProjectAsync(IUpdateResou
                 var outputPackage = GenerateOutputZipFilename(field);
                 command.OutputPackageFileName = outputPackage;
                 command.TargetFramework =
-                    LambdaUtilities.DetermineTargetFrameworkFromLambdaRuntime(field.Resource.LambdaRuntime, location);
+                    LambdaUtilities.DetermineTargetFrameworkFromLambdaRuntime(field.Resource.LambdaRuntime, location, null);
 
                 command.Architecture = field.Resource.LambdaArchitecture;
                 command.LayerVersionArns = field.Resource.LambdaLayers;
diff --git a/test/Amazon.Common.DotNetCli.Tools.Test/UtilitiesTests.cs b/test/Amazon.Common.DotNetCli.Tools.Test/UtilitiesTests.cs
@@ -18,7 +18,7 @@ public void CheckFramework(string projectPath, string expectedFramework)
         {
             var assembly = this.GetType().GetTypeInfo().Assembly;
             var fullPath = Path.GetFullPath(Path.GetDirectoryName(assembly.Location) + projectPath);
-            var determinedFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectPath);
+            var determinedFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectPath, null);
             Assert.Equal(expectedFramework, determinedFramework);
         }
 
@@ -80,7 +80,7 @@ public void TestLookForPublishAotFlag(string projectLocation, string msBuildPara
         [InlineData("../../../../../testapps/TestNativeAotSingleProject", "Exe")]
         public void TestLookupOutputTypeFromProjectFile(string projectLocation, string expected)
         {
-            var result = Utilities.LookupOutputTypeFromProjectFile(projectLocation);
+            var result = Utilities.LookupOutputTypeFromProjectFile(projectLocation, null);
 
             Assert.Equal(expected, result);
         }
@@ -100,5 +100,19 @@ public void TestHasExplicitSelfContainedFlag(string projectLocation, string msBu
 
             Assert.Equal(expected, result);
         }
+
+        [Theory]
+        [InlineData("TargetFramework", "", "net6.0")]
+        [InlineData("TargetFramework", "/p:NonExistence=net20.0", "net6.0")]
+        [InlineData("TargetFramework", "/p:TargetFramework=net20.0", "net20.0")]
+        [InlineData("TargetFramework", "/p:TargetFramework=net20.0 /p:OutputType=FutureDevice", "net20.0")]
+        [InlineData("OutputType", "/p:TargetFramework=net20.0 /p:OutputType=FutureDevice", "FutureDevice")]
+        public void TestPropertyEvaluationWithMSBuildParameters(string property, string msbuildparameters, string expectedValue)
+        {
+            var projectLocation = "../../../../../testapps/TestFunction";
+
+            var value = Utilities.LookupProjectProperties(projectLocation, msbuildparameters, property)[property];
+            Assert.Equal(expectedValue, value);
+        }
     }
 }
diff --git a/test/Amazon.Lambda.Tools.Test/UtilitiesTests.cs b/test/Amazon.Lambda.Tools.Test/UtilitiesTests.cs
@@ -216,12 +216,12 @@ public void TestValidateTargetFramework(string projectLocation, string targetFra
         {
             if (shouldThrow)
             {
-                Assert.Throws<LambdaToolsException>(() => LambdaUtilities.ValidateTargetFramework(projectLocation, targetFramework, isNativeAot));
+                Assert.Throws<LambdaToolsException>(() => LambdaUtilities.ValidateTargetFramework(projectLocation, null, targetFramework, isNativeAot));
             }
             else
             {
                 // If this throws an exception, the test will fail, hench no assert is necessary
-                LambdaUtilities.ValidateTargetFramework(projectLocation, targetFramework, isNativeAot);
+                LambdaUtilities.ValidateTargetFramework(projectLocation, null, targetFramework, isNativeAot);
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -211,9 +211,10 @@ public static string DeterminePublishLocation(string workingDirectory, string pr`
`211`	`211`	`/// Looks up specified properties from a project.`
`212`	`212`	`/// </summary>`
`213`	`213`	`/// <param name="projectLocation">The location of the project file.</param>`
	`214`	`+ /// <param name="msBuildParameters">Additional MSBuild parameters passed by the user from the commandline</param>`
`214`	`215`	`/// <param name="propertyNames">The names of the properties to look up.</param>`
`215`	`216`	`/// <returns>A dictionary of property names and their values.</returns>`
`216`		`- public static Dictionary<string, string> LookupProjectProperties(string projectLocation, params string[] propertyNames)`
	`217`	`+ public static Dictionary<string, string> LookupProjectProperties(string projectLocation, string msBuildParameters, params string[] propertyNames)`
`217`	`218`	`{`
`218`	`219`	`var projectFile = FindProjectFileInDirectory(projectLocation);`
`219`	`220`	`var properties = new Dictionary<string, string>();`
`@@ -225,6 +226,11 @@ public static Dictionary<string, string> LookupProjectProperties(string projectL`
`225`	`226`	`$"--getProperty:{string.Join(',', propertyNames)}"`
`226`	`227`	`};`
`227`	`228`
	`229`	`+ if (!string.IsNullOrEmpty(msBuildParameters))`
	`230`	`+ {`
	`231`	`+ arguments.Add(msBuildParameters);`
	`232`	`+ }`
	`233`	`+`
`228`	`234`	`var process = new Process`
`229`	`235`	`{`
`230`	`236`	`StartInfo = new ProcessStartInfo`
`@@ -302,16 +308,17 @@ private static Dictionary<string, string> LookupProjectPropertiesFromXml(string`
`302`	`308`	`{`
`303`	`309`	`}`
`304`	`310`	`return properties;`
`305`		`- }`
	`311`	`+ }`
`306`	`312`
`307`	`313`	`/// <summary>`
`308`	`314`	`/// Looks up the target framework from a project file.`
`309`	`315`	`/// </summary>`
`310`	`316`	`/// <param name="projectLocation">The location of the project file.</param>`
	`317`	`+ /// <param name="msBuildParameters">Additonal MSBuild paramteres passed by the user from the commandline</param>`
`311`	`318`	`/// <returns>The target framework of the project.</returns>`
`312`		`- public static string LookupTargetFrameworkFromProjectFile(string projectLocation)`
	`319`	`+ public static string LookupTargetFrameworkFromProjectFile(string projectLocation, string msBuildParameters)`
`313`	`320`	`{`
`314`		`- var properties = LookupProjectProperties(projectLocation, "TargetFramework", "TargetFrameworks");`
	`321`	`+ var properties = LookupProjectProperties(projectLocation, msBuildParameters, "TargetFramework", "TargetFrameworks");`
`315`	`322`	`if (properties.TryGetValue("TargetFramework", out var targetFramework) && !string.IsNullOrEmpty(targetFramework))`
`316`	`323`	`{`
`317`	`324`	`return targetFramework;`
`@@ -331,10 +338,11 @@ public static string LookupTargetFrameworkFromProjectFile(string projectLocation`
`331`	`338`	/// Retrieve the `OutputType` property of a given project
`332`	`339`	`/// </summary>`
`333`	`340`	`/// <param name="projectLocation">Path of the project</param>`
	`341`	`+ /// <param name="msBuildParameters">Additonal MSBuild paramteres passed by the user from the commandline</param>`
`334`	`342`	/// <returns>The value of the `OutputType` property</returns>
`335`		`- public static string LookupOutputTypeFromProjectFile(string projectLocation)`
	`343`	`+ public static string LookupOutputTypeFromProjectFile(string projectLocation, string msBuildParameters)`
`336`	`344`	`{`
`337`		`- var properties = LookupProjectProperties(projectLocation, "OutputType");`
	`345`	`+ var properties = LookupProjectProperties(projectLocation, msBuildParameters, "OutputType");`
`338`	`346`	`return properties.TryGetValue("OutputType", out var outputType) ? outputType.Trim() : null;`
`339`	`347`	`}`
`340`	`348`
`@@ -353,7 +361,7 @@ public static bool LookPublishAotFlag(string projectLocation, string msBuildPara`
`353`	`361`	`}`
`354`	`362`	`}`
`355`	`363`
`356`		`- var properties = LookupProjectProperties(projectLocation, "PublishAot");`
	`364`	`+ var properties = LookupProjectProperties(projectLocation, msBuildParameters, "PublishAot");`
`357`	`365`	`if (properties.TryGetValue("PublishAot", out var publishAot))`
`358`	`366`	`{`
`359`	`367`	`return bool.TryParse(publishAot, out var result) && result;`
`@@ -369,7 +377,7 @@ public static bool HasExplicitSelfContainedFlag(string projectLocation, string m`
`369`	`377`	`return true;`
`370`	`378`	`}`
`371`	`379`
`372`		`- var properties = LookupProjectProperties(projectLocation, "SelfContained");`
	`380`	`+ var properties = LookupProjectProperties(projectLocation, msBuildParameters, "SelfContained");`
`373`	`381`	`if (properties.TryGetValue("SelfContained", out var selfContained))`
`374`	`382`	`{`
`375`	`383`	`return bool.TryParse(selfContained, out var isSelfContained) && isSelfContained;`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ protected override async Task<bool> PerformActionAsync()`
`138`	`138`
`139`	`139`	`if (string.IsNullOrEmpty(targetFramework))`
`140`	`140`	`{`
`141`		`- targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);`
	`141`	`+ targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, null);`
`142`	`142`	`if (string.IsNullOrEmpty(targetFramework))`
`143`	`143`	`{`
`144`	`144`	`targetFramework = this.GetStringValueOrDefault(this.DeployEnvironmentOptions.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, true);`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ protected override Task<bool> PerformActionAsync()`
`64`	`64`
`65`	`65`	`if (string.IsNullOrEmpty(targetFramework))`
`66`	`66`	`{`
`67`		`- targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);`
	`67`	`+ targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, null);`
`68`	`68`	`if (string.IsNullOrEmpty(targetFramework))`
`69`	`69`	`{`
`70`	`70`	`targetFramework = this.GetStringValueOrDefault(this.DeployEnvironmentOptions.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, true);`
Original file line number	Diff line number	Diff line change
`@@ -227,10 +227,11 @@ protected override async Task<bool> PerformActionAsync()`
`227`	`227`	`// Release will be the default configuration if nothing set.`
`228`	`228`	`string configuration = this.GetStringValueOrDefault(this.Configuration, CommonDefinedCommandOptions.ARGUMENT_CONFIGURATION, false);`
`229`	`229`
	`230`	`+ string msbuildParameters = this.GetStringValueOrDefault(this.MSBuildParameters, CommonDefinedCommandOptions.ARGUMENT_MSBUILD_PARAMETERS, false);`
`230`	`231`	`var targetFramework = this.GetStringValueOrDefault(this.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, false);`
`231`	`232`	`if (string.IsNullOrEmpty(targetFramework))`
`232`	`233`	`{`
`233`		`- targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);`
	`234`	`+ targetFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, msbuildParameters);`
`234`	`235`
`235`	`236`	`// If we still don't know what the target framework is ask the user what targetframework to use.`
`236`	`237`	`// This is common when a project is using multi targeting.`
`@@ -239,7 +240,6 @@ protected override async Task<bool> PerformActionAsync()`
`239`	`240`	`targetFramework = this.GetStringValueOrDefault(this.TargetFramework, CommonDefinedCommandOptions.ARGUMENT_FRAMEWORK, true);`
`240`	`241`	`}`
`241`	`242`	`}`
`242`		`- string msbuildParameters = this.GetStringValueOrDefault(this.MSBuildParameters, CommonDefinedCommandOptions.ARGUMENT_MSBUILD_PARAMETERS, false);`
`243`	`243`
`244`	`244`	`bool isNativeAot = Utilities.LookPublishAotFlag(projectLocation, this.MSBuildParameters);`
`245`	`245`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ public static bool CreateApplicationBundle(LambdaToolsDefaults defaults, IToolLo`
`114`	`114`	`bool? useContainerForBuild, string containerImageForBuild, string codeMountDirectory,`
`115`	`115`	`out string publishLocation, ref string zipArchivePath)`
`116`	`116`	`{`
`117`		`- LambdaUtilities.ValidateTargetFramework(projectLocation, targetFramework, isNativeAot);`
	`117`	`+ LambdaUtilities.ValidateTargetFramework(projectLocation, msbuildParameters, targetFramework, isNativeAot);`
`118`	`118`
`119`	`119`	`LambdaUtilities.ValidateNativeAotArchitecture(architecture, isNativeAot);`
`120`	`120`
Original file line number	Diff line number	Diff line change
`@@ -64,13 +64,13 @@ public static class LambdaUtilities`
`64`	`64`	`{Amazon.Lambda.Runtime.Dotnetcore10.Value, TargetFrameworkMonikers.netcoreapp10}`
`65`	`65`	`};`
`66`	`66`
`67`		`- public static string DetermineTargetFrameworkFromLambdaRuntime(string lambdaRuntime, string projectLocation)`
	`67`	`+ public static string DetermineTargetFrameworkFromLambdaRuntime(string lambdaRuntime, string projectLocation, string msbuildParameters)`
`68`	`68`	`{`
`69`	`69`	`string framework;`
`70`	`70`	`if (_lambdaRuntimeToDotnetFramework.TryGetValue(lambdaRuntime, out framework))`
`71`	`71`	`return framework;`
`72`	`72`
`73`		`- framework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation);`
	`73`	`+ framework = Utilities.LookupTargetFrameworkFromProjectFile(projectLocation, msbuildParameters);`
`74`	`74`	`return framework;`
`75`	`75`	`}`
`76`	`76`
`@@ -83,9 +83,9 @@ public static string DetermineLambdaRuntimeFromTargetFramework(string targetFram`
`83`	`83`	`return kvp.Key;`
`84`	`84`	`}`
`85`	`85`
`86`		`- public static void ValidateTargetFramework(string projectLocation, string targetFramework, bool isNativeAot)`
	`86`	`+ public static void ValidateTargetFramework(string projectLocation, string msbuildParameters, string targetFramework, bool isNativeAot)`
`87`	`87`	`{`
`88`		`- var outputType = Utilities.LookupOutputTypeFromProjectFile(projectLocation);`
	`88`	`+ var outputType = Utilities.LookupOutputTypeFromProjectFile(projectLocation, msbuildParameters);`
`89`	`89`	`var ouputTypeIsExe = outputType != null && outputType.ToLower().Equals("exe");`
`90`	`90`
`91`	`91`	`if (isNativeAot && !ouputTypeIsExe)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public void CheckFramework(string projectPath, string expectedFramework)`
`18`	`18`	`{`
`19`	`19`	`var assembly = this.GetType().GetTypeInfo().Assembly;`
`20`	`20`	`var fullPath = Path.GetFullPath(Path.GetDirectoryName(assembly.Location) + projectPath);`
`21`		`- var determinedFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectPath);`
	`21`	`+ var determinedFramework = Utilities.LookupTargetFrameworkFromProjectFile(projectPath, null);`
`22`	`22`	`Assert.Equal(expectedFramework, determinedFramework);`
`23`	`23`	`}`
`24`	`24`
`@@ -80,7 +80,7 @@ public void TestLookForPublishAotFlag(string projectLocation, string msBuildPara`
`80`	`80`	`[InlineData("../../../../../testapps/TestNativeAotSingleProject", "Exe")]`
`81`	`81`	`public void TestLookupOutputTypeFromProjectFile(string projectLocation, string expected)`
`82`	`82`	`{`
`83`		`- var result = Utilities.LookupOutputTypeFromProjectFile(projectLocation);`
	`83`	`+ var result = Utilities.LookupOutputTypeFromProjectFile(projectLocation, null);`
`84`	`84`
`85`	`85`	`Assert.Equal(expected, result);`
`86`	`86`	`}`
`@@ -100,5 +100,19 @@ public void TestHasExplicitSelfContainedFlag(string projectLocation, string msBu`
`100`	`100`
`101`	`101`	`Assert.Equal(expected, result);`
`102`	`102`	`}`
	`103`	`+`
	`104`	`+ [Theory]`
	`105`	`+ [InlineData("TargetFramework", "", "net6.0")]`
	`106`	`+ [InlineData("TargetFramework", "/p:NonExistence=net20.0", "net6.0")]`
	`107`	`+ [InlineData("TargetFramework", "/p:TargetFramework=net20.0", "net20.0")]`
	`108`	`+ [InlineData("TargetFramework", "/p:TargetFramework=net20.0 /p:OutputType=FutureDevice", "net20.0")]`
	`109`	`+ [InlineData("OutputType", "/p:TargetFramework=net20.0 /p:OutputType=FutureDevice", "FutureDevice")]`
	`110`	`+ public void TestPropertyEvaluationWithMSBuildParameters(string property, string msbuildparameters, string expectedValue)`
	`111`	`+ {`
	`112`	`+ var projectLocation = "../../../../../testapps/TestFunction";`
	`113`	`+`
	`114`	`+ var value = Utilities.LookupProjectProperties(projectLocation, msbuildparameters, property)[property];`
	`115`	`+ Assert.Equal(expectedValue, value);`
	`116`	`+ }`
`103`	`117`	`}`
`104`	`118`	`}`