Skip to content

Update BoostTestAdapter AssemblyName #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
netspiri wants to merge 2 commits into
base: dev15
Choose a base branch
from
Open

Update BoostTestAdapter AssemblyName #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dbfb93
Rename BoostTestAdapter assembly to allow operation via `vstest.conso…
Sep 10, 2018
1fef260
Update localisation files to reflect assembly name change
Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions BoostTestAdapter/BoostTestAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>BoostTestAdapter</RootNamespace>
<AssemblyName>BoostTestAdapter</AssemblyName>
<AssemblyName>BoostTestAdapter.TestAdapter</AssemblyName>
Comment thread
spebl marked this conversation as resolved.
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
Expand Down Expand Up @@ -60,7 +60,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<FilesToLocalize Include="$(OutDir)\BoostTestAdapter.dll">
<FilesToLocalize Include="$(OutDir)\BoostTestAdapter.TestAdapter.dll">
<TranslationFile>$(MSBuildThisFileDirectory)..\loc\lcl\{Lang}\BoostTestAdapter.dll.lcl</TranslationFile>
</FilesToLocalize>
<FilesToSign Include="$(OutDir)\$(AssemblyName).dll" Condition="'$(RealSign)' == 'True'">
Expand Down Expand Up @@ -206,13 +206,7 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>REM required for the BoostTestPlugin so that the log4net config file is included as part of the vsix installation
mkdir $(OutDir)\..\BoostTestPlugin
xcopy /c /i /y $(TargetFileName).config $(OutDir)\..\BoostTestPlugin
REM required by some unit tests in LoggerTest.cs so as to have a certain degree of confidence that log4net is actually logging to file
mkdir $(OutDir)\..\BoostTestAdapterNunit
xcopy /c /i /y $(TargetFileName).config $(OutDir)\..\BoostTestAdapterNunit
</PostBuildEvent>
<PostBuildEvent></PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
0 ...tAdapterNunit/BoostTestAdapter.dll.config → ...t/BoostTestAdapter.TestAdapter.dll.config
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion BoostTestAdapterNunit/BoostTestAdapterNunit.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Log4NetConfigFile\BoostTestAdapter.dll.config" />
<EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.NoSourceFileAndLineNumbersAvailable.test.stdout.log" />
<EmbeddedResource Include="Resources\ReportsLogs\MemoryLeakTest\sample.SourceFileAndLineNumbersAvailable.test.stdout.log" />
<EmbeddedResource Include="Resources\ReportsLogs\OutputTest\sample.test.stderr.log" />
Expand Down Expand Up @@ -165,6 +164,9 @@
<Version>2.6.4</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\Log4NetConfigFile\BoostTestAdapter.TestAdapter.dll.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
2 changes: 1 addition & 1 deletion BoostTestAdapterNunit/CorrectReferencedAssembliesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ internal class CorrectReferencesAssembliesTest
/// <param name="dll">the dll name</param>
/// <param name="assemblyReferenceName">the assembly that we are going to check that is properly referenced</param>
/// <param name="versionMajor">version number that assembly must have</param>
[TestCase("BoostTestAdapter.dll", "Microsoft.VisualStudio.TestPlatform.ObjectModel", 15, TestName = "CorrectlyReferencedBoostTestAdapter", Description = "Microsoft.VisualStudio.TestPlatform.ObjectModel in BoostTestAdapter must point to the VS2017 version")]
[TestCase("BoostTestAdapter.TestAdapter.dll", "Microsoft.VisualStudio.TestPlatform.ObjectModel", 15, TestName = "CorrectlyReferencedBoostTestAdapter", Description = "Microsoft.VisualStudio.TestPlatform.ObjectModel in BoostTestAdapter must point to the VS2017 version")]
[TestCase("VisualStudioAdapter.dll", "Microsoft.VisualStudio.VCProjectEngine", 15, TestName = "CorrectlyReferencedVisualStudioAdapter", Description = "Microsoft.VisualStudio.VCProjectEngine in VisualStudioAdapter must point to the VS2017 version")]
public void CorrectReferences(string dll, string assemblyReferenceName, int versionMajor)
{
Expand Down
4 changes: 2 additions & 2 deletions BoostTestAdapterNunit/LoggerTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ public void UninitializedLoggerNeverCalled()
[Test]
public void Log4NetCorrectLoggingToFileVerification()
{
string resourceFileName = "BoostTestAdapter.dll.config";
string logFileName = "BoostTestAdapter.dll.log";
string resourceFileName = "BoostTestAdapter.TestAdapter.dll.config";
string logFileName = "BoostTestAdapter.TestAdapter.dll.log";

using (TemporaryFile resourceFile = new TemporaryFile(CopyLog4NetConfigFileFromAssemblyToWorkingDirectory(resourceFileName)))
using (TemporaryFile logFile = new TemporaryFile(Path.Combine(Directory.GetCurrentDirectory(), logFileName)))
Expand Down
0 ...NetConfigFile/BoostTestAdapter.dll.config → ...e/BoostTestAdapter.TestAdapter.dll.config
View file
Open in desktop
File renamed without changes.
0 BoostTestPlugin/BoostTestAdapter.dll.config → ...n/BoostTestAdapter.TestAdapter.dll.config
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions BoostTestPlugin/BoostTestPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="BoostTestAdapter.dll.config">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<Content Include="BoostTestAdapter.TestAdapter.dll.config">
<IncludeInVSIX>true</IncludeInVSIX>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="..\ThirdPartyNotices.txt">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
Expand Down
2 changes: 1 addition & 1 deletion BoostTestPlugin/source.extension.vsixmanifest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<Assets>
<Asset d:Source="Project" d:ProjectName="BoostTestAdapter" Type="Microsoft.VisualStudio.MefComponent" Path="|BoostTestAdapter|" />
<Asset d:Source="Project" d:ProjectName="BoostTestAdapter" Type="UnitTestExtension" Path="|BoostTestAdapter|" />
<Asset Type="Application Settings Configuration file" d:Source="File" Path="BoostTestAdapter.dll.config" />
<Asset Type="Application Settings Configuration file" d:Source="File" Path="BoostTestAdapter.TestAdapter.dll.config" />
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="VisualStudioAdapter" Path="|VisualStudioAdapter|" AssemblyName="|VisualStudioAdapter;AssemblyName|" />
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="Antlr.DOT" Path="|Antlr.DOT|" AssemblyName="|Antlr.DOT;AssemblyName|" />
<Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="BoostTestShared" Path="|BoostTestShared|" AssemblyName="|BoostTestShared;AssemblyName|" />
Expand Down