[main] Source code updates from dotnet/dotnet

Arcade.slnx

@@ -61,7 +61,6 @@
   <Project Path="src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj" />
   <Project Path="src/Microsoft.DotNet.GenAPI/Microsoft.DotNet.GenAPI.csproj" />
   <Project Path="src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj" />
-  <Project Path="src/Microsoft.DotNet.Git.IssueManager/src/Microsoft.DotNet.Git.IssueManager.csproj" />
   <Project Path="src/Microsoft.DotNet.Internal.DependencyInjection.Testing/Microsoft.DotNet.Internal.DependencyInjection.Testing.csproj" />
   <Project Path="src/Microsoft.DotNet.Internal.SymbolHelper/Microsoft.DotNet.Internal.SymbolHelper.csproj" />
   <Project Path="src/Microsoft.DotNet.MacOsPkg/Cli/Microsoft.DotNet.MacOsPkg.Cli.csproj" />
@@ -73,7 +72,6 @@
   <Project Path="src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj" />
   <Project Path="src/Microsoft.DotNet.SourceBuild/tasks/Microsoft.DotNet.SourceBuild.Tasks.csproj" />
   <Project Path="src/Microsoft.DotNet.StrongName/Microsoft.DotNet.StrongName.csproj" />
-  <Project Path="src/Microsoft.DotNet.Tar/Microsoft.DotNet.Tar.csproj" />
   <Project Path="src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj" />
   <Project Path="src/Microsoft.DotNet.XUnitAssert/src/Microsoft.DotNet.XUnitAssert.csproj" />
   <Project Path="src/Microsoft.DotNet.XUnitConsoleRunner/src/Microsoft.DotNet.XUnitConsoleRunner.csproj" />

Directory.Packages.props

@@ -28,16 +28,10 @@
     <PackageVersion Include="Microsoft.DotNet.DarcLib" Version="$(MicrosoftDotNetDarcLibVersion)" />
     <!-- command-line-api -->
     <PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
-    <!-- maintenance-packages -->
-    <PackageVersion Include="Microsoft.Bcl.HashCode" Version="$(MicrosoftBclHashCodeVersion)" />
-    <PackageVersion Include="Microsoft.IO.Redist" Version="$(MicrosoftIORedistVersion)" />
-    <PackageVersion Include="System.Memory" Version="$(SystemMemoryVersion)" />
     <!-- corefx -->
     <PackageVersion Include="System.Runtime.InteropServices.RuntimeInformation" Version="$(SystemRuntimeInteropServicesRuntimeInformation)" />
     <!-- deployment-tools -->
     <PackageVersion Include="Microsoft.Deployment.DotNet.Releases" Version="$(MicrosoftDeploymentDotNetReleasesVersion)" />
-    <!-- dotnet-symuploader -->
-    <PackageVersion Include="Microsoft.SymbolUploader" Version="$(MicrosoftSymbolUploaderVersion)" />
     <!-- symreader-converter -->
     <PackageVersion Include="Microsoft.DiaSymReader.Converter" Version="$(MicrosoftDiaSymReaderConverterVersion)" />
     <!-- diagnostics -->
@@ -56,22 +50,16 @@
     <!-- roslyn -->
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpVersion)" />
     <!-- runtime -->
-    <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="$(MicrosoftBclAsyncInterfacesVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(MicrosoftExtensionsDependencyInjectionAbstractionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftExtensionsDependencyInjectionVersion)" />
     <PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="$(MicrosoftExtensionsHttpVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileProviders.Abstractions" Version="$(MicrosoftExtensionsFileProvidersAbstractionsVersion)" />
     <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="$(MicrosoftExtensionsFileSystemGlobbingVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsoleVersion)" />
-    <PackageVersion Include="System.Collections.Immutable" Version="$(SystemCollectionsImmutableVersion)" />
     <PackageVersion Include="System.Composition" Version="$(SystemCompositionVersion)" />
     <PackageVersion Include="System.IO.Packaging" Version="$(SystemIOPackagingVersion)" />
-    <PackageVersion Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
     <PackageVersion Include="System.Security.Cryptography.Xml" Version="$(SystemSecurityCryptographyXmlVersion)" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
-    <PackageVersion Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
-    <PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
     <!-- sdk -->
     <PackageVersion Include="Microsoft.NET.Sdk.WorkloadManifestReader" Version="$(MicrosoftNetSdkWorkloadManifestReaderVersion)" />
   </ItemGroup>
@@ -90,14 +78,14 @@
     <PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="2.3.0" />
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.23.0" />
     <PackageVersion Include="Microsoft.Data.OData" Version="5.8.4" />
-    <PackageVersion Include="Microsoft.DataServices.Client" Version="$(MicrosoftDataServicesClientVersion)" />
+    <PackageVersion Include="Microsoft.Data.Services.Client" Version="$(MicrosoftDataServicesClientVersion)" />
     <PackageVersion Include="Microsoft.Diagnostics.Runtime" Version="1.0.5" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.73.1" />
     <PackageVersion Include="Microsoft.OpenApi" Version="1.3.2" />
     <PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.3.2" />
     <PackageVersion Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" />
     <PackageVersion Include="Microsoft.WixToolset.Sdk" Version="$(MicrosoftWixToolsetSdkVersion)" />
-    <PackageVersion Include="Microsoft.VisualStudio.OLE.Interop" Version="7.10.6071" />
+    <PackageVersion Include="Microsoft.VisualStudio.OLE.Interop" Version="17.14.40260" />
     <PackageVersion Include="Mono.Options" Version="5.3.0.1" />
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />

Documentation/HowToCreatePackages.md

@@ -32,9 +32,9 @@ One of the goals of Arcade is to be a vehicle to provide code sharing. One of th
 
 - If your package produces binaries that need to be signed, make sure to mark it as <IsPackable>true</IsPackable> or check the SignTool [documentation](../src/Microsoft.DotNet.SignTool/README.md) to see how to sign specific files.
 
-- If the package needs to target a version of .NET Framework we recommend you to use the Arcade defined version, which is stored in the $(NetFxTfm) property. For instance:
+- If the package needs to target a version of .NET Framework we recommend you to use the Arcade defined version, which is stored in the $(NetFrameworkMinimum), $(NetFrameworkCurrent) or $(NetFrameworkToolCurrent) properties. For instance:
 
-  `<TargetFrameworks>$(NetFxTfm);netcoreapp2.0</TargetFrameworks>`
+  `<TargetFrameworks>$(NetFrameworkMinimum);netcoreapp2.0</TargetFrameworks>`
 
 - There is no requirement to create a separate `.nuspec` file for the package. The package information will be automatically extracted from the `.csproj` file.
 

azure-pipelines-pr.yml

@@ -133,7 +133,6 @@ stages:
         publish:
           logs:
             name: Logs_Test_$(Agent.OS)_$(_BuildConfig)_$(_Testing)
-        download: true
       workspace:
         clean: all
       jobs:
@@ -151,6 +150,13 @@ stages:
         - checkout: self
           clean: true
         steps:
+        - script: eng\common\cibuild.cmd
+            -configuration $(_BuildConfig)
+            -prepareMachine
+            $(_InternalBuildArgs)
+            /p:Test=false
+          displayName: Windows Build / Publish
+
         - task: PowerShell@2
           displayName: sdk-task verification
           inputs:
@@ -163,6 +169,7 @@ stages:
               /p:SymbolPublishingExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt'
               /p:Configuration=Release
               /p:PublishToMSDL=false
+
         - powershell: eng\common\build.ps1
             -configuration $(_BuildConfig)
             -prepareMachine
@@ -193,6 +200,12 @@ stages:
         - checkout: self
           clean: true
         steps:
+        - script: eng/common/cibuild.sh
+            --configuration $(_BuildConfig)
+            --prepareMachine
+            /p:Test=false
+          displayName: Unix Build / Publish
+
         - script: eng/common/build.sh
             --configuration $(_BuildConfig)
             --prepareMachine

eng/BuildTask.targets

@@ -1,7 +1,5 @@
 <Project>
 
-  <Import Project="BuildTask.Packages.props"/>
-
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsPackable>true</IsPackable>
@@ -10,8 +8,10 @@
     <!-- Build Tasks should have this set per https://github.com/dotnet/arcade/blob/master/Documentation/CorePackages/Versioning.md#recommended-settings -->
     <AutoGenerateAssemblyVersion>true</AutoGenerateAssemblyVersion>
     <BuildTaskTargetFolder Condition="'$(BuildTaskTargetFolder)' == ''">tools</BuildTaskTargetFolder>
-    <PackTasks Condition="'$(PackTasks)' == ''">true</PackTasks>
-    <TargetsForTfmSpecificContentInPackage Condition="'$(PackTasks)' == 'true'">$(TargetsForTfmSpecificContentInPackage);_AddBuildOutputToPackageCore;_AddBuildOutputToPackageDesktop</TargetsForTfmSpecificContentInPackage>
+    <BuildTaskTargetTfmSpecificFolder Condition="'$(BuildTaskTargetTfmSpecificFolder)' == ''">net</BuildTaskTargetTfmSpecificFolder>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);_AddBuildOutputToPackage</TargetsForTfmSpecificContentInPackage>
+    <!-- Invoke publish before pack as packaging depends on published outputs. -->
+    <BeforePack Condition="'$(_SuppressAllTargets)' != 'true'">$(BeforePack);Publish</BeforePack>
   </PropertyGroup>
 
   <!--
@@ -41,7 +41,7 @@
   </ItemGroup>
 
   <!-- Don't include assemblies that are provided by the SDK, next to MSBuild. -->
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(SkipSDKInboxPublishExcludes)' != 'true'">
+  <ItemGroup>
     <PackageReference Update="Newtonsoft.Json" Publish="false" />
     <PackageReference Update="NuGet.Commands" Publish="false" />
     <PackageReference Update="NuGet.Common" Publish="false" />
@@ -55,24 +55,6 @@
     <PackageReference Update="System.Text.Encoding.CodePages" Publish="false" />
   </ItemGroup>
 
-  <!-- Don't include assemblies that are inbox in Desktop MSBuild -->
-  <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Publish="false" />
-    <PackageReference Update="System.Buffers" Publish="false" />
-    <PackageReference Update="System.Collections.Immutable" Publish="false" />
-    <PackageReference Update="System.Memory" Publish="false" />
-    <PackageReference Update="System.Numerics.Vectors" Publish="false" />
-    <PackageReference Update="System.Reflection.Metadata" Publish="false" />
-    <PackageReference Update="System.Reflection.MetadataLoadContext" Publish="false" />
-    <PackageReference Update="System.Runtime.CompilerServices.Unsafe" Publish="false" />
-    <PackageReference Update="System.Text.Encodings.Web" Publish="false" />
-    <PackageReference Update="System.Text.Json" Publish="false" />
-    <PackageReference Update="System.Threading.Channels" Publish="false" />
-    <PackageReference Update="System.Threading.Tasks.Dataflow" Publish="false" />
-    <PackageReference Update="System.Threading.Tasks.Extensions" Publish="false" />
-    <PackageReference Update="System.ValueTuple" Publish="false" />
-  </ItemGroup>
-
   <ItemGroup>
     <!--
       Update all PackageReference items to default Publish to true.
@@ -82,34 +64,14 @@
       <Publish Condition="'%(PackageReference.Publish)' == ''">true</Publish>
       <ExcludeAssets Condition="'%(PackageReference.Publish)' == 'false'">runtime</ExcludeAssets>
     </PackageReference>
-
-    <!--
-      Update all Reference items to have Pack="false"
-      This removes the frameworkDependency nodes from the generated nuspec
-    -->
-    <Reference Update="@(Reference)"
-               Pack="false" />
   </ItemGroup>
 
-  <!-- Publish .NET Core assets and include them in the package under $(BuildTaskTargetFolder) directory. -->
-  <Target Name="_AddBuildOutputToPackageCore" DependsOnTargets="Publish" Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">
-    <PropertyGroup>
-      <BuildTaskTargetTfmSpecificFolder Condition="'$(BuildTaskTargetTfmSpecificFolder)' == ''">net</BuildTaskTargetTfmSpecificFolder>
-    </PropertyGroup>
+  <!-- Publish assets and include them in the package under $(BuildTaskTargetFolder) directory. -->
+  <Target Name="_AddBuildOutputToPackage">
     <ItemGroup>
       <TfmSpecificPackageFile Include="$(PublishDir)**"
                               PackagePath="$(BuildTaskTargetFolder)/$(BuildTaskTargetTfmSpecificFolder)/%(RecursiveDir)%(FileName)%(Extension)"/>
     </ItemGroup>
   </Target>
 
-  <!-- Include .NET Framework build outputs in the package under $(BuildTaskTargetFolder) directory. -->
-  <Target Name="_AddBuildOutputToPackageDesktop" Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
-    <PropertyGroup>
-      <BuildTaskTargetTfmSpecificFolder Condition="'$(BuildTaskTargetTfmSpecificFolder)' == ''">netframework</BuildTaskTargetTfmSpecificFolder>
-    </PropertyGroup>
-    <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)**" PackagePath="$(BuildTaskTargetFolder)/$(BuildTaskTargetTfmSpecificFolder)/%(RecursiveDir)%(FileName)%(Extension)"/>
-    </ItemGroup>
-  </Target>
-
 </Project>

eng/Microsoft.DotNet.SwaggerGenerator.MSBuild.InTree.targets

@@ -2,12 +2,7 @@
 
   <PropertyGroup>
     <MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'Microsoft.DotNet.SwaggerGenerator', 'Microsoft.DotNet.SwaggerGenerator.MSBuild'))</MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory>$(ArtifactsBinDir)Microsoft.DotNet.SwaggerGenerator.MSBuild\$(Configuration)\</MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory>
-    <!-- Keep TFMs in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
-    <MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(BundledNETCoreAppTargetFramework)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildDirectory Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MicrosoftDotNetSwaggerGeneratorMSBuildBaseOutputDirectory)$(NetFrameworkToolCurrent)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
-    <!-- Swagger generator msbuild tasks should be invoked out-of-proc in this repository to avoid assembly lock issues. -->
-    <MicrosoftDotNetSwaggerGeneratorMSBuildTaskFactory>TaskHostFactory</MicrosoftDotNetSwaggerGeneratorMSBuildTaskFactory>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>$(ArtifactsBinDir)Microsoft.DotNet.SwaggerGenerator.MSBuild\$(Configuration)\</MicrosoftDotNetSwaggerGeneratorMSBuildDirectory>
     <!-- Make sure that the P2Ps are built before swagger generator targets are invoked. -->
     <GenerateSwaggerCodeDependsOn>ResolveProjectReferences</GenerateSwaggerCodeDependsOn>
   </PropertyGroup>
@@ -24,11 +19,7 @@
     <ProjectReference Include="$(MicrosoftDotNetSwaggerGeneratorMSBuildProjectDirectory)Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj"
                       ReferenceOutputAssembly="false"
                       PrivateAssets="all"
-                      Private="false">
-      <!-- Keep TFMs in sync with Microsoft.DotNet.SwaggerGenerator.MSBuild.csproj -->
-      <SetTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">TargetFramework=$(BundledNETCoreAppTargetFramework)</SetTargetFramework>
-      <SetTargetFramework Condition="'$(MSBuildRuntimeType)' != 'Core'">TargetFramework=$(NetFrameworkToolCurrent)</SetTargetFramework>
-    </ProjectReference>
+                      Private="false" />
   </ItemGroup>
 
 </Project>