Merge 'master' into dev/arcade-migration

# Conflicts:
#	BranchInfo.props
#	NuGet.config
#	dependencies.props
#	eng/Versions.props
#	src/pkg/packaging/Directory.Build.props
#	src/pkg/packaging/installers.proj

Commit migrated from https://github.com/dotnet/core-setup/commit/4a921a7effc7b1e3540c9038bcd6f414ec80af96

diff --cc src/installer/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj
Simple merge

diff --cc src/installer/pkg/packaging-tools/framework.dependency.targets
Simple merge

diff --cc src/installer/pkg/packaging/Directory.Build.props
index 498ef42,7d7d4d7..41742da
--- 1/src/installer/pkg/packaging/Directory.Build.props
--- 2/src/installer/pkg/packaging/dir.props
+++ b/src/installer/pkg/packaging/Directory.Build.props
@@@ -19,4 -20,20 +19,13 @@@
      <NetHostPublishRoot>$(IntermediateOutputRootPath)nethost/</NetHostPublishRoot>
    </PropertyGroup>
  
- </Project>
+   <PropertyGroup>
 -    <CombinedCompressedFile>dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension)</CombinedCompressedFile>
 -    <HostFxrCompressedFile>dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension)</HostFxrCompressedFile>
 -    <NetHostCompressedFile>dotnet-nethost-$(AppHostVersion)-$(PackageTargetRid)$(CompressedFileExtension)</NetHostCompressedFile>
 -    <SharedFrameworkCompressedFile>dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkCompressedFile>
 -    <SharedFrameworkSymbolsCompressedFile>dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkSymbolsCompressedFile>
 -  </PropertyGroup>
 -  <PropertyGroup>
+     <TargetingPackInstallerFile>$(AssetOutputPath)dotnet-targeting-pack-$(ProductMoniker)$(InstallerExtension)</TargetingPackInstallerFile>
+     <AppHostPackInstallerFile>$(AssetOutputPath)dotnet-apphost-pack-$(ProductMoniker)$(InstallerExtension)</AppHostPackInstallerFile>
+     <NetStandardProductBandVersion>2.1</NetStandardProductBandVersion>
+     <NetStandardProductMoniker>$(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)-$(PackageTargetRid)</NetStandardProductMoniker>
+     <NetStandardTargetingPackInstallerFile>$(AssetOutputPath)netstandard-targeting-pack-$(NetStandardProductMoniker)$(InstallerExtension)</NetStandardTargetingPackInstallerFile>
+     <WindowsDesktopSharedFrameworkInstallerFile>$(AssetOutputPath)windowsdesktop-runtime-$(ProductMoniker)$(InstallerExtension)</WindowsDesktopSharedFrameworkInstallerFile>
+     <WindowsDesktopTargetingPackInstallerFile>$(AssetOutputPath)windowsdesktop-targeting-pack-$(ProductMoniker)$(InstallerExtension)</WindowsDesktopTargetingPackInstallerFile>
+   </PropertyGroup>
+ </Project>

diff --cc src/installer/pkg/packaging/installers.proj
index 4f2b553,e520e4f..fb76b2e
--- 1/src/installer/pkg/packaging/installers.proj
--- 2/src/installer/pkg/packaging/dir.proj
+++ b/src/installer/pkg/packaging/installers.proj
@@@ -12,24 -12,11 +12,24 @@@
      </PackageTargets>
    </PropertyGroup>
  
 -  <Target Name="Build" DependsOnTargets="BuildInstallers;BuildCombinedInstallers" Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
 +  <Target Name="Build" DependsOnTargets="BuildDependencies;BuildInstallers;BuildCombinedInstallers" Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
    <Target Name="BuildInstallers" DependsOnTargets="$(PackageTargets)" Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
-   <Target Name="BuildCombinedInstallers" DependsOnTargets="GenerateCombinedInstallers" Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
+   <Target Name="BuildCombinedInstallers" DependsOnTargets="GenerateCombinedInstallers;GenerateVSNugetPackages" Condition="'$(DOTNET_BUILD_SKIP_PACKAGING)' != 'true'" />
  
 +  <!--
 +    To build installers, we need shared fx layouts to be built first. Call MSBuild on the
 +    requirements so that parallel MSBuild does the ordering work.
 +  -->
 +  <Target Name="BuildDependencies">
 +    <ItemGroup>
 +      <SharedFrameworkProject Include="$(SourceDir)pkg\projects\**\*.sfxproj" />
 +    </ItemGroup>
 +
 +    <MSBuild
 +      Projects="@(SharedFrameworkProject)"
 +      Targets="Build"/>
 +  </Target>
 +
    <Target Name="InitPackage">
      <ItemGroup>
        <OutDirs Include="$(SharedHostPublishRoot)" />
@@@ -206,4 -187,110 +206,83 @@@
  
    <Target Name="GenerateCombinedInstallers" DependsOnTargets="InitPackage;GenerateBundles" />
  
- </Project>
 -  <!-- Run the project-based installer creation infrastructure as well. -->
 -  <Target Name="GenerateProjectInstallers">
 -    <MSBuild Projects="..\projects\installer.builds" />
 -  </Target>
 -
 -  <Target Name="GenerateNugetPackages" DependsOnTargets="InitPackage" Condition="'$(UsePrebuiltPortableBinariesForInstallers)' == 'false'">
 -
 -    <ItemGroup>
 -      <!-- The list of packages we are servicing -->
 -      <PackageProjects Include="$(ProjectDir)src\managed\Microsoft.DotNet.PlatformAbstractions\Microsoft.DotNet.PlatformAbstractions.csproj" />
 -      <PackageProjects Include="$(ProjectDir)src\managed\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.csproj" />
 -      <PackageProjects Include="$(ProjectDir)src\managed\Microsoft.NET.HostModel\Microsoft.NET.HostModel.csproj" />
 -    </ItemGroup>
 -
 -    <ItemGroup Condition="'$(BuildAllPackages)' == 'true'">
 -      <!-- The list of packages we are not servicing -->
 -    </ItemGroup>
 -
 -    <PropertyGroup>
 -      <PackArgs>--no-restore --no-build --output $(PackageOutputPath)</PackArgs>
 -      <PackArgs>$(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging)</PackArgs>
 -    </PropertyGroup>
 -
 -    <Exec Command="$(DotnetToolCommand) pack %(PackageProjects.Identity) $(PackArgs)"
 -          Condition="'@(PackageProjects)' != ''" />
 -  </Target>
 -
+   <Target Name="GenerateVSNugetPackages"
+           Condition="'$(OS)' == 'Windows_NT' AND '$(TargetArchitecture)' != 'arm' AND '$(TargetArchitecture)' != 'arm64'"
+           DependsOnTargets="SetupVSNugetPackages;GenerateInstallers;GenerateProjectInstallers;GenerateCombinedInstallers"
+           Inputs="@(SdkMsiComponent->'%(MsiInstallerFile)');
+                     $(NuSpecFile);
+                     $(GenerateNupkgPowershellScript)"
+           Outputs="@(SdkMsiComponent->'$(PackageOutputPath)%(ComponentId).%(ComponentVersion).nupkg')">
+ 
+     <Exec Command="powershell -NoProfile -NoLogo $(GenerateNupkgPowershellScript) ^
+                       '%(SdkMsiComponent.MsiInstallerFile)' ^
+                       '@(SdkMsiComponent->'%(ComponentVersion)')' ^
+                       '$(NuSpecFile)' ^
+                       '@(SdkMsiComponent->'$(PackageOutputPath)%(ComponentId).%(ComponentVersion).nupkg')' ^
+                       '$(TargetArchitecture)' ^
+                       '@(SdkMsiComponent->'%(ComponentId)')' ^
+                       '@(SdkMsiComponent->'%(ComponentFriendlyName)')' ^
+                       '$(ProjectUrl)' ^
+                       '$(BinDir)'" />
+   </Target>
+   
+   <Target Name="SetupVSNugetPackages">
+       <PropertyGroup>
+         <NuSpecFile>$(MSBuildThisFileDirectory)windows/vscomponents/VS.Redist.Common.Component.nuspec</NuSpecFile>
+         <GenerateNupkgPowershellScript>$(MSBuildThisFileDirectory)windows/vscomponents/generatenupkg.ps1</GenerateNupkgPowershellScript>
+         <ProjectUrl>https://github.com/dotnet/core-setup</ProjectUrl>
+       </PropertyGroup>
+ 
+       <ItemGroup>
+         <SdkMsiComponent Include="HostFxrMsiNupkg">
+           <MsiInstallerFile>$(HostFxrInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.NetCore.HostFXR.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core HostFX Resolver</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="AppHostPackMsiNupkg">
+           <MsiInstallerFile>$(AppHostPackInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.NetCore.AppHostPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core AppHost Pack</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="SharedFrameworkMsiNupkg">
+           <MsiInstallerFile>$(SharedFrameworkInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.NetCore.SharedFramework.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core SharedFramework</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="SharedHostMsiNupkg">
+           <MsiInstallerFile>$(SharedHostInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.NetCore.SharedHost.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core SharedHost</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="NetStandardTargetingPackMsiNupkg">
+           <MsiInstallerFile>$(NetStandardTargetingPackInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.NetStandard.TargetingPack.$(TargetArchitecture).$(NetStandardProductBandVersion)</ComponentId>
+           <ComponentVersion>$(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)</ComponentVersion>
+           <ComponentFriendlyName>$(NetStandardProductBandVersion) .NET Standard TargetingPack</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="NetCoreTargetingPackMsiNupkg">
+           <MsiInstallerFile>$(TargetingPackInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.NetCore.TargetingPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) .NET Core TargetingPack</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="WindowsDesktopMsiNupkg">
+           <MsiInstallerFile>$(WindowsDesktopSharedFrameworkInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.WindowsDesktop.SharedFramework.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) WindowsDesktop SharedFramework</ComponentFriendlyName>
+         </SdkMsiComponent>
+         <SdkMsiComponent Include="WindowsDesktopTargetingPackMsiNupkg">
+           <MsiInstallerFile>$(WindowsDesktopTargetingPackInstallerFile)</MsiInstallerFile>
+           <ComponentId>VS.Redist.Common.WindowsDesktop.TargetingPack.$(TargetArchitecture).$(NETCoreAppFrameworkVersion)</ComponentId>
+           <ComponentVersion>$(SharedFrameworkNugetVersion)</ComponentVersion>
+           <ComponentFriendlyName>$(NETCoreAppFrameworkVersion) WindowsDesktop TargetingPack</ComponentFriendlyName>
+         </SdkMsiComponent>
+       </ItemGroup>
+     </Target>
+ 
+   </Project>

diff --cc src/installer/pkg/projects/windowsdesktop/pkg/Directory.Build.props
Simple merge

diff --cc src/installer/publish/Directory.Build.props
Simple merge

diff --cc src/installer/publish/publish.proj
Simple merge

diff --cc src/installer/test/HostActivation.Tests/StandaloneAppActivation.cs
Simple merge

diff --cc src/installer/test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
Simple merge