From 60cb8cc2020fdbc883bdf6f0c0f5de8ee7e02bab Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Mon, 31 Jul 2023 13:15:31 +0200
Subject: [PATCH 1/7] upgrade netcore version + add explicit apphost loading
 for specific platforms.

---
 src/MSBuildLocator/Microsoft.Build.Locator.csproj | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index b7c193ef..d4003e7f 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net46;net7.0</TargetFrameworks>
     <DebugType>full</DebugType>
 
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -11,6 +11,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
+	<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
 
     <Title>MSBuild Locator</Title>
     <Description>Package that assists in locating and using a copy of MSBuild installed as part of Visual Studio 2017 or higher or .NET Core SDK 2.1 or higher.</Description>
@@ -25,6 +26,12 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
+	<!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
+    <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
+    <PackageReference Include="runtime.$(RuntimeIdentifier).Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="MicroBuild.Core" Version="0.3.0" PrivateAssets="all" />
     <Content Include="build\Microsoft.Build.Locator.props">

From 1166b2a508e2c60b84adcb8a372a80b5f8715d0d Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Mon, 31 Jul 2023 13:28:29 +0200
Subject: [PATCH 2/7] downgrade sdk version

---
 src/MSBuildLocator/Microsoft.Build.Locator.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index d4003e7f..6375be37 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net46;net7.0</TargetFrameworks>
+    <TargetFrameworks>net46;net6.0</TargetFrameworks>
     <DebugType>full</DebugType>
 
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
@@ -26,7 +26,7 @@
     <PackageReference Include="Microsoft.VisualStudio.SDK.EmbedInteropTypes" Version="15.0.36" PrivateAssets="all" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
 	<!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
     <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
     <PackageReference Include="runtime.$(RuntimeIdentifier).Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />

From 9db5fb66e142141b44356e53eed99be3a33b21ba Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Mon, 31 Jul 2023 13:34:24 +0200
Subject: [PATCH 3/7] upgrate sdk version for tests

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

diff --git a/samples/BuilderApp/BuilderApp.csproj b/samples/BuilderApp/BuilderApp.csproj
index f8adc233..9035d7de 100644
--- a/samples/BuilderApp/BuilderApp.csproj
+++ b/samples/BuilderApp/BuilderApp.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net472;netcoreapp3.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj b/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
index df60f64f..94fef29e 100644
--- a/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
+++ b/src/MSBuildLocator.Tests/Microsoft.Build.Locator.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\MSBuildLocator\key.snk</AssemblyOriginatorKeyFile>

From 57665c4de384a3884b511dfe3beb92b45f4a3a04 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Mon, 31 Jul 2023 13:47:44 +0200
Subject: [PATCH 4/7] fix formatting

---
 src/MSBuildLocator/Microsoft.Build.Locator.csproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index 6375be37..44b34007 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -11,7 +11,7 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
-	<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
+	  <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
 
     <Title>MSBuild Locator</Title>
     <Description>Package that assists in locating and using a copy of MSBuild installed as part of Visual Studio 2017 or higher or .NET Core SDK 2.1 or higher.</Description>
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-	<!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
+	  <!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
     <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
     <PackageReference Include="runtime.$(RuntimeIdentifier).Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
   </ItemGroup>

From 07c1274bb79b8c568928006f976708db743cd0cc Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Mon, 31 Jul 2023 15:23:34 +0200
Subject: [PATCH 5/7] fix review comment

---
 .../Microsoft.Build.Locator.csproj            | 10 ++++--
 .../build/TraverseRuntimeIdentifiers.targets  | 31 +++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index 44b34007..2824cc95 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -11,7 +11,6 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
     <EnableDefaultNoneItems>false</EnableDefaultNoneItems>
-	  <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
 
     <Title>MSBuild Locator</Title>
     <Description>Package that assists in locating and using a copy of MSBuild installed as part of Visual Studio 2017 or higher or .NET Core SDK 2.1 or higher.</Description>
@@ -27,9 +26,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-	  <!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
+	 <!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
     <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
-    <PackageReference Include="runtime.$(RuntimeIdentifier).Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
   </ItemGroup>
 
   <ItemGroup>
@@ -41,6 +39,10 @@
     <Content Include="build\Microsoft.Build.Locator.targets">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       <PackagePath>build\</PackagePath>
+    </Content>
+	<Content Include="build\TraverseRuntimeIdentifiers.targets">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+	  <PackagePath>build\</PackagePath>
     </Content>
   </ItemGroup>
 
@@ -50,4 +52,6 @@
     </FilesToSign>
   </ItemGroup>
 
+  <Import Project="..\..\src\MSBuildLocator\build\TraverseRuntimeIdentifiers.targets" />
+	
 </Project>
diff --git a/src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets b/src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets
new file mode 100644
index 00000000..da6636a6
--- /dev/null
+++ b/src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets
@@ -0,0 +1,31 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="TraverseRuntimeIdentifiers" AfterTargets="Restore">
+    <PropertyGroup>
+      <RuntimeIdentifiers>
+        linux-x64;
+        linux-musl-x64;
+        linux-arm;
+        linux-arm64;
+        linux-bionic-arm64;
+        linux-musl-arm64;
+        linux-musl-arm;
+        linux-bionic-x64;
+        osx-x64;
+        osx-arm64
+      </RuntimeIdentifiers>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <RuntimeIdentifierArray>$(RuntimeIdentifiers.Split(';'))</RuntimeIdentifierArray>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <CurrentRuntimeIdentifier Include="$(RuntimeIdentifierArray)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="runtime.%(CurrentRuntimeIdentifier.Identity).Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
+    </ItemGroup>
+
+  </Target>
+</Project>
\ No newline at end of file

From a76e660e96fea141b7e9f3dde6ee22eaccda9fe4 Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Tue, 1 Aug 2023 11:06:59 +0200
Subject: [PATCH 6/7] fix review comments

---
 .../Microsoft.Build.Locator.csproj            | 24 ++++++++------
 .../build/TraverseRuntimeIdentifiers.targets  | 31 -------------------
 2 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index 2824cc95..9bae289b 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -5,7 +5,7 @@
     <TargetFrameworks>net46;net6.0</TargetFrameworks>
     <DebugType>full</DebugType>
 
-    <CopyLocalLockFileAssemblies>false</CopyLocalLockFileAssemblies>
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AssemblyName>Microsoft.Build.Locator</AssemblyName>
     <RootNamespace>Microsoft.Build.Locator</RootNamespace>
     <SignAssembly>true</SignAssembly>
@@ -26,8 +26,18 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
-	 <!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
-    <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
+    <PackageReference Include="Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+	<!-- These package references help to resolve assemblies in runtime for platforms, where these are not loaded to AppContext by default (e.g MacOS). -->
+    <PackageReference Include="runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-bionic-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.linux-bionic-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,10 +49,6 @@
     <Content Include="build\Microsoft.Build.Locator.targets">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>
       <PackagePath>build\</PackagePath>
-    </Content>
-	<Content Include="build\TraverseRuntimeIdentifiers.targets">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-	  <PackagePath>build\</PackagePath>
     </Content>
   </ItemGroup>
 
@@ -51,7 +57,5 @@
       <Authenticode>Microsoft400</Authenticode>
     </FilesToSign>
   </ItemGroup>
-
-  <Import Project="..\..\src\MSBuildLocator\build\TraverseRuntimeIdentifiers.targets" />
 	
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets b/src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets
deleted file mode 100644
index da6636a6..00000000
--- a/src/MSBuildLocator/build/TraverseRuntimeIdentifiers.targets
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="TraverseRuntimeIdentifiers" AfterTargets="Restore">
-    <PropertyGroup>
-      <RuntimeIdentifiers>
-        linux-x64;
-        linux-musl-x64;
-        linux-arm;
-        linux-arm64;
-        linux-bionic-arm64;
-        linux-musl-arm64;
-        linux-musl-arm;
-        linux-bionic-x64;
-        osx-x64;
-        osx-arm64
-      </RuntimeIdentifiers>
-    </PropertyGroup>
-
-    <PropertyGroup>
-      <RuntimeIdentifierArray>$(RuntimeIdentifiers.Split(';'))</RuntimeIdentifierArray>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <CurrentRuntimeIdentifier Include="$(RuntimeIdentifierArray)" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <PackageReference Include="runtime.%(CurrentRuntimeIdentifier.Identity).Microsoft.NETCore.DotNetAppHost" Version="7.0.9" />
-    </ItemGroup>
-
-  </Target>
-</Project>
\ No newline at end of file

From a7e81c92e079900d3403e71542c59d6cc767daaf Mon Sep 17 00:00:00 2001
From: YuliiaKovalova <ykovalova@microsoft.com>
Date: Tue, 1 Aug 2023 11:11:40 +0200
Subject: [PATCH 7/7] fix invalid package name

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

diff --git a/src/MSBuildLocator/Microsoft.Build.Locator.csproj b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
index 9bae289b..f375a251 100644
--- a/src/MSBuildLocator/Microsoft.Build.Locator.csproj
+++ b/src/MSBuildLocator/Microsoft.Build.Locator.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
     <PackageReference Include="runtime.linux-bionic-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
     <PackageReference Include="runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
-    <PackageReference Include="runtime.arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
+    <PackageReference Include="runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" Version="7.0.9" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>