Merge branch 'main' into dmkorolev/owin/environment-allocations

Author: DeagleGross

.azure/pipelines/ci-public.yml

@@ -653,6 +653,8 @@ stages:
           displayName: Update submodules
         - script: ./restore.cmd
           displayName: Run restore.cmd
+        - powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false"
+          displayName: Build (No NodeJS)
         - script: npm run build
           displayName: Build JS
         - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
@@ -665,6 +667,7 @@ stages:
                   -NoBuild
                   -NoBuildDeps
                   -configuration Release
+                  -bl
           displayName: Run project template tests
 
         artifacts:

.azure/pipelines/ci.yml

@@ -27,12 +27,6 @@ parameters:
   default: false
   displayName: Skip tests?
   type: boolean
-# Choose whether to enable binlogs when running pipeline manually.
-# Binary logs are enabled by default in public builds and aren't designed to be disabled there.
-- name: produceBinlogs
-  default: false
-  displayName: Produce binlogs?
-  type: boolean
 
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -63,39 +57,23 @@ variables:
   # The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
   - name: _PublishArgs
     value: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
-  - ${{ if ne(parameters.produceBinlogs, 'true') }}:
-    # Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
-    - name: WindowsArm64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows86LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsSignLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsInstallersLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsArm64InstallersLogArgs
-      value: -ExcludeCIBinaryLog
 - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
   - name: _BuildArgs
     value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
   - name: _PublishArgs
     value: ''
-- ${{ if or(in(variables['Build.Reason'], 'PullRequest'), eq(parameters.produceBinlogs, 'true')) }}:
-  # Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
-  - name: WindowsArm64LogArgs
-    value: /bl:artifacts/log/Release/Build.arm64.binlog
-  - name: Windows64LogArgs
-    value: /bl:artifacts/log/Release/Build.x64.binlog
-  - name: Windows86LogArgs
-    value: -ExcludeCIBinaryLog
-  - name: WindowsSignLogArgs
-    value: /bl:artifacts/log/Release/Build.CodeSign.binlog
-  - name: WindowsInstallersLogArgs
-    value: /bl:artifacts/log/Release/Build.Installers.binlog
-  - name: WindowsArm64InstallersLogArgs
-    value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
+- name: WindowsArm64LogArgs
+  value: /bl:artifacts/log/Release/Build.arm64.binlog
+- name: Windows64LogArgs
+  value: /bl:artifacts/log/Release/Build.x64.binlog
+- name: Windows86LogArgs
+  value: -ExcludeCIBinaryLog
+- name: WindowsSignLogArgs
+  value: /bl:artifacts/log/Release/Build.CodeSign.binlog
+- name: WindowsInstallersLogArgs
+  value: /bl:artifacts/log/Release/Build.Installers.binlog
+- name: WindowsArm64InstallersLogArgs
+  value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
 - name: _InternalRuntimeDownloadArgs
   value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
          -RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -719,6 +697,8 @@ extends:
                 displayName: Update submodules
               - script: ./restore.cmd
                 displayName: Run restore.cmd
+              - script: ./eng/build.cmd -all -noBuildJava -noBuildNodeJS
+                displayName: Build (No NodeJS)
               - script: npm run build
                 displayName: Build JS
               - script: ./eng/build.cmd -all -noBuildJava -pack -c Debug

.globalconfig

@@ -12,3 +12,20 @@ dotnet_diagnostic.CA1310.severity = error
 
 # TODO: remove this - https://github.com/dotnet/aspnetcore/issues/47912
 dotnet_diagnostic.EnableGenerateDocumentationFile.severity = none
+
+# Referencing types that are defined in M.CA.Workspaces is not appropriate
+# for analyzers or source generators that might be invoked from a command
+# line build because editor-specific types in M.CA.Workspaces are not
+# available in the command line. By default, Roslyn enables RS1038
+# which does a strict check and throws if a reference to M.CA.Workspaces
+# is included in the assembly. Here, we opt for a more relaxed check that
+# validates if M.CA.Workspace type references are included in the specific
+# Roslyn components that might be loaded in command line builds. We do this
+# because we ship editor-specific components, like the routing completion
+# providers, in the shared framework and want to avoid the analyzers warning
+# on the M.CA.Workspaces reference required for their components even though
+# they are never loaded in command line builds. Note: the "relaxed" check that is
+# enabled here will actually examine the types loaded by each individually analyzer
+# to see if they are from a Workspaces assembly so it will take longer than the
+# greedier (and stricter) check for references overall.
+roslyn_correctness.assembly_reference_validation = relaxed

eng/AfterSolutionBuild.targets

@@ -1,12 +1,12 @@
 <Project>
 
+  <Import Project="Common.props" />
   <Import Project="tools\RepoTasks\RepoTasks.tasks" />
   <Import Project="SharedFramework.External.props" />
   <Import Project="SharedFramework.Local.props" />
 
   <!-- This is temporary until we can use FrameworkReference to build our own packages. -->
-  <Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec" AfterTargets="Pack"
-      Condition=" '$(MSBuildRuntimeType)' == 'core' ">
+  <Target Name="RemoveSharedFrameworkOnlyRefsFromNuspec" AfterTargets="Pack" Condition="'$(BuildManaged)' == 'true'">
     <ItemGroup>
       <_BuildOutput Include="$(ArtifactsShippingPackagesDir)*.nupkg"
                     Exclude="$(ArtifactsShippingPackagesDir)*.symbols.nupkg" />