Merge branch 'main' into finalizer-csharp

Author: kasperk81

src/Installer/redist-installer/Directory.Build.targets

@@ -2,6 +2,13 @@
 
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
 
+  <PropertyGroup>
+    <RedistLayoutPath>$(OutputPath)dotnet\</RedistLayoutPath>
+    <SdkInternalLayoutPath>$(OutputPath)i\</SdkInternalLayoutPath>
+    <DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
+    <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)\</SdkOutputDirectory>
+  </PropertyGroup>
+
   <Import Project="$(RepoRoot)src\Tasks\sdk-tasks\sdk-tasks.InTree.targets" />
   <Import Project="targets\BundledTemplates.targets" />
   <Import Project="targets\BundledManifests.targets" />

src/Installer/redist-installer/redist-installer.csproj

@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>$(SdkTargetFramework)</TargetFramework>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
     <CopyBuildOutputToPublishDirectory>false</CopyBuildOutputToPublishDirectory>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>

src/Installer/redist-installer/targets/BundledDotnetTools.targets

@@ -1,6 +1,6 @@
 <Project>
 
-  <ItemGroup Condition=" '$(IncludeAspNetCoreRuntime)' != 'false' ">
+  <ItemGroup Condition="'$(IncludeAspNetCoreRuntime)' != 'false'">
     <BundledDotnetTool Include="dotnet-dev-certs" Version="$(DotnetDevCertsPackageVersion)" />
     <BundledDotnetTool Include="dotnet-user-jwts" Version="$(DotnetUserJwtsPackageVersion)" />
     <BundledDotnetTool Include="dotnet-user-secrets" Version="$(DotnetUserSecretsPackageVersion)" ObsoletesCliTool="Microsoft.Extensions.SecretManager.Tools" />
@@ -9,34 +9,24 @@
   <ItemGroup>
     <BundledDotnetTool Update="@(BundledDotnetTool)">
       <PackagePathRelativeToPackageRoot>%(Identity)/%(Version)/</PackagePathRelativeToPackageRoot>
-      <RestoredPackagePath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(PackagePathRelativeToPackageRoot)', '').ToLower())/</RestoredPackagePath>
+      <RestoredPackagePath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(PackagePathRelativeToPackageRoot)', '').ToLowerInvariant())/</RestoredPackagePath>
       <NupkgPathRelativeToPackageRoot>%(Identity)/%(Version)/%(Identity).%(Version).nupkg</NupkgPathRelativeToPackageRoot>
-      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLowerInvariant())</RestoredNupkgPath>
     </BundledDotnetTool>
   </ItemGroup>
 
-  <Target Name="LayoutBundledTools" DependsOnTargets="SetupBundledComponents">
-    <ItemGroup>
-      <BundledToolLayoutProject Include="$(MSBuildThisFileDirectory)..\projects\DownloadPackage.csproj">
-        <!-- For this unique RestoreProjectStyle, see: https://aka.ms/global-tools-nuget -->
-        <Properties>
-          PackageToRestore=%(BundledDotnetTool.Identity);
-          PackageVersionToRestore=%(BundledDotnetTool.Version);
-          TargetFramework=$(TargetFramework);
-          RestoreProjectStyle=DotnetToolReference
-        </Properties>
-      </BundledToolLayoutProject>
-    </ItemGroup>
-
-    <MSBuild Projects="@(BundledToolLayoutProject)" />
+  <ItemGroup>
+    <PackageDownload Include="@(BundledDotnetTool)" Version="[%(Version)]" />
+  </ItemGroup>
 
+  <Target Name="LayoutBundledTools" Condition="'@(BundledDotnetTool)' != ''">
     <ItemGroup>
       <BundledToolFiles Include="%(BundledDotnetTool.RestoredPackagePath)\**\*.*" PackageToRestore="%(BundledDotnetTool.Identity)" PackageVersionToRestore="%(BundledDotnetTool.Version)" />
       <BundledToolFiles Remove="%(BundledDotnetTool.RestoredPackagePath)\*.*" />
     </ItemGroup>
 
     <Copy SourceFiles="@(BundledToolFiles)"
-          DestinationFiles="@(BundledToolFiles->'$(SdkOutputDirectory)DotnetTools/%(PackageToRestore)\%(PackageVersionToRestore)\%(RecursiveDir)%(Filename)%(Extension)')"
+          DestinationFiles="@(BundledToolFiles->'$(SdkOutputDirectory)DotnetTools\%(PackageToRestore)\%(PackageVersionToRestore)\%(RecursiveDir)%(Filename)%(Extension)')"
           SkipUnchangedFiles="true" />
   </Target>
 

src/Installer/redist-installer/targets/GenerateLayout.targets

@@ -1,11 +1,5 @@
 <Project TreatAsLocalProperty="PublicBaseURL">
 
-  <PropertyGroup>
-    <RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
-    <SdkInternalLayoutPath>$(BaseOutputPath)$(Configuration)\i\</SdkInternalLayoutPath>
-    <DownloadsFolder>$(IntermediateOutputPath)downloads\</DownloadsFolder>
-  </PropertyGroup>
-
   <PropertyGroup>
     <!-- Blob storage directories are not stabilized, so these must refer to a package that does not stabilize -->
     <!-- In unified build, the layout does match, so use the runtime package versions rather than the VS redist versions -->
@@ -21,8 +15,6 @@
 
   <Target Name="SetupBundledComponents">
     <PropertyGroup>
-      <SdkOutputDirectory>$(RedistLayoutPath)sdk\$(Version)\</SdkOutputDirectory>
-
       <InternalBuild Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">true</InternalBuild>
       <InternalBaseURL Condition="$(SYSTEM_TEAMPROJECT) == 'internal'">https://dotnetbuilds.blob.core.windows.net/internal/</InternalBaseURL>