From f6397af62b226659d9b7362f3809efff88a865fa Mon Sep 17 00:00:00 2001
From: Sean Reeser <v-seanreeser@microsoft.com>
Date: Tue, 1 Oct 2024 15:53:30 -0700
Subject: [PATCH 1/5] Update branding to 6.0.136

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 7f587b662a44..33d0d226fcff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <!-- Repo Version Information -->
   <PropertyGroup>
-    <VersionPrefix>6.0.135</VersionPrefix>
+    <VersionPrefix>6.0.136</VersionPrefix>
     <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
   </PropertyGroup>
   <!-- Production Dependencies -->

From b2bf826903a366e95e0b10b2048f12754d63da84 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Wed, 2 Oct 2024 14:43:42 -0700
Subject: [PATCH 2/5] add osx14 rid

---
 src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index 83eac4be525e..63c9d0193e2c 100644
--- a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
-    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;osx.14-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
     <RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>

From 57d159469979addbf419f927136f9b4894e38f05 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 3 Oct 2024 09:31:37 -0700
Subject: [PATCH 3/5] Switch back to macos 13

---
 .vsts-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 23bb5bf18548..8aca98ed2114 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -180,7 +180,7 @@ extends:
             agentOs: Darwin
             pool:
               name: Azure Pipelines
-              image: macOS-latest
+              image: macos-13
               os: macOS
             ${{ if eq(variables['System.TeamProject'], 'public') }}:
               helixTargetQueue: OSX.1200.Amd64.Open

From 53b18964d10fc4173ff6854bcdcc079cc38f2ce0 Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 3 Oct 2024 09:31:57 -0700
Subject: [PATCH 4/5] Switch back to macos 13

---
 .vsts-pr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.vsts-pr.yml b/.vsts-pr.yml
index 83bcf462bf89..d8829ad2efc3 100644
--- a/.vsts-pr.yml
+++ b/.vsts-pr.yml
@@ -145,7 +145,7 @@ stages:
       parameters:
         agentOs: Darwin
         pool:
-          vmImage: 'macOS-latest'
+          vmImage: 'macos-13'
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           helixTargetQueue: OSX.1200.Amd64.Open
         ${{ if ne(variables['System.TeamProject'], 'public') }}:

From da41cc858b42097d826116bdc25561decc12ff5c Mon Sep 17 00:00:00 2001
From: Marc Paine <marcpop@microsoft.com>
Date: Thu, 3 Oct 2024 11:37:11 -0700
Subject: [PATCH 5/5] remove osx14 from the ridlist in the test

---
 src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
index 63c9d0193e2c..83eac4be525e 100644
--- a/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
+++ b/src/Assets/TestProjects/MSBuildTestApp/MSBuildTestApp.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(CurrentTargetFramework)</TargetFramework>
-    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;osx.14-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win7-x64;win7-x86;osx.10.12-x64;ubuntu.14.04-x64;ubuntu.16.04-x64;ubuntu.16.10-x64;rhel.8-x64;centos.7-x64;rhel.7-x64;debian.8-x64;fedora.24-x64;opensuse.42.1-x64;linux-musl-x64</RuntimeIdentifiers>
     <RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(RestoreAdditionalProjectSources);$(TEST_PACKAGES)</RestoreAdditionalProjectSources>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>