From 6af9b8d2995f7fcc39ffa49d8ce9c51368db314b Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Wed, 23 Aug 2023 17:06:56 +0200
Subject: [PATCH 1/3] update warning presence

---
 src/MSBuildLocator/build/Microsoft.Build.Locator.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MSBuildLocator/build/Microsoft.Build.Locator.targets b/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
index f17cd107..b61b3a29 100644
--- a/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
+++ b/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
@@ -4,7 +4,7 @@
       <MSBuildPackagesWithoutPrivateAssets
         Include="@(PackageReference)"
         Condition="
-          '%(PackageReference.ExcludeAssets)' != 'runtime' and
+          !'%(PackageReference.ExcludeAssets)'.Contains('runtime') and
           (
             '%(PackageReference.Identity)' == 'Microsoft.Build' or
             '%(PackageReference.Identity)' == 'Microsoft.Build.Framework' or

From 6666a9271308f1eaec587c54be4af31e019815a1 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Fri, 1 Sep 2023 11:45:21 +0200
Subject: [PATCH 2/3] fix review comments

---
 samples/BuilderApp/BuilderApp.csproj                     | 2 ++
 src/MSBuildLocator/build/Microsoft.Build.Locator.targets | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/samples/BuilderApp/BuilderApp.csproj b/samples/BuilderApp/BuilderApp.csproj
index 9035d7de..e15c0d4e 100644
--- a/samples/BuilderApp/BuilderApp.csproj
+++ b/samples/BuilderApp/BuilderApp.csproj
@@ -28,4 +28,6 @@
        Not necessary if you use the package! -->
   <Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.props"/>
 
+  <Import Project="..\..\src\MSBuildLocator\build\Microsoft.Build.Locator.targets"/>
+
 </Project>
diff --git a/src/MSBuildLocator/build/Microsoft.Build.Locator.targets b/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
index b61b3a29..465ea195 100644
--- a/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
+++ b/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
@@ -3,8 +3,7 @@
     <ItemGroup>
       <MSBuildPackagesWithoutPrivateAssets
         Include="@(PackageReference)"
-        Condition="
-          !'%(PackageReference.ExcludeAssets)'.Contains('runtime') and
+        Condition="!$([MSBuild]::ValueOrDefault('%(PackageReference.ExcludeAssets)', '').Contains('runtime')) and
           (
             '%(PackageReference.Identity)' == 'Microsoft.Build' or
             '%(PackageReference.Identity)' == 'Microsoft.Build.Framework' or

From 4fdff147ca2d715de5738c6b2378e8a3ccf85e18 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Fri, 1 Sep 2023 11:52:22 +0200
Subject: [PATCH 3/3] fix review comments

---
 src/MSBuildLocator/build/Microsoft.Build.Locator.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MSBuildLocator/build/Microsoft.Build.Locator.targets b/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
index 465ea195..a117f136 100644
--- a/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
+++ b/src/MSBuildLocator/build/Microsoft.Build.Locator.targets
@@ -3,7 +3,7 @@
     <ItemGroup>
       <MSBuildPackagesWithoutPrivateAssets
         Include="@(PackageReference)"
-        Condition="!$([MSBuild]::ValueOrDefault('%(PackageReference.ExcludeAssets)', '').Contains('runtime')) and
+        Condition="!$([MSBuild]::ValueOrDefault('%(PackageReference.ExcludeAssets)', '').ToLower().Contains('runtime')) and
           (
             '%(PackageReference.Identity)' == 'Microsoft.Build' or
             '%(PackageReference.Identity)' == 'Microsoft.Build.Framework' or