From 6856a76b3ca9f4955d9c756523e0fd5e0eda7673 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 10 Mar 2022 10:58:46 +0100
Subject: [PATCH 1/4] Remove dotnet6 feeds

dotnet7 feeds are currently the target feeds for the main branch. The dotnet6 feeds shouldn't be used anymore.
---
 NuGet.config | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 01da6689762612..7386724781b645 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -18,9 +18,6 @@
     <!-- TODO: Remove dotnet7 feeds when dependencies publish into dotnet8 feeds: https://github.com/dotnet/runtime/issues/63375. -->
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="dotnet7-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7-transport/nuget/v3/index.json" />
-    <!-- TODO: Remove dotnet6 feeds when dependencies publish into dotnet7 feeds: https://github.com/dotnet/runtime/issues/57716. -->
-    <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
-    <add key="dotnet6-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6-transport/nuget/v3/index.json" />
     <!-- Used for the Rich Navigation indexing task -->
     <add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
   </packageSources>

From 38e2e21a3ac8be71fb271d25c3d165306cb7ec6a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 15 Mar 2022 11:14:50 +0100
Subject: [PATCH 2/4] Update targetingpacks.targets

---
 eng/targetingpacks.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
index 63aa48746ab2d8..b7b3279da851de 100644
--- a/eng/targetingpacks.targets
+++ b/eng/targetingpacks.targets
@@ -23,7 +23,7 @@
     <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <!-- Hardcode the apphost version until the SDK understands the net7.0 tfm. -->
-    <_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">6.0.0-rc.1.21411.2</_AppHostBaselinePackVersion>
+    <_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">7.0.0-preview.2.22152.2</_AppHostBaselinePackVersion>
   </PropertyGroup>
 
   <!-- Add Known* items if the SDK doesn't support the TargetFramework yet. -->

From 32e8b2975c2e2c73c2553c76025530918165c68a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 15 Mar 2022 12:47:52 +0100
Subject: [PATCH 3/4] Update prebuilt package versions

---
 eng/targetingpacks.targets                                | 2 +-
 src/installer/tests/Assets/TestUtils/TestProjects.targets | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets
index b7b3279da851de..0505ecdb7dd280 100644
--- a/eng/targetingpacks.targets
+++ b/eng/targetingpacks.targets
@@ -23,7 +23,7 @@
     <EnableTargetingPackDownload>false</EnableTargetingPackDownload>
     <GenerateErrorForMissingTargetingPacks>false</GenerateErrorForMissingTargetingPacks>
     <!-- Hardcode the apphost version until the SDK understands the net7.0 tfm. -->
-    <_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">7.0.0-preview.2.22152.2</_AppHostBaselinePackVersion>
+    <_AppHostBaselinePackVersion Condition="'$(UseLocalAppHostPack)' != 'true'">6.0.3</_AppHostBaselinePackVersion>
   </PropertyGroup>
 
   <!-- Add Known* items if the SDK doesn't support the TargetFramework yet. -->
diff --git a/src/installer/tests/Assets/TestUtils/TestProjects.targets b/src/installer/tests/Assets/TestUtils/TestProjects.targets
index 6927c793daf1ff..b294552ac27a0b 100644
--- a/src/installer/tests/Assets/TestUtils/TestProjects.targets
+++ b/src/installer/tests/Assets/TestUtils/TestProjects.targets
@@ -15,17 +15,17 @@
     <KnownFrameworkReference Include="Microsoft.NETCore.App"
                              TargetFramework="net7.0"
                              RuntimeFrameworkName="Microsoft.NETCore.App"
-                             DefaultRuntimeFrameworkVersion="6.0.0-rc.1.21411.2"
-                             LatestRuntimeFrameworkVersion="6.0.0-rc.1.21411.2"
+                             DefaultRuntimeFrameworkVersion="6.0.3"
+                             LatestRuntimeFrameworkVersion="6.0.3"
                              TargetingPackName="Microsoft.NETCore.App.Ref"
-                             TargetingPackVersion="6.0.0-rc.1.21411.2"
+                             TargetingPackVersion="6.0.3"
                              RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
                              RuntimePackRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64;maccatalyst-x64;maccatalyst-arm64" />
 
     <KnownAppHostPack Include="Microsoft.NETCore.App"
                       TargetFramework="net7.0"
                       AppHostPackNamePattern="Microsoft.NETCore.App.Host.**RID**"
-                      AppHostPackVersion="6.0.0-rc.1.21411.2"
+                      AppHostPackVersion="6.0.3"
                       AppHostRuntimeIdentifiers="linux-arm;linux-arm64;linux-musl-arm64;linux-musl-x64;linux-x64;osx-x64;rhel.6-x64;tizen.4.0.0-armel;tizen.5.0.0-armel;win-arm;win-arm64;win-x64;win-x86;linux-musl-arm;osx-arm64" />
   </ItemGroup>
 </Project>

From a62d63cc7daf82e324d8ac2e9b598c13aecb20f7 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Wed, 16 Mar 2022 20:11:20 +0100
Subject: [PATCH 4/4] Update NativeExports.csproj

---
 .../tests/TestAssets/NativeExports/NativeExports.csproj         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
index cc5a3a284f8c2a..2137affaa095ee 100644
--- a/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
+++ b/src/libraries/System.Runtime.InteropServices/tests/TestAssets/NativeExports/NativeExports.csproj
@@ -73,7 +73,7 @@
     </PropertyGroup>
     <PropertyGroup Condition="'$(TargetOS)' == 'OSX'">
       <TargetTriple Condition="'$(TargetArchitecture)' == 'arm64'">arm64-apple-macos11</TargetTriple>
-      <TargetTriple Condition="'$(TargetArchitecture)' == 'x64'">x86_64-apple-macos10.13</TargetTriple>
+      <TargetTriple Condition="'$(TargetArchitecture)' == 'x64'">x86_64-apple-macos10.14</TargetTriple>
       <XCodeSdkName>macosx</XCodeSdkName>
     </PropertyGroup>