Merge remote-tracking branch 'origin/main' into finalizer-csharp

Author: ViktorHofer

Diff for: documentation/general/workloads/workload-finalizer.md

@@ -2,4 +2,4 @@
 
 When the .NET SDK is uninstalled, any workloads that were installed with that SDK should also be uninstalled.  In order to do this when uninstalling an SDK which was installed via the standalone EXE installer bundle, there is a piece of native code called the finalizer.  The finalizer removes any reference counts on workload packs and manifests from the SDK that is being uninstalled, and uninstalls any MSIs which then have no reference counts.
 
-The finalizer code is here: https://github.com/dotnet/installer/tree/main/src/finalizer
+The finalizer code is [here](/src/Layout/finalizer/README.md)

Diff for: eng/Badge.proj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+
+  <PropertyGroup>
+    <TargetFramework>$(NetCurrent)</TargetFramework>
+    <IsShippingPackage>true</IsShippingPackage>
+  </PropertyGroup>
+
+  <Target Name="GenerateVersionBadge" AfterTargets="Build" Returns="$(VersionBadge)">
+    <PropertyGroup>
+      <!-- Replace '-' with '_' for os names like 'linux-musl' -->
+      <VersionBadgeMoniker>$(OSName.Replace('-', '_'))_$(Architecture)</VersionBadgeMoniker>
+      <VersionBadgeMoniker Condition="'$(IsLinuxPortable)' == 'true'">linux_$(Architecture)</VersionBadgeMoniker>
+
+      <VersionBadge>$(ArtifactsShippingPackagesDir)$(VersionBadgeMoniker)_$(Configuration)_version_badge.svg</VersionBadge>
+      <VersionSvgTemplate>$(MSBuildThisFileDirectory)version_badge.svg</VersionSvgTemplate>
+    </PropertyGroup>
+
+    <Message Text="$(VersionBadge)" />
+
+    <WriteLinesToFile
+      File="$(VersionBadge)"
+      Lines="$([System.IO.File]::ReadAllText('$(VersionSvgTemplate)').Replace('ver_number', '$(Version)'))"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+  </Target>
+
+</Project>

Diff for: eng/Build.props

@@ -13,7 +13,7 @@
        it depends on assets from other verticals that are built in the first build pass. -->
   <ItemGroup Condition="'$(DotNetBuildPass)' == '2' and
                         '$(OS)' == 'Windows_NT'">
-    <ProjectToBuild Include="$(RepoRoot)src\Installer\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
+    <ProjectToBuild Include="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj" DotNetBuildPass="2" />
   </ItemGroup>
 
 </Project>

Diff for: eng/Publishing.props

@@ -29,7 +29,7 @@
 
   <Target Name="GetNonStableProductVersion">
     <!-- Retrieve the non-stable product version. -->
-    <MSBuild Projects="$(RepoRoot)src/Installer/redist-installer/redist-installer.proj"
+    <MSBuild Projects="$(RepoRoot)src\Layout\redist-installer\redist-installer.proj"
              Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NonStableProductVersion" />
     </MSBuild>
@@ -45,4 +45,18 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="GenerateVersionBadge"
+          Condition="'$(PublishBinariesAndBadge)' == 'true' and
+                     '$(PgoInstrument)' != 'true' and
+                     ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')"
+          BeforeTargets="AddRelativeBlobPathToBlobArtifacts;PublishToAzureDevOpsArtifacts">
+    <MSBuild Projects="$(RepositoryEngineeringDir)Badge.proj" Targets="GenerateVersionBadge">
+      <Output TaskParameter="TargetOutputs" ItemName="VersionBadge" />
+    </MSBuild>
+    
+    <ItemGroup>
+      <Artifact Include="@(VersionBadge)" Kind="Blob" />
+    </ItemGroup>
+  </Target>
+
 </Project>

Diff for: eng/Signing.props

@@ -89,22 +89,21 @@
 
   <!-- Only publish this file from win-x64 so that we don't end up with duplicates. -->
   <ItemGroup Condition="'$(PublishBinariesAndBadge)' == 'true' and '$(OS)' == 'Windows_NT' and '$(Architecture)' == 'x64' and '$(PgoInstrument)' != 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1')">
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" IsShipping="true" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productVersion.txt" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)sdk-productVersion.txt" />
   </ItemGroup>
 
   <ItemGroup>
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.exe" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.deb" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.rpm" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" IsShipping="true" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.svg" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
-    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" IsShipping="true" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.zip" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.tar.gz" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.pkg" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.exe" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.deb" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.rpm" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.msi" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)*.cab" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.json" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
+    <SdkArtifact Include="$(ArtifactsShippingPackagesDir)productCommit-*.txt" Condition="'$(PublishBinariesAndBadge)' == 'true'" />
 
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.swr" IsShipping="false" />
     <SdkArtifact Include="$(ArtifactsNonShippingPackagesDir)*.msi" IsShipping="false" />