Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit fe3e119

Browse files
grokysgrokys
authored
Merge branch 'master' into cleanup/LogManager-CA1004
2 parents 3a5731f + 3576f31 commit fe3e119

File tree

8 files changed

+25
-47
lines changed

8 files changed

+25
-47
lines changed

‎test/GitHub.InlineReviews.UnitTests/GitHub.InlineReviews.UnitTests.csproj‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -110,22 +111,6 @@
110111
<Reference Include="Microsoft.CSharp" />
111112
<Reference Include="System.Data" />
112113
<Reference Include="System.Xml" />
113-
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
114-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
115-
<Private>False</Private>
116-
</Reference>
117-
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
118-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
119-
<Private>False</Private>
120-
</Reference>
121-
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
122-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
123-
<Private>False</Private>
124-
</Reference>
125-
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
126-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
127-
<Private>False</Private>
128-
</Reference>
129114
</ItemGroup>
130115
<ItemGroup>
131116
<Compile Include="Models\DiffUtilitiesTests.cs" />
@@ -197,6 +182,7 @@
197182
<PropertyGroup>
198183
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
199184
</PropertyGroup>
185+
<Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props'))" />
200186
</Target>
201187
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
202188
Other similar extension points exist, see Microsoft.Common.targets.

‎test/GitHub.InlineReviews.UnitTests/packages.config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
1111
<package id="NSubstitute" version="2.0.3" targetFramework="net461" />
1212
<package id="NUnit" version="3.9.0" targetFramework="net461" />
13-
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
14-
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
15-
<package id="NUnit.Runners" version="2.6.4" targetFramework="net452" />
16-
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net452" />
13+
<package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net461" />
1714
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net461" />
1815
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net461" />
1916
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net461" />

‎test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,6 +13,8 @@
1213
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1518
</PropertyGroup>
1619
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1720
<DebugSymbols>true</DebugSymbols>
@@ -110,6 +113,12 @@
110113
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
111114
</ItemGroup>
112115
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
116+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
117+
<PropertyGroup>
118+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
119+
</PropertyGroup>
120+
<Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props'))" />
121+
</Target>
113122
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
114123
Other similar extension points exist, see Microsoft.Common.targets.
115124
<Target Name="BeforeBuild">

‎test/GitHub.UI.UnitTests/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<package id="NSubstitute" version="2.0.3" targetFramework="net461" />
44
<package id="NUnit" version="3.6.1" targetFramework="net461" />
55
<package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
6+
<package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net461" />
67
<package id="Serilog" version="2.5.0" targetFramework="net461" />
78
<package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net461" />
89
<package id="Serilog.Sinks.File" version="3.2.0" targetFramework="net461" />

‎test/TrackingCollectionTests/TrackingCollectionTests.csproj‎

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" />
34
<PropertyGroup>
45
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
56
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
@@ -42,26 +43,10 @@
4243
<StartupObject />
4344
</PropertyGroup>
4445
<ItemGroup>
45-
<Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
46-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
47-
<Private>False</Private>
48-
</Reference>
49-
<Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
51-
<Private>False</Private>
52-
</Reference>
5346
<Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
5447
<HintPath>..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
5548
<Private>True</Private>
5649
</Reference>
57-
<Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
59-
<Private>False</Private>
60-
</Reference>
61-
<Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
63-
<Private>False</Private>
64-
</Reference>
6550
<Reference Include="System" />
6651
<Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=62aa029873c516b4, processorArchitecture=MSIL">
6752
<HintPath>..\..\packages\Rx-Core.2.2.5-custom\lib\net45\System.Reactive.Core.dll</HintPath>
@@ -151,6 +136,12 @@
151136
</Choose>
152137
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
153138
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
139+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
140+
<PropertyGroup>
141+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
142+
</PropertyGroup>
143+
<Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props'))" />
144+
</Target>
154145
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
155146
Other similar extension points exist, see Microsoft.Common.targets.
156147
<Target Name="BeforeBuild">

‎test/TrackingCollectionTests/packages.config‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="NUnit" version="2.6.4" targetFramework="net452" />
4-
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
5-
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
6-
<package id="NUnit.Runners" version="2.6.4" targetFramework="net452" />
7-
<package id="NUnitTestAdapter" version="2.0.0" targetFramework="net452" />
4+
<package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net461" />
85
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net452" />
96
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net452" />
107
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net452" />

‎test/UnitTests/UnitTests.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" />
34
<Import Project="..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\..\packages\LibGit2Sharp.NativeBinaries.1.0.164\build\LibGit2Sharp.NativeBinaries.props')" />
45
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
56
<PropertyGroup>
@@ -385,6 +386,7 @@
385386
<PropertyGroup>
386387
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
387388
</PropertyGroup>
389+
<Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.9.0\build\net35\NUnit3TestAdapter.props'))" />
388390
</Target>
389391
<Import Project="..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
390392
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎test/UnitTests/packages.config‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,10 @@
2525
<package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net461" />
2626
<package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net461" />
2727
<package id="NSubstitute" version="2.0.3" targetFramework="net461" />
28-
<package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
2928
<package id="NUnit" version="3.9.0" targetFramework="net461" />
3029
<package id="NUnit.ConsoleRunner" version="3.7.0" targetFramework="net461" />
31-
<package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net461" />
32-
<package id="NUnit.Extension.NUnitV2Driver" version="3.7.0" targetFramework="net461" />
33-
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.6.0" targetFramework="net461" />
34-
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net461" />
35-
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net461" />
36-
<package id="NUnit.Runners" version="3.7.0" targetFramework="net461" />
30+
<package id="NUnit3TestAdapter" version="3.9.0" targetFramework="net461" />
31+
<package id="Rothko" version="0.0.3-ghfvs" targetFramework="net461" />
3732
<package id="Rx-Core" version="2.2.5-custom" targetFramework="net45" />
3833
<package id="Rx-Interfaces" version="2.2.5-custom" targetFramework="net45" />
3934
<package id="Rx-Linq" version="2.2.5-custom" targetFramework="net45" />

0 commit comments

Comments
 (0)