Merge branch 'release/9.0.3xx' into merge/release/9.0.1xx-to-release/9.0.3xx

Author: DonnaChen888

eng/Version.Details.xml

@@ -426,34 +426,34 @@
       <Uri>https://github.com/dotnet/deployment-tools</Uri>
       <Sha>b2d5c0c5841de4bc036ef4c84b5db3532504e5f3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.Build.Tasks.Git" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.SourceLink.Common" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.SourceLink.GitHub" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.SourceLink.GitLab" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.SourceLink.Bitbucket.Git" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.24617.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.sourcelink" Version="9.0.0-beta.25564.5">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>4e176206614b345352885b55491aeb51bf77526b</Sha>
+      <Sha>657ade4711e607cc4759e89e0943aa1ca8aadc63</Sha>
       <SourceBuild RepoName="sourcelink" ManagedOnly="true" />
     </Dependency>
     <!-- Intermediate is necessary for source build. -->

eng/Versions.props

@@ -6,7 +6,7 @@
     <VersionMajor>9</VersionMajor>
     <VersionMinor>0</VersionMinor>
     <VersionSDKMinor>3</VersionSDKMinor>
-    <VersionFeature>08</VersionFeature>
+    <VersionFeature>09</VersionFeature>
     <!-- This property powers the SdkAnalysisLevel property in end-user MSBuild code.
          It should always be the hundreds-value of the current SDK version, never any
          preview version components or anything else. E.g. 8.0.100, 9.0.300, etc. -->
@@ -35,7 +35,7 @@
     <VersionFeature50>17</VersionFeature50>
     <VersionFeature60>36</VersionFeature60>
     <VersionFeature70>20</VersionFeature70>
-    <VersionFeature80>$([MSBuild]::Add($(VersionFeature), 15))</VersionFeature80>
+    <VersionFeature80>$([MSBuild]::Add($(VersionFeature), 14))</VersionFeature80>
     <!-- Should be kept in sync with VersionFeature70. It should match the version of Microsoft.NET.ILLink.Tasks
          referenced by the same 7.0 SDK that references the 7.0.VersionFeature70 runtime pack. -->
     <_NET70ILLinkPackVersion>7.0.100-1.23211.1</_NET70ILLinkPackVersion>
@@ -279,12 +279,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/sourcelink -->
-    <MicrosoftBuildTasksGitVersion>9.0.0-beta.24617.1</MicrosoftBuildTasksGitVersion>
-    <MicrosoftSourceLinkCommonVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkCommonVersion>
-    <MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkAzureReposGitVersion>
-    <MicrosoftSourceLinkGitHubVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkGitHubVersion>
-    <MicrosoftSourceLinkGitLabVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkGitLabVersion>
-    <MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.24617.1</MicrosoftSourceLinkBitbucketGitVersion>
+    <MicrosoftBuildTasksGitVersion>9.0.0-beta.25564.5</MicrosoftBuildTasksGitVersion>
+    <MicrosoftSourceLinkCommonVersion>9.0.0-beta.25564.5</MicrosoftSourceLinkCommonVersion>
+    <MicrosoftSourceLinkAzureReposGitVersion>9.0.0-beta.25564.5</MicrosoftSourceLinkAzureReposGitVersion>
+    <MicrosoftSourceLinkGitHubVersion>9.0.0-beta.25564.5</MicrosoftSourceLinkGitHubVersion>
+    <MicrosoftSourceLinkGitLabVersion>9.0.0-beta.25564.5</MicrosoftSourceLinkGitLabVersion>
+    <MicrosoftSourceLinkBitbucketGitVersion>9.0.0-beta.25564.5</MicrosoftSourceLinkBitbucketGitVersion>
   </PropertyGroup>
   <!-- Get .NET Framework reference assemblies from NuGet packages -->
   <PropertyGroup>

eng/common/tools.ps1

@@ -547,19 +547,25 @@ function LocateVisualStudio([object]$vsRequirements = $null){
     })
   }
 
-  if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
+  if (!$vsRequirements) {
+    if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
+      $vsRequirements = $GlobalJson.tools.vs
+    } else {
+      $vsRequirements = $null
+    }
+  }
   $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')
 
   if (!$excludePrereleaseVS) {
     $args += '-prerelease'
   }
 
-  if (Get-Member -InputObject $vsRequirements -Name 'version') {
+  if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
     $args += '-version'
     $args += $vsRequirements.version
   }
 
-  if (Get-Member -InputObject $vsRequirements -Name 'components') {
+  if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
     foreach ($component in $vsRequirements.components) {
       $args += '-requires'
       $args += $component