diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2022-06-15 11:18:40 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2022-09-13 20:38:42 +0300 |
| commit | 6d80ced6405cbc3e307cc9e484ced46b7bbdf24d (patch) | |
| tree | 3e1ec43b518aaee780c151f244f3a3c8d1f07eca /Test | |
| parent | 831a6714d10976c4f5845efd06c9333dbf4c18d1 (diff) | |
Fix unit tests
Diffstat (limited to 'Test')
| -rw-r--r-- | Test/CommandExtension/CommandExtension.csproj | 2 | ||||
| -rw-r--r-- | Test/FileContentExtension/FileContentExtension.csproj | 2 | ||||
| -rw-r--r-- | Test/HelloWorldExtension/HelloWorldExtension.csproj | 2 | ||||
| -rw-r--r-- | Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj | 2 | ||||
| -rw-r--r-- | Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj | 2 | ||||
| -rw-r--r-- | Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj | 2 | ||||
| -rw-r--r-- | Test/SystemInfoExtension/SystemInfoExtension.csproj | 2 | ||||
| -rw-r--r-- | Test/UnitTests/UnitTests.csproj | 1 | ||||
| -rw-r--r-- | Test/UnitTests/Util.cs | 2 | ||||
| -rw-r--r-- | Test/UnitTests/test.addins | 4 |
10 files changed, 18 insertions, 3 deletions
diff --git a/Test/CommandExtension/CommandExtension.csproj b/Test/CommandExtension/CommandExtension.csproj index b05b551..bbfb9ef 100644 --- a/Test/CommandExtension/CommandExtension.csproj +++ b/Test/CommandExtension/CommandExtension.csproj @@ -11,6 +11,8 @@ <SchemaVersion>2.0</SchemaVersion> <RootNamespace>CommandExtension</RootNamespace> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> diff --git a/Test/FileContentExtension/FileContentExtension.csproj b/Test/FileContentExtension/FileContentExtension.csproj index bd9e1a6..355eb9c 100644 --- a/Test/FileContentExtension/FileContentExtension.csproj +++ b/Test/FileContentExtension/FileContentExtension.csproj @@ -11,6 +11,8 @@ <SchemaVersion>2.0</SchemaVersion> <RootNamespace>FileContentExtension</RootNamespace> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> diff --git a/Test/HelloWorldExtension/HelloWorldExtension.csproj b/Test/HelloWorldExtension/HelloWorldExtension.csproj index fa8173d..726fc88 100644 --- a/Test/HelloWorldExtension/HelloWorldExtension.csproj +++ b/Test/HelloWorldExtension/HelloWorldExtension.csproj @@ -11,6 +11,8 @@ <SchemaVersion>2.0</SchemaVersion> <RootNamespace>HelloWorldExtension</RootNamespace> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> diff --git a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj index ca110a9..ba75db4 100644 --- a/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj +++ b/Test/MultiAssemblyAddin/MultiAssemblyAddin.csproj @@ -11,6 +11,8 @@ <RootNamespace>MultiAssemblyAddin</RootNamespace> <AssemblyName>MultiAssemblyAddin</AssemblyName> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <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 545018f..5ff431d 100644 --- a/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj +++ b/Test/MultiAssemblyAddin/OptionalModule/OptionalModule.csproj @@ -11,6 +11,8 @@ <RootNamespace>OptionalModule</RootNamespace> <AssemblyName>OptionalModule</AssemblyName> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <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 31422ce..4c32a31 100644 --- a/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj +++ b/Test/MultiAssemblyAddin/SecondAssembly/SecondAssembly.csproj @@ -11,6 +11,8 @@ <RootNamespace>SecondAssembly</RootNamespace> <AssemblyName>SecondAssembly</AssemblyName> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> diff --git a/Test/SystemInfoExtension/SystemInfoExtension.csproj b/Test/SystemInfoExtension/SystemInfoExtension.csproj index b5c47f3..9231588 100644 --- a/Test/SystemInfoExtension/SystemInfoExtension.csproj +++ b/Test/SystemInfoExtension/SystemInfoExtension.csproj @@ -11,6 +11,8 @@ <SchemaVersion>2.0</SchemaVersion> <RootNamespace>SystemInfoExtension</RootNamespace> <AssemblyVersion>0.0.0.0</AssemblyVersion> + <TargetFrameworks>$(DotNetCoreTarget)</TargetFrameworks> + <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> diff --git a/Test/UnitTests/UnitTests.csproj b/Test/UnitTests/UnitTests.csproj index f9ff798..28d5659 100644 --- a/Test/UnitTests/UnitTests.csproj +++ b/Test/UnitTests/UnitTests.csproj @@ -12,6 +12,7 @@ <RootNamespace>UnitTests</RootNamespace> <SignAssembly>True</SignAssembly> <AssemblyOriginatorKeyFile>..\..\mono-addins.snk</AssemblyOriginatorKeyFile> + <TargetFrameworks>net472;net6.0</TargetFrameworks> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>True</DebugSymbols> diff --git a/Test/UnitTests/Util.cs b/Test/UnitTests/Util.cs index 9c4cecd..0187eaf 100644 --- a/Test/UnitTests/Util.cs +++ b/Test/UnitTests/Util.cs @@ -40,7 +40,7 @@ namespace UnitTests public static string TestsRootDir { get { if (rootDir == null) - rootDir = Path.GetFullPath (Path.Combine (Path.GetDirectoryName (typeof(Util).Assembly.Location), "..", "..", "..")); + rootDir = Path.GetFullPath (Path.Combine (Path.GetDirectoryName (typeof(Util).Assembly.Location), "..", "..", "..", "..")); return rootDir; } } diff --git a/Test/UnitTests/test.addins b/Test/UnitTests/test.addins index ebd1db7..df2ae14 100644 --- a/Test/UnitTests/test.addins +++ b/Test/UnitTests/test.addins @@ -1,5 +1,5 @@ <Addins> - <Directory>../../../lib</Directory> - <Directory>../../../lib/extras</Directory> + <Directory>../../../../lib</Directory> + <Directory>../../../../lib/extras</Directory> <Directory>SampleAddins</Directory> </Addins> |