From 06a048fbd0ac1cc07f3d448f5fce4c2a5beac160 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Wed, 19 Jun 2024 11:22:33 -0500
Subject: [PATCH 1/4] Only hook up VSIX up-to-date check when VSToolsPath is
 defined

In other cases, the VSIX container properties are not defined, leading
to failures in early design time build scenarios.
---
 .../tools/VisualStudio.VsixBuild.targets                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
index 6b3368611fc..cf30c8b3395 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/VisualStudio.VsixBuild.targets
@@ -284,7 +284,7 @@
   <!--
     Make sure to include information about inputs and outputs to CreateVsixContainer for fast up-to-date check.
   -->
-  <PropertyGroup>
+  <PropertyGroup Condition="'$(VSToolsPath)' != '' and ('$(IsVsixProject)' == 'true' or '$(GeneratePkgDefFile)' == 'true')">
     <CollectUpToDateCheckInputDesignTimeDependsOn>$(CollectUpToDateCheckInputDesignTimeDependsOn);CollectVsixUpToDateCheckInput</CollectUpToDateCheckInputDesignTimeDependsOn>
     <CollectUpToDateCheckBuiltDesignTimeDependsOn>$(CollectUpToDateCheckBuiltDesignTimeDependsOn);CollectVsixUpToDateCheckBuilt</CollectUpToDateCheckBuiltDesignTimeDependsOn>
   </PropertyGroup>

From 12b698c4db6978d504c8256332a5c4bd19551b4e Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Wed, 19 Jun 2024 11:30:25 -0500
Subject: [PATCH 2/4] Ensure globalPackagesFolder has a trailing directory
 separator

---
 eng/common/tools.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 19e09f37f83..e5fae740084 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -659,6 +659,11 @@ function GetNuGetPackageCachePath() {
         # global packages folder, this expression will evaluate to the empty string which will effectively leave the
         # environment variable set to null.
         $env:NUGET_PACKAGES = $nugetConfigXml.SelectSingleNode("//configuration/config/add[@key='globalPackagesFolder']").value
+        if ($env:NUGET_PACKAGES -ne $null) {
+          # Join-Path with an empty child path effectively adds a trailing directory separator only if one does not
+          # already exist
+          $env:NUGET_PACKAGES = Join-Path $env:NUGET_PACKAGES ''
+        }
       }
 
       if ($env:NUGET_PACKAGES -eq $null) {

From 75fcbf6d06cd77431fd7ced9e7ff0eeaabbd0624 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Wed, 19 Jun 2024 14:13:16 -0500
Subject: [PATCH 3/4] Fix failure to restore packages needed for Sign.proj

---
 .../tools/Build.proj                          | 35 +++++++++----
 .../tools/Sign.proj                           | 51 +++++++++++++++++++
 2 files changed, 76 insertions(+), 10 deletions(-)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
index 11bc975dd42..f435ce5be47 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
@@ -134,19 +134,18 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(Restore)' == 'true'">
-      <_RestoreToolsProps Include="@(_CommonProps)"/>
-      <_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/>
-      <_RestoreToolsProps Include="ExcludeRestorePackageImports=true"/>
-      <_RestoreToolsProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/>
-      
+      <_RestoreProps Include="@(_CommonProps)"/>
+      <_RestoreProps Include="ExcludeRestorePackageImports=true"/>
+      <_RestoreProps Include="_NuGetRestoreTargets=$(_NuGetRestoreTargets)"/>
+
       <!-- Used in the SDK (Tools.proj) to control whether Build.Tasks.Feed will be restored or not. -->
-      <_RestoreToolsProps Include="Publish=$(Publish)"/>
+      <_RestoreProps Include="Publish=$(Publish)"/>
 
       <!-- Used in the SDK (Tools.proj) to control whether SymbolUploader.Build.Task will be restored or not. -->
-      <_RestoreToolsProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/>
+      <_RestoreProps Include="PublishToSymbolServer=$(PublishToSymbolServer)"/>
 
       <!-- Forward this property because we can't assume it will be available globally. -->
-      <_RestoreToolsProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/>
+      <_RestoreProps Include="DotNetPublishUsingPipelines=$(DotNetPublishUsingPipelines)"/>
     </ItemGroup>
 
     <!--
@@ -154,8 +153,16 @@
       from a private location.
     -->
     <ItemGroup Condition="'$(SYSTEM_TEAMPROJECT)' == 'internal'">
-      <_RestoreToolsProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/>
-      <_RestoreToolsProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/>
+      <_RestoreProps Include="DotNetRuntimeSourceFeed=$(DotNetRuntimeSourceFeed)"/>
+      <_RestoreProps Include="DotNetRuntimeSourceFeedKey=$(DotNetRuntimeSourceFeedKey)"/>
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(Restore)' == 'true'">
+      <_RestoreToolsProps Include="@(_RestoreProps)"/>
+      <_RestoreToolsProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)Common"/>
+
+      <_RestoreSignProps Include="@(_RestoreProps)"/>
+      <_RestoreSignProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)CommonSign"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -185,6 +192,14 @@
              Properties="@(_RestoreToolsProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
              Condition="'$(Restore)' == 'true'"/>
 
+    <!--
+      Restore built-in tools for signing.
+    -->
+    <MSBuild Projects="Sign.proj"
+             Targets="Restore"
+             Properties="@(_RestoreSignProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
+             Condition="'$(Restore)' == 'true'"/>
+
     <!--
       Restore solutions and projects.
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
index 1cfcf6540b6..6a13d906882 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj
@@ -21,6 +21,57 @@
 
   <Import Project="BuildStep.props" />
 
+  <!-- Properties requires by NuGet.targets to restore PackageReferences -->
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <!-- Workaround changes from newer MSBuild requiring additional properties -->
+    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">5</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier  Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == ''">.NETFramework,Version=v4.7.2</TargetFrameworkMoniker>
+    <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
+  </PropertyGroup>
+
+  <!-- 
+    Configure NuGet Restore to use NuGet.config file in the repository root.
+    We could drop a custom NuGet.config to the containing directory but it's simpler
+    if we use the same config for all restore operations.
+    NuGet.Config, NuGet.config, and nuget.config are all allowed casings according to NuGet:
+    https://github.com/NuGet/NuGet.Client/blob/b83566ec2369c4e9fd07e6f95d734dfe370a1e66/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs#L34-L36
+  -->
+  <PropertyGroup Condition="'$(RestoreConfigFile)' == ''">
+    <RestoreConfigFile Condition="Exists('$(RepoRoot)NuGet.config')">$(RepoRoot)NuGet.config</RestoreConfigFile>
+    <RestoreConfigFile Condition="Exists('$(RepoRoot)NuGet.Config')">$(RepoRoot)NuGet.Config</RestoreConfigFile>
+    <RestoreConfigFile Condition="Exists('$(RepoRoot)nuget.config')">$(RepoRoot)nuget.config</RestoreConfigFile>
+  </PropertyGroup>
+
+  <Import Project="$(_NuGetRestoreTargets)" />
+
+  <!-- These package references should only be excluded when doing inner builds, and outer-builds from the orchestrator in source only build
+       configurations. non-source only build configurations should always restore these packages.
+
+       Switches are separated by legacy vs. new.
+
+       This looks complicated right now, but will get simpler as legacy switches disappear:
+       - ArcadeInnerBuildFromSource/DotNetBuildFromSource disappear:
+         ('$(DotNetBuildSourceOnly)' != 'true' or ('$(DotNetBuildPhase)' == 'Repo' and '$(DotNetBuildOrchestrator)' != 'true')
+  -->
+
+  <PropertyGroup>
+    <_ImportOrUseTooling>false</_ImportOrUseTooling>
+    <_ImportOrUseTooling Condition="('$(ArcadeInnerBuildFromSource)' != 'true' and '$(DotNetBuildFromSourceFlavor)' != 'Product') and 
+                                    ('$(DotNetBuildSourceOnly)' != 'true' or ('$(DotNetBuildPhase)' == 'Repo' and '$(DotNetBuildOrchestrator)' != 'true'))">true</_ImportOrUseTooling>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(_ImportOrUseTooling)' == 'true'">
+    <!-- Copy of 'sn.exe' in form of NuGet package. -->
+    <PackageReference Include="sn" Version="$(SNVersion)" IsImplicitlyDefined="true" />
+    <PackageReference Include="MicroBuild.Core" Version="$(MicroBuildCoreVersion)"  IsImplicitlyDefined="true" />
+    <PackageReference Include="MicroBuild.Core.Sentinel" Version="1.0.0" IsImplicitlyDefined="true" />
+    <PackageReference Include="vswhere" Version="$(VSWhereVersion)" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.Signed.Wix" Version="$(MicrosoftSignedWixVersion)" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.SignTool" Version="$(MicrosoftDotNetSignToolVersion)" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <Import Project="$(NuGetPackageRoot)microsoft.dotnet.signtool\$(MicrosoftDotNetSignToolVersion)\build\Microsoft.DotNet.SignTool.props" />
 
   <Import Project="Sign.props" />

From 2455fde17932055e36af49713be94b7cecfdbe76 Mon Sep 17 00:00:00 2001
From: Sam Harwell <Sam.Harwell@microsoft.com>
Date: Wed, 19 Jun 2024 16:23:34 -0500
Subject: [PATCH 4/4] Fix failure to restore packages needed for Publish.proj

---
 .../tools/Build.proj                          | 11 +++++
 .../tools/Publish.proj                        | 46 +++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
index f435ce5be47..2f6e03b9b32 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj
@@ -163,6 +163,9 @@
 
       <_RestoreSignProps Include="@(_RestoreProps)"/>
       <_RestoreSignProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)CommonSign"/>
+
+      <_RestorePublishProps Include="@(_RestoreProps)"/>
+      <_RestorePublishProps Include="BaseIntermediateOutputPath=$(ArtifactsToolsetDir)CommonPublish"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -200,6 +203,14 @@
              Properties="@(_RestoreSignProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
              Condition="'$(Restore)' == 'true'"/>
 
+    <!--
+      Restore built-in tools for publishing.
+    -->
+    <MSBuild Projects="Publish.proj"
+             Targets="Restore"
+             Properties="@(_RestorePublishProps);_NETCORE_ENGINEERING_TELEMETRY=Restore"
+             Condition="'$(Restore)' == 'true'"/>
+
     <!--
       Restore solutions and projects.
 
diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
index 90519c545d7..549934ebfdf 100644
--- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
+++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Publish.proj
@@ -30,6 +30,52 @@
 
   <Import Project="BuildStep.props" />
 
+  <!-- Properties requires by NuGet.targets to restore PackageReferences -->
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <!-- Workaround changes from newer MSBuild requiring additional properties -->
+    <TargetFrameworkVersion Condition="'$(TargetFrameworkVersion)' == ''">5</TargetFrameworkVersion>
+    <TargetFrameworkIdentifier  Condition="'$(TargetFrameworkIdentifier)' == ''">.NETFramework</TargetFrameworkIdentifier>
+    <TargetFrameworkMoniker Condition="'$(TargetFrameworkMoniker)' == ''">.NETFramework,Version=v4.7.2</TargetFrameworkMoniker>
+    <MSBuildProjectExtensionsPath>$(BaseIntermediateOutputPath)</MSBuildProjectExtensionsPath>
+  </PropertyGroup>
+
+  <!-- 
+    Configure NuGet Restore to use NuGet.config file in the repository root.
+    We could drop a custom NuGet.config to the containing directory but it's simpler
+    if we use the same config for all restore operations.
+    NuGet.Config, NuGet.config, and nuget.config are all allowed casings according to NuGet:
+    https://github.com/NuGet/NuGet.Client/blob/b83566ec2369c4e9fd07e6f95d734dfe370a1e66/src/NuGet.Core/NuGet.Configuration/Settings/Settings.cs#L34-L36
+  -->
+  <PropertyGroup Condition="'$(RestoreConfigFile)' == ''">
+    <RestoreConfigFile Condition="Exists('$(RepoRoot)NuGet.config')">$(RepoRoot)NuGet.config</RestoreConfigFile>
+    <RestoreConfigFile Condition="Exists('$(RepoRoot)NuGet.Config')">$(RepoRoot)NuGet.Config</RestoreConfigFile>
+    <RestoreConfigFile Condition="Exists('$(RepoRoot)nuget.config')">$(RepoRoot)nuget.config</RestoreConfigFile>
+  </PropertyGroup>
+
+  <Import Project="$(_NuGetRestoreTargets)" />
+
+  <!-- These package references should only be excluded when doing inner builds, and outer-builds from the orchestrator in source only build
+       configurations. non-source only build configurations should always restore these packages.
+
+       Switches are separated by legacy vs. new.
+
+       This looks complicated right now, but will get simpler as legacy switches disappear:
+       - ArcadeInnerBuildFromSource/DotNetBuildFromSource disappear:
+         ('$(DotNetBuildSourceOnly)' != 'true' or ('$(DotNetBuildPhase)' == 'Repo' and '$(DotNetBuildOrchestrator)' != 'true')
+  -->
+
+  <PropertyGroup>
+    <_ImportOrUseTooling>false</_ImportOrUseTooling>
+    <_ImportOrUseTooling Condition="('$(ArcadeInnerBuildFromSource)' != 'true' and '$(DotNetBuildFromSourceFlavor)' != 'Product') and 
+                                    ('$(DotNetBuildSourceOnly)' != 'true' or ('$(DotNetBuildPhase)' == 'Repo' and '$(DotNetBuildOrchestrator)' != 'true'))">true</_ImportOrUseTooling>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(_ImportOrUseTooling)' == 'true'">
+    <PackageReference Include="Microsoft.SymbolUploader.Build.Task" Version="$(MicrosoftSymbolUploaderBuildTaskVersion)" Condition="'$(PublishToSymbolServer)' == 'true'" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.VisualStudio" Version="$(MicrosoftDotNetBuildTasksVisualStudioVersion)" Condition="'$(UsingToolVSSDK)' == 'true'" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.GenerateChecksums" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
 
   <!--