Skip to content

Commit 4485a47

Browse files
maartenbamaartenba
committed
Split test projects + adjust namespaces
1 parent e1a213b commit 4485a47

55 files changed

Lines changed: 275 additions & 90 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,11 @@ FakesAssemblies/
196196

197197
*.orig
198198
*.vs10x
199-
src/Server/Packages/*.nupkg
200-
src/Server/Server.Publish.xml
199+
src/NuGet.Server/Packages/*.nupkg
200+
src/NuGet.Server/Server.Publish.xml
201201
DebugConstants.cs
202202
*.log
203203
*.userprefs
204204
src/VsExtension/source.extension.vsixmanifest
205-
!packages/Microsoft.Web.Xdt.1.0.0-alpha/
205+
!packages/Microsoft.Web.Xdt.1.0.0-alpha/
206+
src/NuGet.Server/packages/*.bin

‎NuGet.Server.sln‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Server.Tests", "test\
1818
EndProject
1919
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Server.Core", "src\NuGet.Server.Core\NuGet.Server.Core.csproj", "{1FE62F82-927A-4437-91F1-1A965E51682B}"
2020
EndProject
21+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{0F277539-E9D7-4A06-A731-D525D9AFCE54}"
22+
EndProject
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NuGet.Server.Core.Tests", "test\NuGet.Server.Core.Tests\NuGet.Server.Core.Tests.csproj", "{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}"
24+
EndProject
2125
Global
2226
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2327
Coverage|Any CPU = Coverage|Any CPU
@@ -92,11 +96,34 @@ Global
9296
{1FE62F82-927A-4437-91F1-1A965E51682B}.Release|Any CPU.Build.0 = Release|Any CPU
9397
{1FE62F82-927A-4437-91F1-1A965E51682B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
9498
{1FE62F82-927A-4437-91F1-1A965E51682B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
99+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
100+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
101+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
102+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Coverage|Mixed Platforms.Build.0 = Coverage|Any CPU
103+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
104+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Debug|Any CPU.Build.0 = Debug|Any CPU
105+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
106+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
107+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Debug|Any CPU.ActiveCfg = Mono Debug|Any CPU
108+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Debug|Any CPU.Build.0 = Mono Debug|Any CPU
109+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Debug|Mixed Platforms.ActiveCfg = Mono Debug|Any CPU
110+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Debug|Mixed Platforms.Build.0 = Mono Debug|Any CPU
111+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Release|Any CPU.ActiveCfg = Mono Release|Any CPU
112+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Release|Any CPU.Build.0 = Mono Release|Any CPU
113+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Release|Mixed Platforms.ActiveCfg = Mono Release|Any CPU
114+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Mono Release|Mixed Platforms.Build.0 = Mono Release|Any CPU
115+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Release|Any CPU.ActiveCfg = Release|Any CPU
116+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Release|Any CPU.Build.0 = Release|Any CPU
117+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
118+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589}.Release|Mixed Platforms.Build.0 = Release|Any CPU
95119
EndGlobalSection
96120
GlobalSection(SolutionProperties) = preSolution
97121
HideSolutionNode = FALSE
98122
EndGlobalSection
99123
GlobalSection(NestedProjects) = preSolution
124+
{793B20A9-E263-4B54-BB31-305B602087CE} = {0F277539-E9D7-4A06-A731-D525D9AFCE54}
100125
{92D18050-3867-4E39-B305-9F9870F66F5E} = {E7B39EAD-EA32-4011-845A-C949A336389A}
126+
{1FE62F82-927A-4437-91F1-1A965E51682B} = {0F277539-E9D7-4A06-A731-D525D9AFCE54}
127+
{FDE8DDFB-E01B-47FD-9945-0A151F3AE589} = {E7B39EAD-EA32-4011-845A-C949A336389A}
101128
EndGlobalSection
102129
EndGlobal

‎build.cmd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ IF %ERRORLEVEL% NEQ 0 goto error
3030

3131
REM Test
3232
call :ExecuteCmd tools\nuget.exe install xunit.runner.console -Version 2.1.0 -OutputDirectory packages
33+
call :ExecuteCmd packages\xunit.runner.console.2.1.0\tools\xunit.console.exe test\NuGet.Server.Core.Tests\bin\%config%\NuGet.Server.Core.Tests.dll
34+
IF %ERRORLEVEL% NEQ 0 goto error
3335
call :ExecuteCmd packages\xunit.runner.console.2.1.0\tools\xunit.console.exe test\NuGet.Server.Tests\bin\%config%\NuGet.Server.Tests.dll
3436
IF %ERRORLEVEL% NEQ 0 goto error
3537

@@ -38,6 +40,7 @@ REM Package
3840
mkdir artifacts
3941
mkdir artifacts\packages
4042
call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server.Core\NuGet.Server.Core.csproj" -symbols -o artifacts\packages -p Configuration=%config% %version%
43+
IF %ERRORLEVEL% NEQ 0 goto error
4144
call :ExecuteCmd tools\nuget.exe pack "src\NuGet.Server\NuGet.Server.csproj" -symbols -o artifacts\packages -p Configuration=%config% %version%
4245
IF %ERRORLEVEL% NEQ 0 goto error
4346

‎src/NuGet.Server.Core/Core/Constants.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) .NET Foundation. All rights reserved.
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

4-
namespace NuGet.Server
4+
namespace NuGet.Server.Core
55
{
66
public static class Constants
77
{

‎src/NuGet.Server.Core/Core/FrameworkNameExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
using System.Runtime.Versioning;
55

6-
namespace NuGet.Server
6+
namespace NuGet.Server.Core
77
{
88
internal static class FrameworkNameExtensions
99
{

‎src/NuGet.Server.Core/Core/PackageExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.IO;
66
using System.Linq;
77

8-
namespace NuGet.Server
8+
namespace NuGet.Server.Core
99
{
1010
public static class PackageExtensions
1111
{

‎src/NuGet.Server.Core/DataServices/IgnoreCaseForPackageIdInterceptor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
using System.Linq.Expressions;
66
using System.Reflection;
77

8-
namespace NuGet.Server.DataServices
8+
namespace NuGet.Server.Core.DataServices
99
{
1010
public class IgnoreCaseForPackageIdInterceptor : ExpressionVisitor
1111
{

‎src/NuGet.Server.Core/DataServices/NormalizeVersionInterceptor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Linq.Expressions;
55
using System.Reflection;
66

7-
namespace NuGet.Server.DataServices
7+
namespace NuGet.Server.Core.DataServices
88
{
99
public class NormalizeVersionInterceptor : ExpressionVisitor
1010
{

‎src/NuGet.Server.Core/DataServices/ODataPackage.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55
using System.Data.Services.Common;
66

7-
namespace NuGet.Server.DataServices
7+
namespace NuGet.Server.Core.DataServices
88
{
99
[DataServiceKey("Id", "Version")]
1010
[EntityPropertyMapping("Id", SyndicationItemProperty.Title, SyndicationTextContentKind.Plaintext, keepInContent: false)]

‎src/NuGet.Server.Core/DataServices/PackageContext.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Linq;
5-
using NuGet.Server.Infrastructure;
5+
using NuGet.Server.Core.Infrastructure;
66

7-
namespace NuGet.Server.DataServices
7+
namespace NuGet.Server.Core.DataServices
88
{
99
public class PackageContext
1010
{

0 commit comments

Comments
 (0)