diff --git a/src/msbuild/azure-pipelines/vs-insertion-experimental.yml b/src/msbuild/azure-pipelines/vs-insertion-experimental.yml
index fe2a1134de5d..6cbdac4eaa10 100644
--- a/src/msbuild/azure-pipelines/vs-insertion-experimental.yml
+++ b/src/msbuild/azure-pipelines/vs-insertion-experimental.yml
@@ -24,6 +24,7 @@ parameters:
     displayName: 'Insertion Target Branch (select for manual insertion)'
     values:
       - main
+      - rel/d18.0
       - rel/d17.14
       - rel/d17.13
       - rel/d17.12
diff --git a/src/msbuild/azure-pipelines/vs-insertion.yml b/src/msbuild/azure-pipelines/vs-insertion.yml
index f4025af8cc24..913c108c9e02 100644
--- a/src/msbuild/azure-pipelines/vs-insertion.yml
+++ b/src/msbuild/azure-pipelines/vs-insertion.yml
@@ -44,6 +44,7 @@ parameters:
     values:
       - auto
       - main
+      - rel/d18.0
       - rel/d17.14
       - rel/d17.13
       - rel/d17.12
@@ -65,7 +66,9 @@ parameters:
 variables:
   # `auto` should work every time and selecting a branch in parameters is likely to fail due to incompatible versions in MSBuild and VS
   - name: AutoInsertTargetBranch
-    ${{ if eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
+    ${{ if eq(variables['Build.SourceBranchName'], 'vs18.0') }}:
+      value: 'rel/d18.0'
+    ${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.14') }}:
       value: 'rel/d17.14'
     ${{ elseif eq(variables['Build.SourceBranchName'], 'vs17.13') }}:
       value: 'rel/d17.13'
diff --git a/src/msbuild/eng/Version.Details.xml b/src/msbuild/eng/Version.Details.xml
index 64d8815eadce..8fa567e98a6f 100644
--- a/src/msbuild/eng/Version.Details.xml
+++ b/src/msbuild/eng/Version.Details.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e" BarId="279809" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="msbuild" Sha="e72b5bbe719d747036ce9c36582a205df9f1c361" BarId="285185" />
   <ProductDependencies>
     <!-- Necessary for source-build. This allows the live version of the package to be used by source-build. -->
     <Dependency Name="System.CodeDom" Version="9.0.0">
diff --git a/src/msbuild/eng/Versions.props b/src/msbuild/eng/Versions.props
index 8790c9acd9c8..76fdff319f9d 100644
--- a/src/msbuild/eng/Versions.props
+++ b/src/msbuild/eng/Versions.props
@@ -3,10 +3,10 @@
 <Project>
   <Import Project="Version.Details.props" Condition="Exists('Version.Details.props')" />
   <PropertyGroup>
-    <VersionPrefix>18.0.0</VersionPrefix>
+    <VersionPrefix>18.0.0</VersionPrefix><DotNetFinalVersionKind>release</DotNetFinalVersionKind>
     <PackageValidationBaselineVersion>17.14.8</PackageValidationBaselineVersion>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
-    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
+    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
 
     <!-- differentiate experimental insertions to avoid package id conflicts, 
      it has to be alphabetically after "preview" to avoid downgrade errors in VS -->
diff --git a/src/msbuild/src/Build/Instance/ProjectInstance.cs b/src/msbuild/src/Build/Instance/ProjectInstance.cs
index 092addf25e3e..fe0cdee00e61 100644
--- a/src/msbuild/src/Build/Instance/ProjectInstance.cs
+++ b/src/msbuild/src/Build/Instance/ProjectInstance.cs
@@ -845,7 +845,7 @@ private ProjectInstance(ProjectInstance that, bool isImmutable, RequestedProject
                             _globalProperties.Set(globalProperty.DeepClone(isImmutable: true));
                         }
 
-                        var environmentProperty = that._environmentVariableProperties.GetProperty(desiredProperty);
+                        var environmentProperty = that._environmentVariableProperties?.GetProperty(desiredProperty);
                         if (environmentProperty != null)
                         {
                             _environmentVariableProperties.Set(environmentProperty.DeepClone(isImmutable: true));
diff --git a/src/source-manifest.json b/src/source-manifest.json
index d114e3a198ba..6f3422201eed 100644
--- a/src/source-manifest.json
+++ b/src/source-manifest.json
@@ -1,221 +1,221 @@
-{
-  "repositories": [
-    {
-      "barId": 285108,
-      "path": "arcade",
-      "remoteUri": "https://github.com/dotnet/arcade",
-      "commitSha": "e6f510cb87812d56ad781d93ff0513cdcccd0eb4"
-    },
-    {
-      "barId": 286219,
-      "path": "aspnetcore",
-      "remoteUri": "https://github.com/dotnet/aspnetcore",
-      "commitSha": "305280b3a9092b709b4449640e4d8db9a327d46f"
-    },
-    {
-      "barId": 279211,
-      "path": "cecil",
-      "remoteUri": "https://github.com/dotnet/cecil",
-      "commitSha": "27abc57253a0d3010418e877fdfb35f9fa6806b9"
-    },
-    {
-      "barId": 279170,
-      "path": "command-line-api",
-      "remoteUri": "https://github.com/dotnet/command-line-api",
-      "commitSha": "e292617c0f829bfe777c7ad51467c6a509a9aff8"
-    },
-    {
-      "barId": 284345,
-      "path": "deployment-tools",
-      "remoteUri": "https://github.com/dotnet/deployment-tools",
-      "commitSha": "c0c52874069a4dc0fe1e880014e6a5f316e9d3b8"
-    },
-    {
-      "barId": 285923,
-      "path": "diagnostics",
-      "remoteUri": "https://github.com/dotnet/diagnostics",
-      "commitSha": "f40e210b5da69e3c7585917137322cac01f0dffc"
-    },
-    {
-      "barId": 285648,
-      "path": "efcore",
-      "remoteUri": "https://github.com/dotnet/efcore",
-      "commitSha": "9f21708d124ca38c7d2c94d5538b597ba20129e1"
-    },
-    {
-      "barId": 283436,
-      "path": "emsdk",
-      "remoteUri": "https://github.com/dotnet/emsdk",
-      "commitSha": "36bb70920a16cdfe30540412069796113d9f3e5c"
-    },
-    {
-      "barId": 285891,
-      "path": "fsharp",
-      "remoteUri": "https://github.com/dotnet/fsharp",
-      "commitSha": "2cb9ee0a5d63b52ad7bfbd9364b90b991a26fd72"
-    },
-    {
-      "barId": 285457,
-      "path": "msbuild",
-      "remoteUri": "https://github.com/maestro-auth-test/msbuild",
-      "commitSha": "dc755eb75a2a1f6a82036588da128eb859d96e8e"
-    },
-    {
-      "barId": 284434,
-      "path": "nuget-client",
-      "remoteUri": "https://github.com/nuget/nuget.client",
-      "commitSha": "28eeb0947095a716b98b5c34454625708cb3ac76"
-    },
-    {
-      "barId": 286084,
-      "path": "razor",
-      "remoteUri": "https://github.com/dotnet/razor",
-      "commitSha": "d52cf7384867f6592a7a45f1696f8fa298441de4"
-    },
-    {
-      "barId": 286121,
-      "path": "roslyn",
-      "remoteUri": "https://github.com/dotnet/roslyn",
-      "commitSha": "23d275e30097136b12a68d1bab4997148361d116"
-    },
-    {
-      "barId": 285920,
-      "path": "runtime",
-      "remoteUri": "https://github.com/dotnet/runtime",
-      "commitSha": "05a3a9ba8860b076afc88a6bf0d455f2c3b522d3"
-    },
-    {
-      "barId": 277711,
-      "path": "scenario-tests",
-      "remoteUri": "https://github.com/dotnet/scenario-tests",
-      "commitSha": "082359066ee0064039b9b1f1f025bdd0507d06de"
-    },
-    {
-      "barId": 286006,
-      "path": "sdk",
-      "remoteUri": "https://github.com/dotnet/sdk",
-      "commitSha": "cf932ba08b38f8a148536f5d0e9c98d56280cc24"
-    },
-    {
-      "barId": 282656,
-      "path": "source-build-reference-packages",
-      "remoteUri": "https://github.com/dotnet/source-build-reference-packages",
-      "commitSha": "fdb961b0749fa58221e92915a7a7bbec65d40251"
-    },
-    {
-      "barId": 277912,
-      "path": "sourcelink",
-      "remoteUri": "https://github.com/dotnet/sourcelink",
-      "commitSha": "9b949eeb2d5dba635c06ae936b50d2141b0aabe2"
-    },
-    {
-      "barId": 284900,
-      "path": "symreader",
-      "remoteUri": "https://github.com/dotnet/symreader",
-      "commitSha": "26c6c313a35f020dc9fa8c7270a012bcd75fc81b"
-    },
-    {
-      "barId": 285272,
-      "path": "templating",
-      "remoteUri": "https://github.com/dotnet/templating",
-      "commitSha": "4c36907d7149f0b3b59c7178acea6330540df851"
-    },
-    {
-      "barId": 285355,
-      "path": "vstest",
-      "remoteUri": "https://github.com/microsoft/vstest",
-      "commitSha": "740c6833bf93da474c364c36b55fd616c8e9f3d0"
-    },
-    {
-      "barId": 280421,
-      "path": "windowsdesktop",
-      "remoteUri": "https://github.com/dotnet/windowsdesktop",
-      "commitSha": "e2dc1b239ab7828c6ccf3395db5f6e72af652549"
-    },
-    {
-      "barId": 282630,
-      "path": "winforms",
-      "remoteUri": "https://github.com/dotnet/winforms",
-      "commitSha": "2b9471644494f912a5ea1f559ed7e2d443a631aa"
-    },
-    {
-      "barId": 284453,
-      "path": "wpf",
-      "remoteUri": "https://github.com/dotnet/wpf",
-      "commitSha": "a94c8eb81ba1e5ea9f6e282a717cd52270548589"
-    },
-    {
-      "barId": 278018,
-      "path": "xdt",
-      "remoteUri": "https://github.com/dotnet/xdt",
-      "commitSha": "ec086785dfa9af4a0dc58eca3e5c969e3d0c6003"
-    }
-  ],
-  "submodules": [
-    {
-      "path": "aspnetcore/src/submodules/googletest",
-      "remoteUri": "https://github.com/google/googletest",
-      "commitSha": "373af2e3df71599b87a40ce0e37164523849166b"
-    },
-    {
-      "path": "aspnetcore/src/submodules/MessagePack-CSharp",
-      "remoteUri": "https://github.com/aspnet/MessagePack-CSharp.git",
-      "commitSha": "9aeb12b9bdb024512ffe2e4bddfa2785dca6e39e"
-    },
-    {
-      "path": "nuget-client/submodules/NuGet.Build.Localization",
-      "remoteUri": "https://github.com/NuGet/NuGet.Build.Localization.git",
-      "commitSha": "f15db7b7c6f5affbea268632ef8333d2687c8031"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/abstractions-xunit",
-      "remoteUri": "https://github.com/xunit/abstractions.xunit",
-      "commitSha": "b75d54d73b141709f805c2001b16f3dd4d71539d"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/application-insights",
-      "remoteUri": "https://github.com/microsoft/ApplicationInsights-dotnet",
-      "commitSha": "2faa7e8b157a431daa2e71785d68abd5fa817b53"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/azure-activedirectory-identitymodel-extensions-for-dotnet",
-      "remoteUri": "https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git",
-      "commitSha": "e67b25be77532af9ba405670b34b4d263d505fde"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/cssparser",
-      "remoteUri": "https://github.com/dotnet/cssparser",
-      "commitSha": "0d59611784841735a7778a67aa6e9d8d000c861f"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/docker-creds-provider",
-      "remoteUri": "https://github.com/mthalman/docker-creds-provider",
-      "commitSha": "6e1ecd0a80755f9f0e88dc23b98b52f51a77c65e"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/humanizer",
-      "remoteUri": "https://github.com/Humanizr/Humanizer",
-      "commitSha": "3ebc38de585fc641a04b0e78ed69468453b0f8a1"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/MSBuildLocator",
-      "remoteUri": "https://github.com/microsoft/MSBuildLocator",
-      "commitSha": "6235ee4484ceb8f9db32826ae252b0a2aad0955e"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/newtonsoft-json",
-      "remoteUri": "https://github.com/JamesNK/Newtonsoft.Json.git",
-      "commitSha": "0a2e291c0d9c0c7675d445703e51750363a549ef"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/spectre-console",
-      "remoteUri": "https://github.com/spectreconsole/spectre.console",
-      "commitSha": "68fcfe0de4c0602b1c4d4c3cf58ea70e9f06388c"
-    },
-    {
-      "path": "source-build-reference-packages/src/externalPackages/src/vs-solutionpersistence",
-      "remoteUri": "https://github.com/microsoft/vs-solutionpersistence.git",
-      "commitSha": "0b6f82a4073ce0ff0419991ea0cd6dd6898a51ac"
-    }
-  ]
+{
+  "repositories": [
+    {
+      "barId": 285108,
+      "path": "arcade",
+      "remoteUri": "https://github.com/dotnet/arcade",
+      "commitSha": "e6f510cb87812d56ad781d93ff0513cdcccd0eb4"
+    },
+    {
+      "barId": 286219,
+      "path": "aspnetcore",
+      "remoteUri": "https://github.com/dotnet/aspnetcore",
+      "commitSha": "305280b3a9092b709b4449640e4d8db9a327d46f"
+    },
+    {
+      "barId": 279211,
+      "path": "cecil",
+      "remoteUri": "https://github.com/dotnet/cecil",
+      "commitSha": "27abc57253a0d3010418e877fdfb35f9fa6806b9"
+    },
+    {
+      "barId": 279170,
+      "path": "command-line-api",
+      "remoteUri": "https://github.com/dotnet/command-line-api",
+      "commitSha": "e292617c0f829bfe777c7ad51467c6a509a9aff8"
+    },
+    {
+      "barId": 284345,
+      "path": "deployment-tools",
+      "remoteUri": "https://github.com/dotnet/deployment-tools",
+      "commitSha": "c0c52874069a4dc0fe1e880014e6a5f316e9d3b8"
+    },
+    {
+      "barId": 285923,
+      "path": "diagnostics",
+      "remoteUri": "https://github.com/dotnet/diagnostics",
+      "commitSha": "f40e210b5da69e3c7585917137322cac01f0dffc"
+    },
+    {
+      "barId": 285648,
+      "path": "efcore",
+      "remoteUri": "https://github.com/dotnet/efcore",
+      "commitSha": "9f21708d124ca38c7d2c94d5538b597ba20129e1"
+    },
+    {
+      "barId": 283436,
+      "path": "emsdk",
+      "remoteUri": "https://github.com/dotnet/emsdk",
+      "commitSha": "36bb70920a16cdfe30540412069796113d9f3e5c"
+    },
+    {
+      "barId": 285891,
+      "path": "fsharp",
+      "remoteUri": "https://github.com/dotnet/fsharp",
+      "commitSha": "2cb9ee0a5d63b52ad7bfbd9364b90b991a26fd72"
+    },
+    {
+      "barId": 979,
+      "path": "msbuild",
+      "remoteUri": "https://github.com/maestro-auth-test/msbuild",
+      "commitSha": "7876a2d27465e6a412144fa2de4273da4a1dd871"
+    },
+    {
+      "barId": 284434,
+      "path": "nuget-client",
+      "remoteUri": "https://github.com/nuget/nuget.client",
+      "commitSha": "28eeb0947095a716b98b5c34454625708cb3ac76"
+    },
+    {
+      "barId": 286084,
+      "path": "razor",
+      "remoteUri": "https://github.com/dotnet/razor",
+      "commitSha": "d52cf7384867f6592a7a45f1696f8fa298441de4"
+    },
+    {
+      "barId": 286121,
+      "path": "roslyn",
+      "remoteUri": "https://github.com/dotnet/roslyn",
+      "commitSha": "23d275e30097136b12a68d1bab4997148361d116"
+    },
+    {
+      "barId": 285920,
+      "path": "runtime",
+      "remoteUri": "https://github.com/dotnet/runtime",
+      "commitSha": "05a3a9ba8860b076afc88a6bf0d455f2c3b522d3"
+    },
+    {
+      "barId": 277711,
+      "path": "scenario-tests",
+      "remoteUri": "https://github.com/dotnet/scenario-tests",
+      "commitSha": "082359066ee0064039b9b1f1f025bdd0507d06de"
+    },
+    {
+      "barId": 286006,
+      "path": "sdk",
+      "remoteUri": "https://github.com/dotnet/sdk",
+      "commitSha": "cf932ba08b38f8a148536f5d0e9c98d56280cc24"
+    },
+    {
+      "barId": 282656,
+      "path": "source-build-reference-packages",
+      "remoteUri": "https://github.com/dotnet/source-build-reference-packages",
+      "commitSha": "fdb961b0749fa58221e92915a7a7bbec65d40251"
+    },
+    {
+      "barId": 277912,
+      "path": "sourcelink",
+      "remoteUri": "https://github.com/dotnet/sourcelink",
+      "commitSha": "9b949eeb2d5dba635c06ae936b50d2141b0aabe2"
+    },
+    {
+      "barId": 284900,
+      "path": "symreader",
+      "remoteUri": "https://github.com/dotnet/symreader",
+      "commitSha": "26c6c313a35f020dc9fa8c7270a012bcd75fc81b"
+    },
+    {
+      "barId": 285272,
+      "path": "templating",
+      "remoteUri": "https://github.com/dotnet/templating",
+      "commitSha": "4c36907d7149f0b3b59c7178acea6330540df851"
+    },
+    {
+      "barId": 285355,
+      "path": "vstest",
+      "remoteUri": "https://github.com/microsoft/vstest",
+      "commitSha": "740c6833bf93da474c364c36b55fd616c8e9f3d0"
+    },
+    {
+      "barId": 280421,
+      "path": "windowsdesktop",
+      "remoteUri": "https://github.com/dotnet/windowsdesktop",
+      "commitSha": "e2dc1b239ab7828c6ccf3395db5f6e72af652549"
+    },
+    {
+      "barId": 282630,
+      "path": "winforms",
+      "remoteUri": "https://github.com/dotnet/winforms",
+      "commitSha": "2b9471644494f912a5ea1f559ed7e2d443a631aa"
+    },
+    {
+      "barId": 284453,
+      "path": "wpf",
+      "remoteUri": "https://github.com/dotnet/wpf",
+      "commitSha": "a94c8eb81ba1e5ea9f6e282a717cd52270548589"
+    },
+    {
+      "barId": 278018,
+      "path": "xdt",
+      "remoteUri": "https://github.com/dotnet/xdt",
+      "commitSha": "ec086785dfa9af4a0dc58eca3e5c969e3d0c6003"
+    }
+  ],
+  "submodules": [
+    {
+      "path": "aspnetcore/src/submodules/googletest",
+      "remoteUri": "https://github.com/google/googletest",
+      "commitSha": "373af2e3df71599b87a40ce0e37164523849166b"
+    },
+    {
+      "path": "aspnetcore/src/submodules/MessagePack-CSharp",
+      "remoteUri": "https://github.com/aspnet/MessagePack-CSharp.git",
+      "commitSha": "9aeb12b9bdb024512ffe2e4bddfa2785dca6e39e"
+    },
+    {
+      "path": "nuget-client/submodules/NuGet.Build.Localization",
+      "remoteUri": "https://github.com/NuGet/NuGet.Build.Localization.git",
+      "commitSha": "f15db7b7c6f5affbea268632ef8333d2687c8031"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/abstractions-xunit",
+      "remoteUri": "https://github.com/xunit/abstractions.xunit",
+      "commitSha": "b75d54d73b141709f805c2001b16f3dd4d71539d"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/application-insights",
+      "remoteUri": "https://github.com/microsoft/ApplicationInsights-dotnet",
+      "commitSha": "2faa7e8b157a431daa2e71785d68abd5fa817b53"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/azure-activedirectory-identitymodel-extensions-for-dotnet",
+      "remoteUri": "https://github.com/AzureAD/azure-activedirectory-identitymodel-extensions-for-dotnet.git",
+      "commitSha": "e67b25be77532af9ba405670b34b4d263d505fde"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/cssparser",
+      "remoteUri": "https://github.com/dotnet/cssparser",
+      "commitSha": "0d59611784841735a7778a67aa6e9d8d000c861f"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/docker-creds-provider",
+      "remoteUri": "https://github.com/mthalman/docker-creds-provider",
+      "commitSha": "6e1ecd0a80755f9f0e88dc23b98b52f51a77c65e"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/humanizer",
+      "remoteUri": "https://github.com/Humanizr/Humanizer",
+      "commitSha": "3ebc38de585fc641a04b0e78ed69468453b0f8a1"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/MSBuildLocator",
+      "remoteUri": "https://github.com/microsoft/MSBuildLocator",
+      "commitSha": "6235ee4484ceb8f9db32826ae252b0a2aad0955e"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/newtonsoft-json",
+      "remoteUri": "https://github.com/JamesNK/Newtonsoft.Json.git",
+      "commitSha": "0a2e291c0d9c0c7675d445703e51750363a549ef"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/spectre-console",
+      "remoteUri": "https://github.com/spectreconsole/spectre.console",
+      "commitSha": "68fcfe0de4c0602b1c4d4c3cf58ea70e9f06388c"
+    },
+    {
+      "path": "source-build-reference-packages/src/externalPackages/src/vs-solutionpersistence",
+      "remoteUri": "https://github.com/microsoft/vs-solutionpersistence.git",
+      "commitSha": "0b6f82a4073ce0ff0419991ea0cd6dd6898a51ac"
+    }
+  ]
 }
\ No newline at end of file