[repro/9a115ac2-92e2-4825-ba94-acbd844fb20e] Source code updates from maestro-auth-test/msbuild

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

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'

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">

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 -->

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));