From 7c0fa13510fa08fce99cf5641a7cf0646bb68026 Mon Sep 17 00:00:00 2001
From: Matt Ward <matt.ward@microsoft.com>
Date: Tue, 9 Feb 2021 12:04:34 +0000
Subject: Fix tests failing due to not finding the lib directory

Test addins now built into the lib directory instead of a subdirectory
based on the target framework.

UnitTests project now built without appending its target framework
to the build directory.

This fixes some tests that were relying on the location of the
test addins being in the lib directory. Still 38 tests failing.
---
 Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj            | 1 +
 Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj | 1 +
 Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj | 1 +
 3 files changed, 3 insertions(+)

(limited to 'Test/MultiAssemblyAddin')

diff --git a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
index 422322f..b784fea 100644
--- a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
+++ b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj
@@ -10,6 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>MultiAssemblyAddin</RootNamespace>
     <AssemblyName>MultiAssemblyAddin</AssemblyName>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
diff --git a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
index dd39726..849bb54 100644
--- a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
+++ b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj
@@ -10,6 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>OptionalModule</RootNamespace>
     <AssemblyName>OptionalModule</AssemblyName>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
diff --git a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
index 0948e7b..5d0f89a 100644
--- a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
+++ b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj
@@ -10,6 +10,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>SecondAssembly</RootNamespace>
     <AssemblyName>SecondAssembly</AssemblyName>
+    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>True</DebugSymbols>
-- 
cgit v1.2.3