From b956cb7a9f0f41ebeb09a47ef9c9c52448273242 Mon Sep 17 00:00:00 2001
From: Nathan Mytelka <Forgind@users.noreply.github.com>
Date: Mon, 26 Apr 2021 12:27:53 -0700
Subject: [PATCH] Switch to calling RAR directly

---
 .../TestProjects/RARPreCacheProject/Program.cs       | 12 ------------
 .../RARPreCacheProject/RARPreCacheProject.csproj     |  8 --------
 src/redist/targets/GenerateLayout.targets            |  6 +-----
 3 files changed, 1 insertion(+), 25 deletions(-)
 delete mode 100644 TestAssets/TestProjects/RARPreCacheProject/Program.cs
 delete mode 100644 TestAssets/TestProjects/RARPreCacheProject/RARPreCacheProject.csproj

diff --git a/TestAssets/TestProjects/RARPreCacheProject/Program.cs b/TestAssets/TestProjects/RARPreCacheProject/Program.cs
deleted file mode 100644
index 81f93b3f8..000000000
--- a/TestAssets/TestProjects/RARPreCacheProject/Program.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-
-namespace RARPreCacheProject
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            Console.WriteLine("Hello World!");
-        }
-    }
-}
diff --git a/TestAssets/TestProjects/RARPreCacheProject/RARPreCacheProject.csproj b/TestAssets/TestProjects/RARPreCacheProject/RARPreCacheProject.csproj
deleted file mode 100644
index f54a45ad1..000000000
--- a/TestAssets/TestProjects/RARPreCacheProject/RARPreCacheProject.csproj
+++ /dev/null
@@ -1,8 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index b3114ddc0..b1b586969 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -493,11 +493,7 @@
   </Target>
 
   <Target Name="GeneratePrecomputedRarCache" DependsOnTargets="LayoutTemplates;LayoutManifests;LayoutBundledTools">
-    <ItemGroup>
-      <SampleProjectForResolveAssemblyReferenceCache Include="$(RepoRoot)\TestAssets\TestProjects\RARPreCacheProject\**\*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(SampleProjectForResolveAssemblyReferenceCache)" DestinationFiles="$(RepoRoot)\artifacts\bin\redist\$(Configuration)\RARPreCacheProject\%(RecursiveDir)%(FileName)%(Extension)" />
-    <MSBuild Projects="$(RepoRoot)\artifacts\bin\redist\$(Configuration)\RARPreCacheProject\RARPreCacheProject.csproj" Properties="AssemblyInformationCacheOutputPath=$(RedistLayoutPath)sdk\$(Version)\SDKPrecomputedAssemblyReferences.cache" Targets="ResolveAssemblyReferences" />
+    <ResolveAssemblyReference AssemblyFiles="$(RepoRoot)\**\*.dll" Silent="true" AssemblyInformationCacheOutputPath="$(RedistLayoutPath)sdk\$(Version)\SDKPrecomputedAssemblyReferences.cache" SearchPaths="$(RepoRoot)\**" />
   </Target>
 
   <Target Name="GenerateLayout"