[VMR] Codeflow 7ba32e7-7ba32e7

[[ commit created by automation ]]

Author: dotnet-maestro[bot]

eng/Build.props

@@ -56,14 +56,14 @@
                       $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj;
                       " />
 
-    <!-- In the VMR, we don't build the native ANCM bits in pass 1 -->
+    <!-- In the .NET product build mode, don't build the native ANCM bits in pass 1 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Installers\**\*.vcxproj;
                       "
                       Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " />
 
 
-    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the VMR, we build it in pass 2 -->
+    <!-- This project requires inputs from x64, x86, and arm64 on Windows - therefore in the .NET product build mode, build it in pass 2 -->
     <ProjectToExclude Include="
                       $(RepoRoot)src\Servers\IIS/IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj;
                       "
@@ -83,7 +83,7 @@
         </ProjectToBuild>
       </ItemGroup>
     </When>
-    <!-- Projects to build in VMR build pass 2 -->
+    <!-- Projects to build in .NET product build pass 2 -->
     <When Condition="'$(DotNetBuildPass)' == '2'">
       <ItemGroup Condition=" '$(DotNetBuild)' == 'true' AND '$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' == 'x64' ">
         <!-- Build Hosting Bundle -->
@@ -264,7 +264,7 @@
         <_VcxTargetPlatform Condition="'$(TargetArchitecture)' == 'arm64'">ARM64</_VcxTargetPlatform>
       </PropertyGroup>
 
-      <!-- In the VMR, we build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
+      <!-- In .NET product build mode, build the installers entirely via HostingBundle ProjectReferences in pass 2 -->
       <ItemGroup Condition="'$(DotNetBuild)' != 'true' and '$(_BuildWindowsInstallers)' == 'true' ">
         <!-- Build the ANCM custom action -->
         <InstallerProject Include="$(RepoRoot)src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj" AdditionalProperties="Platform=x64" />

eng/Common.props

@@ -11,7 +11,7 @@
 
     <TargetRuntimeIdentifier Condition="'$(TargetRuntimeIdentifier)' == ''">$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
     <PortableBuild Condition="'$(PortableBuild)' == ''">true</PortableBuild>
-    <DefaultAppHostRuntimeIdentifier Condition=" '$(DotNetBuild)' == 'true' ">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
+    <DefaultAppHostRuntimeIdentifier Condition="'$(DotNetBuild)' == 'true'">$(TargetRuntimeIdentifier)</DefaultAppHostRuntimeIdentifier>
 
     <BuildNodeJS>$(BuildNodeJSUnlessSourcebuild)</BuildNodeJS>
     <BuildNodeJS Condition="'$(DotNetBuildSourceOnly)' == 'true'">false</BuildNodeJS>
@@ -44,8 +44,8 @@
       - If we're building outside of the VMR, publish these assets from the Windows job.
       - If we're building inside the VMR, publish these assets from whichever job is producing non-RID-specific artifacts.
     -->
-    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildOrchestrator)' != 'true')
-                                                or ('$(DotNetBuildOrchestrator)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
+    <PublishAllBuildsAssetsInThisJob Condition="('$(OS)' == 'Windows_NT' and '$(DotNetBuildFromVMR)' != 'true')
+                                                or ('$(DotNetBuildFromVMR)' == 'true' and '$(EnableDefaultRidSpecificArtifacts)' != 'true'
                                                     and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1'))">true</PublishAllBuildsAssetsInThisJob>
     <PublishInstallerBaseVersion Condition="'$(PublishInstallerBaseVersion)' == ''">$(PublishAllBuildsAssetsInThisJob)</PublishInstallerBaseVersion>
   </PropertyGroup>

eng/Dependencies.props

@@ -258,4 +258,23 @@ and are generated based on the last package release.
           Condition=" $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Runtime.')) or $([System.String]::new('%(Identity)').StartsWith('Microsoft.NETCore.App.Crossgen2.'))">$(MicrosoftNETCoreAppRefVersion)</Version>
     </LatestPackageReference>
   </ItemGroup>
+
+  <!-- Replicates the same overriding of versions that occurs on Roslyn package versions for source only builds -->
+  <ItemGroup Label="Source only build overrides" Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Common">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp">
+      <Version>$(Analyzer_MicrosoftCodeAnalysisCSharpVersion)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces">
+      <Version>$(Analyzer_MicrosoftCodeAnalysisCSharpWorkspacesVersion)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.ExternalAccess.AspNetCore">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+    <LatestPackageReference Update="Microsoft.CodeAnalysis.Razor">
+      <Version>$(MicrosoftCodeAnalysisVersion_LatestVS)</Version>
+    </LatestPackageReference>
+  </ItemGroup>
 </Project>

eng/Publishing.props

@@ -1,15 +1,14 @@
 <Project>
+
   <PropertyGroup>
     <ProducesDotNetReleaseShippingAssets>true</ProducesDotNetReleaseShippingAssets>
 
-    <!-- Do not push .nupkg files from Linux and macOS builds. They'll be packed up separately and signed on Windows.
-         Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
-         the nupkgs pushed. Do not do this if building from source, since we want the source build intermediate package
-         to be published. Use DotNetBuildRepo is only set in the internal source build,
-         and Build.proj is invoked from the wrapper build. -->
+    <!-- Don't sign and publish rid agnostic nuget packages from other builds than windows when not building
+         inside the VMR. Do not remove if post build sign is true, as we avoid the xplat codesign jobs, and need to have
+         the nupkgs pushed. -->
     <EnableDefaultArtifacts Condition="'$(OS)' != 'Windows_NT' and
                                        '$(PostBuildSign)' != 'true' and
-                                       '$(DotNetBuildRepo)' != 'true'">false</EnableDefaultArtifacts>
+                                       '$(DotNetBuild)' != 'true'">false</EnableDefaultArtifacts>
 
     <!-- This avoids creating VS.*.symbols.nupkg packages that are identical to the original package. -->
     <AutoGenerateSymbolPackages>false</AutoGenerateSymbolPackages>

eng/SharedFramework.External.props

@@ -43,6 +43,7 @@
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Options"                                 Version="$(MicrosoftExtensionsOptionsVersion)" />
     <ExternalAspNetCoreAppReference Include="Microsoft.Extensions.Primitives"                              Version="$(MicrosoftExtensionsPrimitivesVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Security.Cryptography.Xml"                             Version="$(SystemSecurityCryptographyXmlVersion)" />
+    <ExternalAspNetCoreAppReference Include="System.Threading.AccessControl"                               Version="$(SystemThreadingAccessControlVersion)" />
     <ExternalAspNetCoreAppReference Include="System.Threading.RateLimiting"                                Version="$(SystemThreadingRateLimitingVersion)" />
 
     <!--

eng/build.ps1

@@ -102,6 +102,9 @@ Key for feed that can be used when downloading .NET runtimes and SDKs
 .PARAMETER ProductBuild
 Build the repository in product mode (short: -pb).
 
+.PARAMETER fromVMR
+Set when building from within the VMR.
+
 .EXAMPLE
 Building both native and managed projects.
 
@@ -203,6 +206,9 @@ param(
     [Alias('pb')]
     [switch]$ProductBuild,
 
+    # Intentionally lowercase as tools.ps1 depends on it
+    [switch]$fromVMR,
+
     # Capture the rest
     [Parameter(ValueFromRemainingArguments = $true)]
     [string[]]$MSBuildArguments
@@ -282,7 +288,8 @@ $MSBuildArguments += "/p:Publish=$Publish"
 $MSBuildArguments += "/p:TargetArchitecture=$Architecture"
 $MSBuildArguments += "/p:TargetOsName=win"
 
-if ($ProductBuild) { $MSBuildArguments += "/p:DotNetBuildRepo=$ProductBuild" }
+if ($ProductBuild) { $MSBuildArguments += "/p:DotNetBuild=$ProductBuild" }
+if ($fromVMR) { $MSBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" }
 
 if (-not $Configuration) {
     $Configuration = if ($CI) { 'Release' } else { 'Debug' }
@@ -298,7 +305,8 @@ if ($RuntimeSourceFeed -or $RuntimeSourceFeedKey) {
     $ToolsetBuildArguments += $runtimeFeedArg
     $ToolsetBuildArguments += $runtimeFeedKeyArg
 }
-if ($ProductBuild) { $ToolsetBuildArguments += "/p:DotNetBuildRepo=$ProductBuild" }
+if ($ProductBuild) { $ToolsetBuildArguments += "/p:DotNetBuild=$ProductBuild" }
+if ($fromVMR) { $ToolsetBuildArguments += "/p:DotNetBuildFromVMR=$fromVMR" }
 
 # Split build categories between dotnet msbuild and desktop msbuild. Use desktop msbuild as little as possible.
 [string[]]$dotnetBuildArguments = ''

eng/build.sh

@@ -37,6 +37,7 @@ runtime_source_feed=''
 runtime_source_feed_key=''
 source_build=''
 product_build=''
+from_vmr=''
 
 if [ "$(uname)" = "Darwin" ]; then
     target_os_name='osx'
@@ -92,6 +93,7 @@ Options:
 
     --sourceBuild|-sb                 Build the repository in source-only mode.
     --productBuild|-pb                Build the repository in product-build mode.
+    --fromVMR                         Set when building from within the VMR.
 
 Description:
     This build script installs required tools and runs an MSBuild command on this repository
@@ -259,6 +261,9 @@ while [[ $# -gt 0 ]]; do
         -productbuild|-product-build|-pb)
             product_build=true
             ;;
+        -fromvmr|-from-vmr)
+            from_vmr=true
+            ;;
         *)
             msbuild_args[${#msbuild_args[*]}]="$1"
             ;;
@@ -316,8 +321,9 @@ fi
 [ ! -z "$build_nodejs" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildNodeJSUnlessSourcebuild=$build_nodejs"
 [ ! -z "$build_managed" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildManaged=$build_managed"
 [ ! -z "$build_installers" ] && msbuild_args[${#msbuild_args[*]}]="-p:BuildInstallers=$build_installers"
-[ ! -z "$product_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildRepo=$product_build"
+[ ! -z "$product_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuild=$product_build"
 [ ! -z "$source_build" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildSourceOnly=$source_build"
+[ ! -z "$from_vmr" ] && msbuild_args[${#msbuild_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr"
 
 # Run restore by default unless --no-restore or --no-build was specified.
 [ -z "$run_restore" ] && run_restore=true
@@ -354,8 +360,9 @@ if [ ! -z "$runtime_source_feed$runtime_source_feed_key" ]; then
     toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedArg
     toolset_build_args[${#toolset_build_args[*]}]=$runtimeFeedKeyArg
 fi
-[ ! -z "$product_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildRepo=$product_build"
+[ ! -z "$product_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuild=$product_build"
 [ ! -z "$source_build" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildSourceOnly=$source_build"
+[ ! -z "$from_vmr" ] && toolset_build_args[${#toolset_build_args[*]}]="-p:DotNetBuildFromVMR=$from_vmr"
 
 # Initialize global variables need to be set before the import of Arcade is imported
 restore=$run_restore

eng/configure-toolset.sh

@@ -2,7 +2,7 @@
 # We could potentially try to find an existing installation that has all the required runtimes,
 # but it's unlikely one will be available.
 
-if [ "${DotNetBuild:-false}" = false ]; then
+if [ "$product_build" = false ]; then
     use_installed_dotnet_cli="false"
 fi
 

eng/tools/GenerateFiles/Directory.Build.targets.in

@@ -64,7 +64,7 @@
 
   <ItemGroup>
     <!-- Use the same NETCore shared framework as repo built against except when building product code in servicing. -->
-    <!-- We cannot use live shims when building tool packs in VMR - only package for current arch is available. -->
+    <!-- We cannot use live shims when building tool packs in the .NET product mode as only packages for the current arch are available. -->
     <KnownFrameworkReference Update="Microsoft.NETCore.App" Condition=" '$(DotNetBuild)' != 'true' OR '$(PackAsToolShimRuntimeIdentifiers)' == '' ">
       <LatestRuntimeFrameworkVersion
           Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</LatestRuntimeFrameworkVersion>
@@ -84,7 +84,7 @@
       <RuntimePackRuntimeIdentifiers Condition="'$(DotNetBuild)' == 'true'">%(RuntimePackRuntimeIdentifiers);$(TargetRuntimeIdentifier)</RuntimePackRuntimeIdentifiers>
     </KnownFrameworkReference>
 
-    <!-- We cannot use live shims when building tool packs in VMR - only package for current arch is available. -->
+    <!-- We cannot use live shims when building tool packs in .NET product build mode as only packages for the current arch are available. -->
     <KnownAppHostPack Update="Microsoft.NETCore.App" Condition=" '$(DotNetBuild)' != 'true' OR '$(PackAsToolShimRuntimeIdentifiers)' == '' ">
       <AppHostPackVersion
         Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRefVersion}</AppHostPackVersion>

src/Framework/App.Ref.Internal/src/Microsoft.AspNetCore.App.Ref.Internal.csproj

@@ -11,6 +11,7 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IncludeSymbols>false</IncludeSymbols>
     <NoPackageAnalysis>true</NoPackageAnalysis>
+    <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
   </PropertyGroup>
 
 </Project>